[Freeciv-Dev] (PR#6824) gtk2 client: government selection dialog should not be modal

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

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

> [bhudson - Tue Nov 11 03:51:43 2003]:
> 
> When the revolution finished, a dialog pops up to choose the government.
>  However, it always seems to pop up behind something else (I assume
> that's because it pops up, and then other dialogs bury it).  The first
> time this happened, it took me a while to figure out that I had to find
> a buried modal dialog somewhere.  
> 
> Is it possible to make the dialog not be modal (why does it even need to
> be modal?). If not, then it should make sure to put itself to the top of
> all freeciv windows.

Here is a patch.


Index: client/gui-gtk-2.0/dialogs.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/dialogs.c,v
retrieving revision 1.63
diff -u -r1.63 dialogs.c
--- client/gui-gtk-2.0/dialogs.c        1 May 2004 17:28:47 -0000       1.63
+++ client/gui-gtk-2.0/dialogs.c        1 May 2004 17:57:59 -0000
@@ -105,7 +105,7 @@
 static int selected_sex;
 static int selected_city_style;
 
-static int is_showing_government_dialog;
+static bool is_showing_government_dialog;
 
 static int is_showing_pillage_dialog = FALSE;
 static int unit_to_use_to_pillage;
@@ -1018,7 +1018,7 @@
 static void government_callback(GtkWidget *w, gpointer data)
 {
   dsend_packet_player_government(&aconnection, GPOINTER_TO_INT(data));
-  is_showing_government_dialog=0;
+  is_showing_government_dialog = FALSE;
 }
 
 
@@ -1032,15 +1032,13 @@
   GtkWidget *dshell, *dlabel, *vbox;
 
   if(!is_showing_government_dialog) {
-    is_showing_government_dialog=1;
+    is_showing_government_dialog = TRUE;
   
     dshell=gtk_window_new(GTK_WINDOW_TOPLEVEL);
     setup_dialog(dshell, toplevel);
-    gtk_window_set_transient_for(GTK_WINDOW(dshell), GTK_WINDOW(toplevel));
     g_object_set(GTK_WINDOW(dshell),
       "title", _("Choose Your New Government"),
       "window-position", GTK_WIN_POS_CENTER_ON_PARENT,
-      "modal", TRUE,
       NULL);
 
     g_signal_connect(