[Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)

[woodswolf]

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

> [guest - Mer. Sep. 26 11:58:18 2007]:
> 
> Use this patch. Probably more clean and keep old behaviours.
> 
hmmm, I have made patch in wrong side so please ue it.
How can I delete my old messages.

diff -urNa freeciv-2.0.orig/client/gui-gtk-2.0/cityrep.c freeciv-2.0/client/gui-gtk-2.0/cityrep.c
--- freeciv-2.0.orig/client/gui-gtk-2.0/cityrep.c	2007-09-26 11:27:21.000000000 +0200
+++ freeciv-2.0/client/gui-gtk-2.0/cityrep.c	2007-09-26 14:47:05.000000000 +0200
@@ -52,7 +52,7 @@
 #include "cityrep.h"
 
 #define NEG_VAL(x)  ((x)<0 ? (x) : (-x))
-#define CMA_NONE	(-1)
+#define CMA_NONE	(cmafec_preset_num())
 #define CMA_CUSTOM	(-2)
 
 enum city_operation_type {
@@ -548,10 +548,14 @@
   gtk_menu_item_set_submenu(parent_item, menu);
 
   if (change_cma) {
-    for (i = -1; i < cmafec_preset_num(); i++) {
-      w = (i == -1 ? gtk_menu_item_new_with_label(_("none"))
-	   : gtk_menu_item_new_with_label(cmafec_preset_get_descr(i)));
-      gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
+    for (i = 0; i <= cmafec_preset_num(); i++) {
+      if ( i == CMA_NONE) {
+	w = gtk_menu_item_new_with_label(_("none"));
+	gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), w);	
+      } else {
+	w = gtk_menu_item_new_with_label(cmafec_preset_get_descr(i));
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
+      }
       g_signal_connect(w, "activate", G_CALLBACK(select_cma_callback),
 		       GINT_TO_POINTER(i));
     }

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev