diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-07-07 15:08:34 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-07-07 15:08:34 +0100 |
| commit | b41d94677b3471742fa957cc4f60381d8f67ea5d (patch) | |
| tree | 6bcc804fe80c407fca184910d50e9a5577f2a26d | |
| parent | caf13b4dccb20aff410ffc0da63c298cabbcca5f (diff) | |
| download | ayatana-indicator-sound-b41d94677b3471742fa957cc4f60381d8f67ea5d.tar.gz ayatana-indicator-sound-b41d94677b3471742fa957cc4f60381d8f67ea5d.tar.bz2 ayatana-indicator-sound-b41d94677b3471742fa957cc4f60381d8f67ea5d.zip | |
updated for merge
| -rw-r--r-- | data/Makefile.am | 1 | ||||
| -rw-r--r-- | src/sound-service.c | 4 | ||||
| -rw-r--r-- | src/title-widget.c | 2 | ||||
| -rw-r--r-- | src/transport-widget.c | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 0389576..9fa0c9b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,3 @@ - dbus_servicesdir = $(DBUSSERVICEDIR) service_in_files = indicator-sound.service.in dbus_services_DATA = $(service_in_files:.service.in=.service) diff --git a/src/sound-service.c b/src/sound-service.c index a5f3941..8f4e941 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -43,8 +43,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); // TODO: uncomment for release !! - //close_pulse_activites(); - //g_main_loop_quit(mainloop); + close_pulse_activites(); + g_main_loop_quit(mainloop); } return; } diff --git a/src/title-widget.c b/src/title-widget.c index 45f918f..9951754 100644 --- a/src/title-widget.c +++ b/src/title-widget.c @@ -91,7 +91,7 @@ title_widget_init (TitleWidget *self) priv->hbox = hbox; g_signal_connect(G_OBJECT(twin_item), "property-changed", G_CALLBACK(title_widget_property_update), self); - + // TODO - waiting theme icon name for correct usage priv->player_icon = gtk_image_new_from_file("/home/ronoc/branches/sound-menu-v2/finish-indicate/indicator-sound/data/sound_icon.png"); gtk_box_pack_start(GTK_BOX (priv->hbox), priv->player_icon, FALSE, FALSE, 0); diff --git a/src/transport-widget.c b/src/transport-widget.c index a05bda2..e7b8e4f 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -134,7 +134,7 @@ transport_widget_init (TransportWidget *self) hbox = gtk_hbox_new(TRUE, 2); gchar* symbol = transport_widget_toggle_play_label(dbusmenu_menuitem_property_get_int(twin_item, DBUSMENU_TRANSPORT_MENUITEM_PLAY_STATE)); priv->play_button = gtk_button_new_with_label(symbol); - //g_free(symbol); + gtk_box_pack_start (GTK_BOX (hbox), priv->play_button, FALSE, TRUE, 0); priv->hbox = hbox; |