Merge lp:~cjcurran/indicator-sound/use-name-in-desktop-and-do-not-shorten into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

fixes problem described in bug attached. Upstream Banshee seem to be fine with the alteration to happen from their end and MPT agrees

[Mikkel Kamstrup Erlandsen (kamstrup)]

 review approve

I think you might as well remove the lines you commented out. But no
biggie - definitely approved :-)

review: Approve

=== modified file 'src/music-player-bridge.vala'
--- src/music-player-bridge.vala	2010-12-23 16:37:20 +0000
+++ src/music-player-bridge.vala	2011-01-04 17:43:42 +0000
@@ -27,7 +27,6 @@
   private Dbusmenu.Menuitem root_menu;
   private HashMap<string, PlayerController> registered_clients;  
   private Mpris2Watcher watcher;
-  private Settings settings;
   
   public MusicPlayerBridge()
   {

=== modified file 'src/player-controller.vala'
--- src/player-controller.vala	2010-12-20 18:02:50 +0000
+++ src/player-controller.vala	2011-01-04 17:43:42 +0000
@@ -44,7 +44,7 @@
   public int current_state = state.OFFLINE;
     
   private Dbusmenu.Menuitem root_menu;
-  public string name { get; set;} 
+  //public string name { get; set;} 
   public string dbus_name { get; set;}
   public ArrayList<PlayerItem> custom_items;  
   public Mpris2Controller mpris_bridge;
@@ -62,7 +62,7 @@
     this.root_menu = root;
     this.app_info = app;
     this.dbus_name = dbus_name;
-    this.name = format_player_name(this.app_info.get_name());
+    //this.name = this.app_info.get_name();
     this.icon_name = icon_name;
     this.custom_items = new ArrayList<PlayerItem>();
     this.current_state = initial_state;
@@ -74,7 +74,8 @@
 
   public void update_state(state new_state)
   {
-    debug("update_state - player controller %s : new state %i", this.name, new_state);
+    debug("update_state - player controller %s : new state %i", this.app_info.get_name(),
+                                                                new_state);
     this.current_state = new_state;
     this.update_layout();
   }
@@ -93,13 +94,14 @@
    */
   public void instantiate()
   {
-    debug("instantiate in player controller for %s", this.name);
+    debug("instantiate in player controller for %s", this.app_info.get_name() );
     try{
       this.app_info.launch(null, null);
       this.update_state(state.INSTANTIATING);
     }
     catch(GLib.Error error){
-      warning("Failed to launch app %s with error message: %s", this.name, error.message);
+      warning("Failed to launch app %s with error message: %s", this.app_info.get_name(),
+                                                                error.message );
     }
   }
   
@@ -181,6 +183,7 @@
       }
     }
   }   
+
   
   private static string format_player_name(owned string app_info_name)
   {

=== modified file 'src/title-menu-item.vala'
--- src/title-menu-item.vala	2010-12-07 14:18:28 +0000
+++ src/title-menu-item.vala	2011-01-04 17:43:42 +0000
@@ -26,8 +26,7 @@
   public TitleMenuitem(PlayerController parent)
   {
     Object(item_type: MENUITEM_TYPE, owner: parent);
-    this.property_set(MENUITEM_NAME, parent.name);    
-    debug("title init - icon name = %s", parent.icon_name);
+    this.property_set(MENUITEM_NAME, parent.app_info.get_name());    
     this.property_set(MENUITEM_ICON, parent.icon_name);    
     this.property_set_bool(MENUITEM_RUNNING, false);        
   }

=== modified file 'src/transport-menu-item.vala'
--- src/transport-menu-item.vala	2010-12-07 14:18:28 +0000
+++ src/transport-menu-item.vala	2011-01-04 17:43:42 +0000
@@ -51,7 +51,7 @@
   {
     int input = input_value.get_int();
     debug("handle_event with value %s", input.to_string());
-    debug("transport owner name = %s", this.owner.name);
+    debug("transport owner name = %s", this.owner.app_info.get_name());
     this.owner.mpris_bridge.transport_update((action)input);
   }