diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-01-19 15:25:18 -0600 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-01-19 15:25:18 -0600 |
| commit | a4637ac0f922a3df3e31c19a0a86eebb6a8b4994 (patch) | |
| tree | cabf6d00a45e7e6bf1e46e4ac97f5e0cef318d1d /src/sound-service.c | |
| parent | 6db28ce9134db40a0808a3c67df5f9dd223303b5 (diff) | |
| download | ayatana-indicator-sound-a4637ac0f922a3df3e31c19a0a86eebb6a8b4994.tar.gz ayatana-indicator-sound-a4637ac0f922a3df3e31c19a0a86eebb6a8b4994.tar.bz2 ayatana-indicator-sound-a4637ac0f922a3df3e31c19a0a86eebb6a8b4994.zip | |
further consolidation on the service side
Diffstat (limited to 'src/sound-service.c')
| -rw-r--r-- | src/sound-service.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/sound-service.c b/src/sound-service.c index defcb94..73b03b6 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 "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_construct_menu(sound_service); MusicPlayerBridge* server = music_player_bridge_new(); music_player_bridge_set_root_menu_item(server, root_menuitem); |