diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-05-05 22:30:31 +0200 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-05-05 22:30:31 +0200 |
| commit | ff088da3bd5e436af0f205f01cf858a9c0a7004d (patch) | |
| tree | a20015efee30957c6384c8d2dda366e94159087a /src/sound-service.c | |
| parent | 99be06437fd85327f37bf7b9f44c083e52d1b0bd (diff) | |
| download | ayatana-indicator-sound-ff088da3bd5e436af0f205f01cf858a9c0a7004d.tar.gz ayatana-indicator-sound-ff088da3bd5e436af0f205f01cf858a9c0a7004d.tar.bz2 ayatana-indicator-sound-ff088da3bd5e436af0f205f01cf858a9c0a7004d.zip | |
mix and match vala and c
Diffstat (limited to 'src/sound-service.c')
| -rw-r--r-- | src/sound-service.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/sound-service.c b/src/sound-service.c index d70971e..a061e86 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-bridge.h" static GMainLoop *mainloop = NULL; @@ -44,8 +45,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; } @@ -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,16 @@ main (int argc, char ** argv) INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_shutdown), NULL); - dbus_menu_manager_setup(); + dbus_menu_manager_setup(); + BridgeServer* server = bridge_server_new(); + bridge_server_test_me(server); + //g_object_new(bridge_server_new, NULL); // 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; } |