Merge lp:~cjcurran/indicator-sound/metadata-widget-blank-maverick into lp:indicator-sound/sound-menu-v2

Proposed by Conor Curran
Status: Merged
Approved by: Kalle Valo
Approved revision: 156
Merged at revision: 156
Proposed branch: lp:~cjcurran/indicator-sound/metadata-widget-blank-maverick
Merge into: lp:indicator-sound/sound-menu-v2
Diff against target: 24 lines (+2/-4)
1 file modified
src/player-item.vala (+2/-4)
To merge this branch: bzr merge lp:~cjcurran/indicator-sound/metadata-widget-blank-maverick
Reviewer Review Type Date Requested Status
Kalle Valo (community) Approve
Review via email: mp+40621@code.launchpad.net

Description of the change

Fixes slight visual bug whereby on starting media client (like rhythmbox )the metadata widget (the part of the menu which holds the track album art and text) does not appear unless the widget is populated.

To post a comment you must log in.
Revision history for this message
Kalle Valo (kvalo) wrote :

My vala skills are very limited, but looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/player-item.vala'
--- src/player-item.vala 2010-09-03 19:05:42 +0000
+++ src/player-item.vala 2010-11-11 13:01:32 +0000
@@ -87,9 +87,7 @@
87 this.property_set_bool(property, v.get_boolean());87 this.property_set_bool(property, v.get_boolean());
88 }88 }
89 }89 }
90 if(this.property_get_bool(MENUITEM_PROP_VISIBLE) == false){90 this.property_set_bool(MENUITEM_PROP_VISIBLE, populated(attributes));
91 this.property_set_bool(MENUITEM_PROP_VISIBLE, true);
92 }
93 } 91 }
94 92
95 public bool populated(HashSet<string> attrs)93 public bool populated(HashSet<string> attrs)
@@ -97,8 +95,8 @@
97 foreach(string prop in attrs){95 foreach(string prop in attrs){
98 debug("populated ? - prop: %s", prop);96 debug("populated ? - prop: %s", prop);
99 int value_int = property_get_int(prop);97 int value_int = property_get_int(prop);
100 debug("populated ? - prop %s and value %i", prop, value_int);
101 if(property_get_int(prop) != EMPTY){98 if(property_get_int(prop) != EMPTY){
99 debug("populated ? - prop %s and value %i", prop, value_int);
102 return true;100 return true;
103 }101 }
104 }102 }

Subscribers

People subscribed via source and target branches

to all changes: