Merge lp:~cjcurran/indicator-sound/lp-992262-fix into lp:indicator-sound/12.10

Proposed by Conor Curran on 2012-05-03
Status: Merged
Approved by: Charles Kerr on 2012-05-03
Approved revision: 325
Merged at revision: 325
Proposed branch: lp:~cjcurran/indicator-sound/lp-992262-fix
Merge into: lp:indicator-sound/12.10
Diff against target: 39 lines (+5/-6)
1 file modified
src/music-player-bridge.vala (+5/-6)
To merge this branch: bzr merge lp:~cjcurran/indicator-sound/lp-992262-fix
Reviewer Review Type Date Requested Status
Charles Kerr (community) 2012-05-03 Approve on 2012-05-03
Review via email: mp+104626@code.launchpad.net
To post a comment you must log in.
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/music-player-bridge.vala'
2--- src/music-player-bridge.vala 2012-03-27 01:33:40 +0000
3+++ src/music-player-bridge.vala 2012-05-03 21:12:20 +0000
4@@ -163,7 +163,6 @@
5 }
6
7 var mpris_key = determine_key ( desktop );
8- // Are we sure clients will appear like this with the new registration method in place.
9 if ( this.registered_clients.has_key (mpris_key) == false ){
10 debug("New client has registered that we have not seen before: %s", dbus_name );
11 PlayerController ctrl = new PlayerController ( this.root_menu,
12@@ -189,14 +188,14 @@
13
14 public void client_has_vanished ( string mpris_root_interface )
15 {
16- debug("MusicPlayerBridge -> client with dbus interface %s has vanished",
17+ debug("\n MusicPlayerBridge -> client with dbus interface %s has vanished",
18 mpris_root_interface );
19 if (root_menu != null){
20- debug("attempt to remove %s", mpris_root_interface);
21+ debug("\n attempt to remove %s", mpris_root_interface);
22 var mpris_key = determine_key ( mpris_root_interface );
23 if ( mpris_key != null && this.registered_clients.has_key(mpris_key)){
24 registered_clients[mpris_key].hibernate();
25- debug("Successively offlined client %s", mpris_key);
26+ debug("\n Successively offlined client %s", mpris_key);
27 }
28 }
29 }
30@@ -286,8 +285,8 @@
31 }
32 var temp = result.split("-");
33 if (temp != null && temp.length > 1){
34- result = temp[0];
35- }
36+ result = temp[1];
37+ }
38 return result;
39 }
40

Subscribers

People subscribed via source and target branches