[Freeciv-Dev] (PR#11019) Compiling fails in helpdlg.c

["Vasco Alexandre da Silva Costa" <vasc@xxxxxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11019 >

> [jdorje - Mon Nov 15 18:26:02 2004]:
> 
> [compiling the gtk1.2 client fails]
> 
> The code changed and nobody bothered to update the gtk1.2 client.  If
> nobody volunteers to take over maintaining this client I think we will
> drop support for it soon.
> 
> In the meantime, you probably want to be building the gtk2 client
> anyway.  Try ./configure --enable-client=gtk2 and install whatever
> packages it tells you are missing.

Here is a patch, to be committed ASAP, but I'm not going to make a habit
of fixing the GTK+ 1.2 client. Have enough work with GTK+ 2.0.

Index: client/gui-gtk/dialogs.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/dialogs.h,v
retrieving revision 1.9
diff -u -r1.9 dialogs.h
--- client/gui-gtk/dialogs.h    1 Dec 2002 22:49:24 -0000       1.9
+++ client/gui-gtk/dialogs.h    15 Nov 2004 18:42:27 -0000
@@ -26,6 +26,7 @@
   bool sensitive;
 };
 
+void popup_revolution_dialog(void);
 void message_dialog_button_set_sensitive(GtkWidget * shl, const char *bname,
                                         bool state);
 
Index: client/gui-gtk/helpdlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk/helpdlg.c,v
retrieving revision 1.69
diff -u -r1.69 helpdlg.c
--- client/gui-gtk/helpdlg.c    10 Nov 2004 17:01:59 -0000      1.69
+++ client/gui-gtk/helpdlg.c    15 Nov 2004 18:42:28 -0000
@@ -932,28 +932,28 @@
            tile_types[i].trade);
     gtk_set_label(help_tlabel[0][4], buf);
 
-    if (*(tile_types[i].special_1_name)) {
+    if (*(tile_types[i].special[0].name)) {
       sprintf(buf, _("%s F/R/T:"),
-             tile_types[i].special_1_name);
+              tile_types[i].special[0].name);
       gtk_set_label(help_tlabel[1][0], buf);
       sprintf(buf, "%d/%d/%d",
-             tile_types[i].food_special_1,
-             tile_types[i].shield_special_1,
-             tile_types[i].trade_special_1);
+             tile_types[i].special[0].food,
+             tile_types[i].special[0].shield,
+             tile_types[i].special[0].trade);
       gtk_set_label(help_tlabel[1][1], buf);
     } else {
       gtk_set_label(help_tlabel[1][0], "");
       gtk_set_label(help_tlabel[1][1], "");
     }
 
-    if (*(tile_types[i].special_2_name)) {
+    if (*(tile_types[i].special[1].name)) {
       sprintf(buf, _("%s F/R/T:"),
-             tile_types[i].special_2_name);
+             tile_types[i].special[1].name);
       gtk_set_label(help_tlabel[1][3], buf);
       sprintf(buf, "%d/%d/%d",
-             tile_types[i].food_special_2,
-             tile_types[i].shield_special_2,
-             tile_types[i].trade_special_2);
+             tile_types[i].special[1].food,
+             tile_types[i].special[1].shield,
+             tile_types[i].special[1].trade);
       gtk_set_label(help_tlabel[1][4], buf);
     } else {
       gtk_set_label(help_tlabel[1][3], "");