aboutsummaryrefslogtreecommitdiff
path: root/src/sound-service.c
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2010-06-17 16:52:52 -0400
committerKen VanDine <ken.vandine@canonical.com>2010-06-17 16:52:52 -0400
commit34e71c6447c654772dc55a4854e61646ecf469ed (patch)
tree74e41c64c125cea3173599e4bcc1272657fcdf7f /src/sound-service.c
parent07d59d5bf4278681069551e2e64cac2c5a996a42 (diff)
parent619a7c5da5817b5da3bfd8af5c3af9de450b6d48 (diff)
downloadayatana-indicator-sound-34e71c6447c654772dc55a4854e61646ecf469ed.tar.gz
ayatana-indicator-sound-34e71c6447c654772dc55a4854e61646ecf469ed.tar.bz2
ayatana-indicator-sound-34e71c6447c654772dc55a4854e61646ecf469ed.zip
New upstream release.
Diffstat (limited to 'src/sound-service.c')
-rw-r--r--src/sound-service.c21
1 files changed, 12 insertions, 9 deletions
diff --git a/src/sound-service.c b/src/sound-service.c
index d70971e..38e5fba 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -23,6 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "sound-service.h"
#include "dbus-menu-manager.h"
#include "pulse-manager.h"
+#include "music-player-bridge.h"
static GMainLoop *mainloop = NULL;
@@ -43,9 +44,9 @@ 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);
+ // TODO: uncomment for release !!
+ close_pulse_activites();
+ g_main_loop_quit(mainloop);
}
return;
}
@@ -57,7 +58,7 @@ main:
int
main (int argc, char ** argv)
{
- g_type_init();
+ g_type_init();
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
@@ -69,13 +70,15 @@ main (int argc, char ** argv)
INDICATOR_SERVICE_SIGNAL_SHUTDOWN,
G_CALLBACK(service_shutdown), NULL);
- dbus_menu_manager_setup();
+ DbusmenuMenuitem* root_menuitem = dbus_menu_manager_setup();
+ MusicPlayerBridge* server = music_player_bridge_new();
+ music_player_bridge_set_root_menu_item(server, root_menuitem);
// Run the loop
- mainloop = g_main_loop_new(NULL, FALSE);
- g_main_loop_run(mainloop);
-
- return 0;
+ mainloop = g_main_loop_new(NULL, FALSE);
+ g_main_loop_run(mainloop);
+
+ return 0;
}