diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-01-27 16:42:03 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2011-01-27 16:42:03 +0100 |
| commit | 74888f5ce08b9f89ac0d62c8664a26628f098765 (patch) | |
| tree | cd39c3c2752166e210666ec88e7cc85668d4e000 /src/sound-service.c | |
| parent | b0babf1fab9b3e74f32de4635dd9eed78cccfc62 (diff) | |
| parent | 1529af0e1224f04616054095742b698d8814cec4 (diff) | |
| download | ayatana-indicator-sound-74888f5ce08b9f89ac0d62c8664a26628f098765.tar.gz ayatana-indicator-sound-74888f5ce08b9f89ac0d62c8664a26628f098765.tar.bz2 ayatana-indicator-sound-74888f5ce08b9f89ac0d62c8664a26628f098765.zip | |
Merge against new HEAD
Diffstat (limited to 'src/sound-service.c')
| -rw-r--r-- | src/sound-service.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/sound-service.c b/src/sound-service.c index 98f1881..2cb33d3 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -1,5 +1,4 @@ /* -This service primarily controls PulseAudio and is driven by the sound indicator menu on the panel. Copyright 2010 Canonical Ltd. Authors: @@ -19,8 +18,9 @@ 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 "sound-service-dbus.h" #include "music-player-bridge.h" static GMainLoop *mainloop = NULL; @@ -64,7 +64,9 @@ main (int argc, char ** argv) INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_shutdown), NULL); - DbusmenuMenuitem* root_menuitem = dbus_menu_manager_setup(); + SoundServiceDbus* sound_service = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL); + + DbusmenuMenuitem* root_menuitem = sound_service_dbus_create_root_item(sound_service); MusicPlayerBridge* server = music_player_bridge_new(); music_player_bridge_set_root_menu_item(server, root_menuitem); |