From: Carlos Lopez <genetita@gmail.com>
Date: Wed, 12 May 2010 15:11:01 +0000 (+0200)
Subject: Merge branch 'zelgadis_master'
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=2d59d6c0da81a91937477c4821ecb71cec1d7d6f;hp=f88ce35f00b09c2fa9028d82b46f7c57226e4af5;p=synfig.git

Merge branch 'zelgadis_master'
---

diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp
index 95e2831..ae8c8ba 100644
--- a/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@ -1391,8 +1391,16 @@ App::App(int *argc, char ***argv):
 
 		studio_init_cb.task(_("Done."));
 		studio_init_cb.amount_complete(10000,10000);
-
+        
+		// To avoid problems with some window managers and gtk >= 2.18
+		// we should show dock dialogs after the settings load.
+		// If dock dialogs are shown before the settings are loaded,
+		// the windows manager can act over it.
+		// See discussions here:
+		// * http://synfig.org/forums/viewtopic.php?f=1&t=1131&st=0&sk=t&sd=a&start=30
+		// * http://synfig.org/forums/viewtopic.php?f=15&t=1062
 		dock_manager->show_all_dock_dialogs();
+		
 		toolbox->present();
 	}
 	catch(String x)