From b8e5c4267c5c5db7889b18441a2fc733dd48cbdd Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 5 Jan 2011 16:06:52 +0000
Subject: blacklisting working plus bug fixed

---
 src/music-player-bridge.vala | 1 +
 src/player-controller.vala   | 5 ++---
 src/sound-service.c          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala
index 7a56ede..c7391cf 100644
--- a/src/music-player-bridge.vala
+++ b/src/music-player-bridge.vala
@@ -141,6 +141,7 @@ public class MusicPlayerBridge : GLib.Object
   private static AppInfo? create_app_info ( string desktop )
   {
     DesktopAppInfo info = new DesktopAppInfo ( desktop ) ;
+
     if ( desktop == null || info == null ){
       warning ( "Could not create a desktopappinfo instance from app: %s", desktop );
       return null;
diff --git a/src/player-controller.vala b/src/player-controller.vala
index 58e3b47..3922ecf 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -44,7 +44,6 @@ public class PlayerController : GLib.Object
   public int current_state = state.OFFLINE;
     
   private Dbusmenu.Menuitem root_menu;
-  //public string name { get; set;} 
   public string dbus_name { get; set;}
   public ArrayList<PlayerItem> custom_items;  
   public Mpris2Controller mpris_bridge;
@@ -62,7 +61,6 @@ public class PlayerController : GLib.Object
     this.root_menu = root;
     this.app_info = app;
     this.dbus_name = dbus_name;
-    //this.name = this.app_info.get_name();
     this.icon_name = icon_name;
     this.custom_items = new ArrayList<PlayerItem>();
     this.current_state = initial_state;
@@ -128,7 +126,8 @@ public class PlayerController : GLib.Object
     this.custom_items[widget_order.TRANSPORT].reset(TransportMenuitem.attributes_format());
     this.custom_items[widget_order.METADATA].reset(MetadataMenuitem.attributes_format());
     TitleMenuitem title = this.custom_items[widget_order.TITLE] as TitleMenuitem;
-    title.toggle_active_triangle(false);          
+    title.toggle_active_triangle(false); 
+    this.mpris_bridge = null;
   }
 
   public void update_layout()
diff --git a/src/sound-service.c b/src/sound-service.c
index defcb94..98f1881 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;
 }
-- 
cgit v1.2.3