diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-02-10 11:52:58 -0500 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-02-10 11:52:58 -0500 |
| commit | b4b1c772dc57c3034cc80b785e4b472b8fe1b404 (patch) | |
| tree | 6121e6d4e7b7bef8fe6c4f71e0b1064d32db3668 /src/indicator-sound.c | |
| parent | 868c3e3d18c5de79c679c57ae468f52a504dffd7 (diff) | |
| parent | c963e37be35b53d6f9da68a92b2bb9f1d42a788d (diff) | |
| download | ayatana-indicator-sound-b4b1c772dc57c3034cc80b785e4b472b8fe1b404.tar.gz ayatana-indicator-sound-b4b1c772dc57c3034cc80b785e4b472b8fe1b404.tar.bz2 ayatana-indicator-sound-b4b1c772dc57c3034cc80b785e4b472b8fe1b404.zip | |
Import upstream version 0.5.9
Diffstat (limited to 'src/indicator-sound.c')
| -rw-r--r-- | src/indicator-sound.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c index f259dfd..7e5ebc7 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -133,7 +133,7 @@ indicator_sound_init (IndicatorSound *self) GList* t_list = NULL; priv->transport_widgets_list = t_list; priv->state_manager = g_object_new (SOUND_TYPE_STATE_MANAGER, NULL); - + g_signal_connect ( G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self ); @@ -149,7 +149,6 @@ indicator_sound_dispose (GObject *object) g_object_unref(G_OBJECT(self->service)); self->service = NULL; } - g_list_free ( priv->transport_widgets_list ); G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object); @@ -402,7 +401,9 @@ new_volume_slider_widget(DbusmenuMenuitem * newitem, newitem, menu_volume_item, parent); - return TRUE; + sound_state_manager_attach_notification_to_volume_widget (priv->state_manager, + volume_widget); + return TRUE; } /*******************************************************************/ @@ -563,7 +564,6 @@ key_release_cb(GtkWidget* widget, GdkEventKey* event, gpointer data) return digested; } - static void indicator_sound_scroll (IndicatorObject *io, gint delta, IndicatorScrollDirection direction) @@ -589,5 +589,7 @@ indicator_sound_scroll (IndicatorObject *io, gint delta, value -= adj->step_increment; } //g_debug("indicator-sound-scroll - update slider with value %f", value); - volume_widget_update(VOLUME_WIDGET(priv->volume_widget), value); + volume_widget_update(VOLUME_WIDGET(priv->volume_widget), value); + + sound_state_manager_show_notification (priv->state_manager, value); } |