[Freeciv-commits] r30227 - in /branches/S2_5/client: gui-gtk-2.0/tileset_dlg.c gui-gtk-3.0/soundset_dlg.c gui-gtk-3.0/tileset_dlg.c

[cazfi74]

Author: cazfi
Date: Mon Oct 26 22:41:22 2015
New Revision: 30227

URL: http://svn.gna.org/viewcvs/freeciv?rev=30227&view=rev
Log:
Fixed ruleset initiated suggestion dialog parent window setup in gtk3-client.

See bug #23960

Modified:
    branches/S2_5/client/gui-gtk-2.0/tileset_dlg.c
    branches/S2_5/client/gui-gtk-3.0/soundset_dlg.c
    branches/S2_5/client/gui-gtk-3.0/tileset_dlg.c

Modified: branches/S2_5/client/gui-gtk-2.0/tileset_dlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/tileset_dlg.c?rev=30227&r1=30226&r2=30227&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-2.0/tileset_dlg.c      (original)
+++ branches/S2_5/client/gui-gtk-2.0/tileset_dlg.c      Mon Oct 26 22:41:22 2015
@@ -17,11 +17,14 @@
 
 #include <gtk/gtk.h>
 
+/* utility */
 #include "fcintl.h"
 
+/* common */
 #include "game.h"
 #include "unitlist.h"
 
+/* client */
 #include "tilespec.h"
 
 #include "dialogs_g.h"

Modified: branches/S2_5/client/gui-gtk-3.0/soundset_dlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/soundset_dlg.c?rev=30227&r1=30226&r2=30227&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/soundset_dlg.c     (original)
+++ branches/S2_5/client/gui-gtk-3.0/soundset_dlg.c     Mon Oct 26 22:41:22 2015
@@ -26,6 +26,8 @@
 /* client */
 #include "audio.h"
 #include "client_main.h"
+#include "gui_main.h"
+#include "gui_stuff.h"
 
 #include "dialogs_g.h"
 
@@ -59,6 +61,7 @@
                                        _("Keep current soundset"),
                                        GTK_RESPONSE_NO,
                                        NULL);
+  setup_dialog(dialog, toplevel);
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
   gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
 

Modified: branches/S2_5/client/gui-gtk-3.0/tileset_dlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/tileset_dlg.c?rev=30227&r1=30226&r2=30227&view=diff
==============================================================================
--- branches/S2_5/client/gui-gtk-3.0/tileset_dlg.c      (original)
+++ branches/S2_5/client/gui-gtk-3.0/tileset_dlg.c      Mon Oct 26 22:41:22 2015
@@ -17,11 +17,16 @@
 
 #include <gtk/gtk.h>
 
+/* utility */
 #include "fcintl.h"
 
+/* common */
 #include "game.h"
 #include "unitlist.h"
 
+/* client */
+#include "gui_main.h"
+#include "gui_stuff.h"
 #include "tilespec.h"
 
 #include "dialogs_g.h"
@@ -56,6 +61,7 @@
                                        _("Keep current tileset"),
                                        GTK_RESPONSE_NO,
                                        NULL);
+  setup_dialog(dialog, toplevel);
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_YES);
   gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
 


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