[Freeciv-Dev] (PR#18863) GTK2 Client: View->City Productions check box menu item does nothing

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=18863 >

> [stabi@xxxxxx - Sun Jul 23 10:58:42 2006]:
> 
> I have a Medion MD 7409 laptop with Fedora Core 5, and I am using
> Freeciv 2.1.0-beta1.
> 
> The View->City Growth check box also seems to control the city
> production display, and View->City Productions has no effect.

I don't see any problems with that.  But playing around it seems when
the itybar is disabled the city-growth option doesn't work quite right.

-jason

Index: client/mapview_common.c
===================================================================
--- client/mapview_common.c     (revision 12170)
+++ client/mapview_common.c     (working copy)
@@ -1413,7 +1413,7 @@
 
     get_text_size(&name_rect.w, &name_rect.h, FONT_CITY_NAME, name);
 
-    if (growth[0] != '\0') {
+    if (draw_city_growth) {
       get_text_size(&growth_rect.w, &growth_rect.h, FONT_CITY_PROD, growth);
       /* HACK: put a character's worth of space between the two strings. */
       get_text_size(&extra_width, NULL, FONT_CITY_NAME, "M");
@@ -1424,7 +1424,7 @@
                    canvas_x - total_width / 2, canvas_y,
                    FONT_CITY_NAME,
                    get_color(tileset, COLOR_MAPVIEW_CITYTEXT), name);
-    if (growth[0] != '\0') {
+    if (draw_city_growth) {
       canvas_put_text(pcanvas,
                      canvas_x - total_width / 2 + name_rect.w + extra_width,
                      canvas_y + total_height - growth_rect.h,