Import upstream version 0.3.8

1 files changed, 5 insertions, 7 deletions

diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala
index 2f87b2d..352ea7f 100644
--- a/src/music-player-bridge.vala
+++ b/src/music-player-bridge.vala
@@ -35,7 +35,7 @@ public class MusicPlayerBridge : GLib.Object
 		playersDB = new FamiliarPlayersDB();
 		registered_clients = new HashMap<string, PlayerController> ();
     listener = Listener.ref_default();
-    listener.indicator_added.connect(on_indicator_added);
+    listener.indicator_added += on_indicator_added;
     listener.indicator_removed.connect(on_indicator_removed);
     listener.indicator_modified.connect(on_indicator_modified);
     listener.server_added.connect(on_server_added);
@@ -77,7 +77,7 @@ public class MusicPlayerBridge : GLib.Object
 			return 2;
 		}
 		else{
-			return (2 + (this.registered_clients.size * 4));
+			return (2 + (this.registered_clients.size * PlayerController.WIDGET_QUANTITY));
 		}
 	}
 	
@@ -93,15 +93,13 @@ public class MusicPlayerBridge : GLib.Object
 				this.registered_clients[client_name].update_state(PlayerController.state.READY);
 				this.registered_clients[client_name].activate();
 			}
-			//else init a new one
 			else{			
-				
+				//else init a new one				
 				PlayerController ctrl = new PlayerController(root_menu,
 				                                             client_name,
 				                                             calculate_menu_position(),
 				                                             PlayerController.state.READY);
-				registered_clients.set(client_name, ctrl); 
-				
+				registered_clients.set(client_name, ctrl); 				
 				debug("New Client of name %s has successfully registered with us", client_name);
 			}
 			// irregardless check that it has a desktop file if not kick off a request for it
@@ -163,7 +161,7 @@ public class MusicPlayerBridge : GLib.Object
   {
     debug("MusicPlayerBridge-> on_server_count_changed with value %u", i);
   }
-  public void on_indicator_added(Indicate.ListenerServer object, Indicate.ListenerIndicator p0)
+  public void on_indicator_added(ListenerServer object, ListenerIndicator p0)
   {
     debug("MusicPlayerBridge-> on_indicator_added");
   }