[Freeciv-Dev] (PR#11188) Popup BUG

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

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

> [michael@xxxxxxxxx - Wed Nov 24 20:57:46 2004]:
> 
> Regarding popups, I have found a bug where one cannot see the nation
select 
> dialog or "Are you sure you want to buy this" dialog from a city
dialog.  I 
> believe it is a bug from the "Don't ask for cityname when constructing or 
> conquering a city" option in the local options.  I use kde and gtk2.

Jing also found these issues when using kwin, this patch seems to fix them.

Index: client/gui-gtk-2.0/citydlg.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/citydlg.c,v
retrieving revision 1.95.2.6
diff -u -r1.95.2.6 citydlg.c
--- client/gui-gtk-2.0/citydlg.c        3 Dec 2004 18:52:29 -0000       1.95.2.6
+++ client/gui-gtk-2.0/citydlg.c        5 Dec 2004 17:54:54 -0000
@@ -1139,7 +1139,7 @@
   vbox = GTK_DIALOG(pdialog->shell)->vbox;
 
   pdialog->name_label = gtk_label_new(NULL);
-  gtk_box_pack_start(GTK_BOX(vbox), pdialog->name_label, TRUE, TRUE, 2);
+  gtk_box_pack_start(GTK_BOX(vbox), pdialog->name_label, FALSE, FALSE, 2);
 
   /**** -Start of Notebook- ****/
 
Index: client/gui-gtk-2.0/gui_stuff.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/gui_stuff.c,v
retrieving revision 1.14.2.5
diff -u -r1.14.2.5 gui_stuff.c
--- client/gui-gtk-2.0/gui_stuff.c      23 Nov 2004 22:00:04 -0000      1.14.2.5
+++ client/gui-gtk-2.0/gui_stuff.c      5 Dec 2004 17:54:55 -0000
@@ -255,7 +255,7 @@
     gtk_window_set_transient_for(GTK_WINDOW(shell),
                                  GTK_WINDOW(parent));
     gtk_window_set_type_hint(GTK_WINDOW(shell),
-                             GDK_WINDOW_TYPE_HINT_UTILITY);
+                             GDK_WINDOW_TYPE_HINT_DIALOG);
   } else {
     gtk_window_set_type_hint(GTK_WINDOW(shell),
                              GDK_WINDOW_TYPE_HINT_NORMAL);