diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-04-04 11:55:31 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-04-04 11:55:31 +0100 |
| commit | 15c7802a9f753b0d06e7690ae24402644cd12bfe (patch) | |
| tree | 80898a1623ab8093e04677431758f007fa84ef7c | |
| parent | d265dea2d8208e83053f1c3694a7889146513f1b (diff) | |
| download | ayatana-indicator-sound-15c7802a9f753b0d06e7690ae24402644cd12bfe.tar.gz ayatana-indicator-sound-15c7802a9f753b0d06e7690ae24402644cd12bfe.tar.bz2 ayatana-indicator-sound-15c7802a9f753b0d06e7690ae24402644cd12bfe.zip | |
tweaked to handle banshee desktop name change now that is finally in natty
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | data/com.canonical.indicators.sound.gschema.xml | 2 | ||||
| -rw-r--r-- | src/player-controller.vala | 4 | ||||
| -rw-r--r-- | src/settings-manager.vala | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ac460cb..b628136 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(indicator-sound, 0.6.5.1, conor.curran@canonical.com) +AC_INIT(indicator-sound, 0.6.6.1, conor.curran@canonical.com) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-sound, 0.6.5.1) +AM_INIT_AUTOMAKE(indicator-sound, 0.6.6.1) AM_MAINTAINER_MODE diff --git a/data/com.canonical.indicators.sound.gschema.xml b/data/com.canonical.indicators.sound.gschema.xml index 1e08269..dc63bcb 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-1' ]</default> + <default>[ 'banshee' ]</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 86dfe9b..20479d9 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-1.desktop"); + this.app_info.get_id() == "banshee.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-1.desktop"){ + if (this.app_info.get_id() == "banshee.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 7acc3b1..1b99cbc 100644 --- a/src/settings-manager.vala +++ b/src/settings-manager.vala @@ -41,6 +41,9 @@ 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 == "banshee-1"){ + s = "banshee"; + } if (s in list) continue; if (s in blacklisted) continue; list.add(s); |