diff -ruN -Xcvs/diff_ignore test/client/gui-gtk/citydlg.c newcitydialog/client/gui-gtk/citydlg.c
--- test/client/gui-gtk/citydlg.c       Tue Oct 23 19:50:33 2001
+++ newcitydialog/client/gui-gtk/citydlg.c      Thu Oct 25 00:59:17 2001
@@ -449,6 +449,7 @@
   gtk_set_relative_position(toplevel, pdialog->shell, 10, 10);
 
   gtk_widget_show(pdialog->shell);
+  gdk_window_raise(pdialog->shell->window);
 }
 
 /****************************************************************
@@ -1215,7 +1216,7 @@
   GtkWidget *hbox, *vbox, *page, *table, *frame, *label;
   GSList *group = NULL;
 
-  char *tab_title = N_("_Misc. settings");
+  char *tab_title = N_("_Misc. Settings");
 
   char *new_citizens_label[] = { N_("Entertainers"),
     N_("Scientists"),
@@ -1228,7 +1229,7 @@
     N_("Happiness page"),
     /* N_("CMA page"), */
     N_("Trade Routes page"),
-    N_("This misc. settings page"),
+    N_("This Misc. Settings page"),
     N_("Last active page")
   };
 
@@ -1685,12 +1686,11 @@
     granaryturns = 999;
   }
 
-  if ( granaryturns == 0 )
-      granaryturns = 1; /* nothing happens this turn */
-
   my_snprintf(buf[GRANARY], sizeof(buf[GRANARY]), "%d/%-d",
              pcity->food_stock, city_granary_size(pcity->size));
-  if (granaryturns == 999) {
+  if (granaryturns == 0) {
+    my_snprintf(buf[GROWTH], sizeof(buf[GROWTH]), "blocked");
+  } else if (granaryturns == 999) {
     my_snprintf(buf[GROWTH], sizeof(buf[GROWTH]), "never");
   } else {
     my_snprintf(buf[GROWTH], sizeof(buf[GROWTH]), "%d turn%s",
@@ -1717,7 +1717,7 @@
   style = (pcity->food_surplus < 0 && granaryturns < 4) ? 2 : 0;
   gtk_widget_modify_style(pdialog->overview.info_label[GRANARY],
                          info_label_style[style]);
-  style = (pcity->food_surplus < 0) ? 2 : 0;
+  style = (granaryturns == 0 || pcity->food_surplus < 0) ? 2 : 0;
   gtk_widget_modify_style(pdialog->overview.info_label[GROWTH],
                          info_label_style[style]);
   if (pdialog->pcity->owner == game.player_idx) {
diff -ruN -Xcvs/diff_ignore test/client/gui-gtk/gui_stuff.c newcitydialog/client/gui-gtk/gui_stuff.c
--- test/client/gui-gtk/gui_stuff.c     Tue Oct 23 19:49:28 2001
+++ newcitydialog/client/gui-gtk/gui_stuff.c    Wed Oct 24 19:01:37 2001
@@ -89,21 +89,24 @@
 /**************************************************************************
 ...
 **************************************************************************/
-GtkWidget *gtk_accelbutton_new(const char *label_str, GtkAccelGroup *accel)
+GtkWidget *gtk_accelbutton_new(const gchar *label, GtkAccelGroup *accel)
 {
   GtkWidget *button;
-  GtkWidget *label;
+  GtkWidget *accel_label;
   guint accel_key;
 
-  button = gtk_button_new();
+  button = gtk_button_new ();
 
-  label = gtk_label_new ( label_str );
-  accel_key = gtk_label_parse_uline( GTK_LABEL(label), label_str );
-  gtk_container_add( GTK_CONTAINER(button), label );
+  accel_label = gtk_widget_new (GTK_TYPE_ACCEL_LABEL,
+                               "GtkWidget::visible", TRUE,
+                               "GtkWidget::parent", button,
+                               "GtkAccelLabel::accel_widget", button,
+                               NULL);
+  accel_key = gtk_label_parse_uline (GTK_LABEL (accel_label), label);
 
   if ((accel_key != GDK_VoidSymbol) && accel)
-    gtk_widget_add_accelerator (button, "clicked", accel, accel_key, 0, 0 );
-
+    gtk_widget_add_accelerator (button, "clicked", accel,
+                               accel_key, GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
   return button;
 }
 
diff -ruN -Xcvs/diff_ignore test/client/gui-gtk/gui_stuff.h newcitydialog/client/gui-gtk/gui_stuff.h
--- test/client/gui-gtk/gui_stuff.h     Tue Oct 23 19:49:28 2001
+++ newcitydialog/client/gui-gtk/gui_stuff.h    Wed Oct 24 19:01:37 2001
@@ -15,7 +15,7 @@
 
 #include <gtk/gtk.h>
 
-GtkWidget *gtk_accelbutton_new(const gchar *label_str, GtkAccelGroup *accel);
+GtkWidget *gtk_accelbutton_new(const gchar *label, GtkAccelGroup *accel);
 void gtk_set_label(GtkWidget *w, char *text);
p *accel)
+GtkWidget *gtk_accelbutton_new(const gchar *label, GtkAccelGroup *accel)
 {
   GtkWidget *button;
-  GtkWidget *label;
+  GtkWidget *accel_label;
   guint accel_key;
 
-  button = gtk_button_new();
+  button = gtk_button_new ();
 
-  label = gtk_label_new ( label_str );
-  accel_key = gtk_label_parse_uline( GTK_LABEL(label), label_str );
-  gtk_container_add( GTK_CONTAINER(button), label );
+  accel_label = gtk_widget_new (GTK_TYPE_ACCEL_LABEL,
+                               "GtkWidget::visible", TRUE,
+                               "GtkWidget::parent", button,
+                               "GtkAccelLabel::accel_widget", button,
+                               NULL);
+  accel_key = gtk_label_parse_uline (GTK_LABEL (accel_label), label);
 
   if ((accel_key != GDK_VoidSymbol) && accel)
-    gtk_widget_add_accelerator (button, "clicked", accel, accel_key, 0, 0 );
-
+    gtk_widget_add_accelerator (button, "clicked", accel,
+                               accel_key, GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
   return button;
 }
 
diff -ruN -Xcvs/diff_ignore test/client/gui-gtk/gui_stuff.h newcitydialog/client/gui-gtk/gui_stuff.h
--- test/client/gui-gtk/gui_stuff.h     Tue Oct 23 19:49:28 2001
+++ newcitydialog/client/gui-gtk/gui_stuff.h    Wed Oct 24 19:01:37 2001
@@ -15,7 +15,7 @@
 
 #include <gtk/gtk.h>
 
-GtkWidget *gtk_accelbutton_new(const gchar *label_str, GtkAccelGroup *accel);
+GtkWidget *gtk_accelbutton_new(const gchar *label, GtkAccelGroup *accel);
 void gtk_set_label(GtkWidget *w, char *text);
 void gtk_set_bitmap(GtkWidget *w, GdkPixmap *pm);
 void gtk_expose_now(GtkWidget *w);
oid gtk_set_bitmap(GtkWidget *w, GdkPixmap *pm);
 void gtk_expose_now(GtkWidget *w);