gnome-terminal r2636 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Thu May 29 19:40:41 2008
New Revision: 2636
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=2636&view=rev

Log:
Code simplification.


Modified:
   trunk/src/terminal-app.c

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Thu May 29 19:40:41 2008
@@ -1828,14 +1828,9 @@
     {      
       old_transient_parent = NULL;      
 
-      /* passing in transient_parent here purely for the
-       * glade error dialog
-       */
-      app->edit_encodings_dialog =
-        terminal_encoding_dialog_new (transient_parent);
-
+      app->edit_encodings_dialog = terminal_encoding_dialog_new (transient_parent);
       if (app->edit_encodings_dialog == NULL)
-        return; /* glade file missing */
+        return;
       
       g_signal_connect (G_OBJECT (app->edit_encodings_dialog),
                         "destroy",
@@ -1844,17 +1839,10 @@
     }
   else 
     {
-      old_transient_parent = gtk_window_get_transient_for (GTK_WINDOW (app->edit_encodings_dialog));
-    }
-  
-  if (old_transient_parent != transient_parent)
-    {
       gtk_window_set_transient_for (GTK_WINDOW (app->edit_encodings_dialog),
                                     transient_parent);
-      gtk_widget_hide (app->edit_encodings_dialog); /* re-show the window on its new parent */
     }
   
-  gtk_widget_show_all (app->edit_encodings_dialog);
   gtk_window_present (GTK_WINDOW (app->edit_encodings_dialog));
 }