more unreffing temporary styles properly

[inkscape.git] / src / ui / dialog / dialog.cpp

diff --git a/src/ui/dialog/dialog.cpp b/src/ui/dialog/dialog.cpp
index d5708395113f2ad89f631cda5db4055c76f0645c..ac147d65652230b5fbf53e55f01206de641ade64 100644 (file)
--- a/src/ui/dialog/dialog.cpp
+++ b/src/ui/dialog/dialog.cpp
@@ -4,9 +4,10 @@
  *
  * Author:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
- *   buliabyak@gmail.com
+ *   buliabyak@gmail.com 
+ *   Johan Engelen <j.b.c.engelen@ewi.utwente.nl>
  *
- * Copyright (C) 2004, 2005 Authors
+ * Copyright (C) 2004-2007 Authors
  *
  * Released under GNU GPL.  Read the file 'COPYING' for more information.
  */
@@ -40,7 +41,6 @@ namespace Inkscape {
 namespace UI {
 namespace Dialog {
 
-//#ifndef WIN32
 static gboolean
 sp_retransientize_again (gpointer dlgPtr)
 {
@@ -48,7 +48,6 @@ sp_retransientize_again (gpointer dlgPtr)
     dlg->retransientize_suppress = false;
     return FALSE; // so that it is only called once
 }
-//#endif
 
 static void
 sp_retransientize (Inkscape::Application *inkscape, SPDesktop *desktop, gpointer dlgPtr)
@@ -67,6 +66,7 @@ sp_dialog_shutdown (GtkObject *object, gpointer dlgPtr)
 void 
 Dialog::present()
 {
+    _user_hidden = false;
     Gtk::Dialog::present();
 }
 
@@ -171,9 +171,6 @@ Dialog::Dialog(const char *prefs_path, int verb_num, const char *apply_label)
         set_title(title);
     }
 
-    sp_transientize(dlg);
-    retransientize_suppress = false;
-
     gtk_signal_connect( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC(sp_dialog_event_handler), dlg );
 
     _hiddenF12 = false;
@@ -196,6 +193,8 @@ Dialog::Dialog(const char *prefs_path, int verb_num, const char *apply_label)
 
     read_geometry();
     present();
+    sp_transientize(dlg);
+    retransientize_suppress = false;
 }
 
 Dialog::Dialog(BaseObjectType *gobj)