diff options
| author | Conor Curran <conor.curran@canonical.com> | 2010-06-25 12:59:15 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2010-06-25 12:59:15 +0100 |
| commit | df55c0f3142de41dd742eda7a59a4b1392882d2b (patch) | |
| tree | 887bd53f7e64548ce2a340f831db2332454240a8 | |
| parent | 0336970086fb3bbd00b3a906e9879f4a50ae015c (diff) | |
| download | ayatana-indicator-sound-df55c0f3142de41dd742eda7a59a4b1392882d2b.tar.gz ayatana-indicator-sound-df55c0f3142de41dd742eda7a59a4b1392882d2b.tar.bz2 ayatana-indicator-sound-df55c0f3142de41dd742eda7a59a4b1392882d2b.zip | |
fixes two bugs, album art crasher and unreported metadata reset on trackchange
| -rw-r--r-- | src/mpris-controller.vala | 1 | ||||
| -rw-r--r-- | src/player-item.vala | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/mpris-controller.vala b/src/mpris-controller.vala index a6d27be..beaf02c 100644 --- a/src/mpris-controller.vala +++ b/src/mpris-controller.vala @@ -56,6 +56,7 @@ public class MprisController : GLib.Object private void onTrackChange(dynamic DBus.Object mpris_client, HashTable<string,Value?> ht) { debug("onTrackChange"); + this.controller.custom_items[this.controller.METADATA].reset(MetadataMenuitem.attributes_format()); this.controller.custom_items[this.controller.METADATA].update(ht, MetadataMenuitem.attributes_format()); } diff --git a/src/player-item.vala b/src/player-item.vala index 7fcf912..a5c5512 100644 --- a/src/player-item.vala +++ b/src/player-item.vala @@ -27,6 +27,13 @@ public class PlayerItem : Dbusmenu.Menuitem public PlayerItem() { } + + public void reset(HashSet<string> attrs){ + foreach(string s in attrs){ + debug("attempting to set prop %s to null", s); + this.property_set(s, null); + } + } public void update(HashTable<string, Value?> data, HashSet<string> attributes) { @@ -39,7 +46,8 @@ public class PlayerItem : Dbusmenu.Menuitem string[] input_keys = property.split("-"); string search_key = input_keys[input_keys.length-1 : input_keys.length][0]; debug("search key = %s", search_key); - Value v = data.lookup(search_key); + Value? v = data.lookup(search_key); + if (v.holds (typeof (string))){ debug("with value : %s", v.get_string()); this.property_set(property, this.sanitize_string(v.get_string())); |