[Xfce4-commits] <xfce4-panel:master> Panel: Show the dialog late to give it a small size.

[Nick Schermer]

Updating branch refs/heads/master
         to c9fed3f4a8f15324b0d08cbb5a13dfa5234f5dfa (commit)
       from 69e702c69ed401f64d7c509efdc7ac4c4d9e96b8 (commit)

commit c9fed3f4a8f15324b0d08cbb5a13dfa5234f5dfa
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Dec 29 21:00:19 2011 +0100

    Panel: Show the dialog late to give it a small size.
    
    The dialog was realize too soon, so the hidden widgets
    make it grow for no reason.

 panel/panel-preferences-dialog.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/panel/panel-preferences-dialog.c b/panel/panel-preferences-dialog.c
index f05c603..8f9c1d2 100644
--- a/panel/panel-preferences-dialog.c
+++ b/panel/panel-preferences-dialog.c
@@ -270,9 +270,6 @@ panel_preferences_dialog_init (PanelPreferencesDialog *dialog)
       g_signal_connect (G_OBJECT (object), "changed",
                         G_CALLBACK (panel_preferences_dialog_output_changed),
                         dialog);
-
-  /* show the dialog */
-  gtk_widget_show (GTK_WIDGET (window));
 }
 
 
@@ -1313,7 +1310,6 @@ panel_preferences_dialog_show (PanelWindow *active)
   window = gtk_builder_get_object (GTK_BUILDER (dialog_singleton), "dialog");
   panel_return_if_fail (GTK_IS_WIDGET (window));
   gtk_window_set_screen (GTK_WINDOW (window), screen);
-  gtk_window_present (GTK_WINDOW (window));
 
   /* select the active window in the dialog */
   combo = gtk_builder_get_object (GTK_BUILDER (dialog_singleton), "panel-combobox");
@@ -1321,6 +1317,8 @@ panel_preferences_dialog_show (PanelWindow *active)
   panel_id = panel_window_get_id (active);
   if (!panel_preferences_dialog_panel_combobox_rebuild (dialog_singleton, panel_id))
     gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+
+  gtk_window_present (GTK_WINDOW (window));
 }