From 1865429130f02f586543b59bd59f917a8cea8b01 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 19 Nov 2010 14:06:59 -0500 Subject: [PATCH] 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 file changed, 3 insertions(+), 26 deletions(-) diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c index 1ec93c870..316c3b39a 100644 --- a/panels/sound/cc-sound-panel.c +++ b/panels/sound/cc-sound-panel.c @@ -69,24 +69,6 @@ cc_sound_panel_finalize (GObject *object) G_OBJECT_CLASS (cc_sound_panel_parent_class)->finalize (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) { @@ -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