aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-03-23 17:35:20 +0000
committerConor Curran <conor.curran@canonical.com>2011-03-23 17:35:20 +0000
commit3065267957ff345f4289dbfadfc29ee4cb3beb3e (patch)
tree8e9585918a424a6798e4be0598960280bc1b1e08
parentfb3a829f4bca4f16c51cb5305b941928296c52a7 (diff)
downloadayatana-indicator-sound-3065267957ff345f4289dbfadfc29ee4cb3beb3e.tar.gz
ayatana-indicator-sound-3065267957ff345f4289dbfadfc29ee4cb3beb3e.tar.bz2
ayatana-indicator-sound-3065267957ff345f4289dbfadfc29ee4cb3beb3e.zip
revert the banshee desktop id change because the new version won't make beta
-rw-r--r--data/com.canonical.indicators.sound.gschema.xml2
-rw-r--r--src/player-controller.vala4
-rw-r--r--src/settings-manager.vala3
3 files changed, 5 insertions, 4 deletions
diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml
index dc63bcb..1e08269 100644
--- a/data/com.canonical.indicators.sound.gschema.xml
+++ b/data/com.canonical.indicators.sound.gschema.xml
@@ -11,7 +11,7 @@
</key>
<key name="interested-media-players" type="as">
<summary>A list of applications which at some point have registered with the sound menu</summary>
- <default>[ 'banshee' ]</default>
+ <default>[ 'banshee-1' ]</default>
<description>
Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
This array should contain the desktop file names (minus .desktop suffix) of applications which
diff --git a/src/player-controller.vala b/src/player-controller.vala
index 20479d9..86dfe9b 100644
--- a/src/player-controller.vala
+++ b/src/player-controller.vala
@@ -150,12 +150,12 @@ public class PlayerController : GLib.Object
playlists_menuitem.root_item.property_set_bool (MENUITEM_PROP_VISIBLE,
false );
this.custom_items[widget_order.TRANSPORT].property_set_bool (MENUITEM_PROP_VISIBLE,
- this.app_info.get_id() == "banshee.desktop");
+ this.app_info.get_id() == "banshee-1.desktop");
return;
}
this.custom_items[widget_order.METADATA].property_set_bool (MENUITEM_PROP_VISIBLE,
this.custom_items[widget_order.METADATA].populated(MetadataMenuitem.attributes_format()));
- if (this.app_info.get_id() == "banshee.desktop"){
+ if (this.app_info.get_id() == "banshee-1.desktop"){
TransportMenuitem transport = this.custom_items[widget_order.TRANSPORT] as TransportMenuitem;
transport.handle_cached_action();
}
diff --git a/src/settings-manager.vala b/src/settings-manager.vala
index 6800423..7acc3b1 100644
--- a/src/settings-manager.vala
+++ b/src/settings-manager.vala
@@ -41,7 +41,8 @@ public class SettingsManager : GLib.Object
var interested = this.settings.get_strv ("interested-media-players");
var list = new ArrayList<string>();
foreach(var s in interested){
- if ( s in blacklisted ) continue;
+ if (s in list) continue;
+ if (s in blacklisted) continue;
list.add(s);
}
return list;