aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-01-05 12:56:02 +0000
committerConor Curran <conor.curran@canonical.com>2011-01-05 12:56:02 +0000
commitf43f3cc7f9f5d762bff2dcd7062cafe554581e20 (patch)
tree3e54c874a09baa09d6a2c6d769ce6fe90d91c688
parentd9c023fd1ba9e5630755634d7f0e983081cbc195 (diff)
downloadayatana-indicator-sound-f43f3cc7f9f5d762bff2dcd7062cafe554581e20.tar.gz
ayatana-indicator-sound-f43f3cc7f9f5d762bff2dcd7062cafe554581e20.tar.bz2
ayatana-indicator-sound-f43f3cc7f9f5d762bff2dcd7062cafe554581e20.zip
block start ups that are blacklisted
-rw-r--r--src/music-player-bridge.vala7
-rw-r--r--src/sound-service.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala
index 2d112cd..7a56ede 100644
--- a/src/music-player-bridge.vala
+++ b/src/music-player-bridge.vala
@@ -81,6 +81,11 @@ public class MusicPlayerBridge : GLib.Object
dbus_name);
return;
}
+ if (desktop in this.settings_manager.fetch_blacklist()) {
+ debug ("Client %s attempting to register but it has been blacklisted",
+ desktop);
+ }
+
debug ( "client_has_become_available %s", desktop );
AppInfo? app_info = create_app_info ( desktop.concat( ".desktop" ) );
if ( app_info == null ){
@@ -117,7 +122,7 @@ public class MusicPlayerBridge : GLib.Object
if (root_menu != null){
debug("attempt to remove %s", mpris_root_interface);
var mpris_key = determine_key ( mpris_root_interface );
- if ( mpris_key != null ){
+ if ( mpris_key != null && this.registered_clients.has_key(mpris_key)){
registered_clients[mpris_key].hibernate();
debug("Successively offlined client %s", mpris_key);
}
diff --git a/src/sound-service.c b/src/sound-service.c
index 98f1881..defcb94 100644
--- a/src/sound-service.c
+++ b/src/sound-service.c
@@ -40,8 +40,8 @@ service_shutdown (IndicatorService *service, gpointer user_data)
{
if (mainloop != NULL) {
g_debug("Service shutdown !");
- close_pulse_activites();
- g_main_loop_quit(mainloop);
+ //close_pulse_activites();
+ //g_main_loop_quit(mainloop);
}
return;
}