From 3065267957ff345f4289dbfadfc29ee4cb3beb3e Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 23 Mar 2011 17:35:20 +0000 Subject: revert the banshee desktop id change because the new version won't make beta --- data/com.canonical.indicators.sound.gschema.xml | 2 +- src/player-controller.vala | 4 ++-- src/settings-manager.vala | 3 ++- 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 @@ A list of applications which at some point have registered with the sound menu - [ 'banshee' ] + [ 'banshee-1' ] 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(); 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; -- cgit v1.2.3 From 4b955bef19d6a40d9da19a64ff4d0889ae3135a9 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 23 Mar 2011 17:37:17 +0000 Subject: bumped release version to minor minor to handle intermediate banshee faffing --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index be50971..ac460cb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(indicator-sound, 0.6.5, conor.curran@canonical.com) +AC_INIT(indicator-sound, 0.6.5.1, conor.curran@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-sound, 0.6.5) +AM_INIT_AUTOMAKE(indicator-sound, 0.6.5.1) AM_MAINTAINER_MODE -- cgit v1.2.3