[gnome-control-center] sound: avoid initial resizing



commit 1865429130f02f586543b59bd59f917a8cea8b01
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Nov 19 14:06:59 2010 -0500

    sound: avoid initial resizing
    
    The initial small size is due to a 'Connecting to sound system..."
    label that is shown for a split second before the real UI comes in.
    Better to just not do that, I think.

 panels/sound/cc-sound-panel.c |   29 +++--------------------------
 1 files changed, 3 insertions(+), 26 deletions(-)
---
diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c
index 1ec93c8..316c3b3 100644
--- a/panels/sound/cc-sound-panel.c
+++ b/panels/sound/cc-sound-panel.c
@@ -70,24 +70,6 @@ cc_sound_panel_finalize (GObject *object)
 }
 
 static void
-on_control_ready (GvcMixerControl *control,
-                  CcSoundPanel    *panel)
-{
-        if (panel->dialog != NULL)
-                return;
-
-        if (panel->connecting_label) {
-                gtk_widget_destroy (panel->connecting_label);
-                panel->connecting_label = NULL;
-        }
-
-        panel->dialog = gvc_mixer_dialog_new (control);
-        gtk_container_add (GTK_CONTAINER (panel),
-                           GTK_WIDGET (panel->dialog));
-        gtk_widget_show (GTK_WIDGET (panel->dialog));
-}
-
-static void
 cc_sound_panel_init (CcSoundPanel *self)
 {
         gvc_log_init ();
@@ -98,15 +80,10 @@ cc_sound_panel_init (CcSoundPanel *self)
         gtk_window_set_default_icon_name ("multimedia-volume-control");
 
         self->control = gvc_mixer_control_new ("GNOME Volume Control Dialog");
-        g_signal_connect (self->control,
-                          "ready",
-                          G_CALLBACK (on_control_ready),
-                          self);
         gvc_mixer_control_open (self->control);
-
-        self->connecting_label = gtk_label_new (_("Waiting for sound system to respond"));
-        gtk_container_add (GTK_CONTAINER (self), self->connecting_label);
-        gtk_widget_show (self->connecting_label);
+        self->dialog = gvc_mixer_dialog_new (self->control);
+        gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (self->dialog));
+        gtk_widget_show (GTK_WIDGET (self->dialog));
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]