From de3ed4111ef50b847e1ba4d6ea06e13f913ba7a0 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 16 Dec 2010 12:36:43 +0000 Subject: race condtion on playbackstatus accommodated for and dbus names changed over the new canonical naming --- src/music-player-bridge.vala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/music-player-bridge.vala') diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala index b13b7f3..327a775 100644 --- a/src/music-player-bridge.vala +++ b/src/music-player-bridge.vala @@ -58,11 +58,11 @@ public class MusicPlayerBridge : GLib.Object var mpris_key = determine_key ( path ); PlayerController ctrl = new PlayerController ( this.root_menu, app_info, - mpris_key, + null, this.fetch_icon_name(path), calculate_menu_position(), PlayerController.state.OFFLINE ); - this.registered_clients.set(mpris_key, ctrl); + this.registered_clients.set(mpris_key, ctrl); } } @@ -94,7 +94,7 @@ public class MusicPlayerBridge : GLib.Object var mpris_key = determine_key ( path ); // Are we sure clients will appear like this with the new registration method in place. if ( this.registered_clients.has_key (mpris_key) == false ){ - debug("New client has registered that we have not seen before: %s", desktop ); + debug("New client has registered that we have not seen before: %s", dbus_name ); PlayerController ctrl = new PlayerController ( this.root_menu, app_info, dbus_name, @@ -108,8 +108,8 @@ public class MusicPlayerBridge : GLib.Object } else{ this.registered_clients[mpris_key].update_state ( PlayerController.state.READY ); - this.registered_clients[mpris_key].activate ( ); - debug("Application has already registered - awaken the hibernation: %s \n", path); + this.registered_clients[mpris_key].activate ( dbus_name ); + debug("Application has already registered - awaken the hibernation: %s \n", dbus_name ); } } -- cgit v1.2.3