Import upstream version 0.6.5.1

7 files changed, 25 insertions, 18 deletions

diff --git a/configure b/configure
index f6dd51e..f02f427 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for indicator-sound 0.6.5.
+# Generated by GNU Autoconf 2.67 for indicator-sound 0.6.5.1.
 #
 # Report bugs to <conor.curran@canonical.com>.
 #
@@ -761,8 +761,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='indicator-sound'
 PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.6.5'
-PACKAGE_STRING='indicator-sound 0.6.5'
+PACKAGE_VERSION='0.6.5.1'
+PACKAGE_STRING='indicator-sound 0.6.5.1'
 PACKAGE_BUGREPORT='conor.curran@canonical.com'
 PACKAGE_URL=''
 
@@ -1564,7 +1564,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures indicator-sound 0.6.5 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.6.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1634,7 +1634,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-sound 0.6.5:";;
+     short | recursive ) echo "Configuration of indicator-sound 0.6.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1767,7 +1767,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-sound configure 0.6.5
+indicator-sound configure 0.6.5.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2136,7 +2136,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by indicator-sound $as_me 0.6.5, which was
+It was created by indicator-sound $as_me 0.6.5.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2956,7 +2956,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-sound
- VERSION=0.6.5
+ VERSION=0.6.5.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14349,7 +14349,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by indicator-sound $as_me 0.6.5, which was
+This file was extended by indicator-sound $as_me 0.6.5.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14415,7 +14415,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-indicator-sound config.status 0.6.5
+indicator-sound config.status 0.6.5.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
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
 
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.c b/src/player-controller.c
index 5a2a64f..6dfd909 100644
--- a/src/player-controller.c
+++ b/src/player-controller.c
@@ -533,7 +533,7 @@ void player_controller_update_layout (PlayerController* self) {
 		_tmp4_ = gee_abstract_list_get ((GeeAbstractList*) self->custom_items, (gint) PLAYER_CONTROLLER_WIDGET_ORDER_TRANSPORT);
 		_tmp5_ = (PlayerItem*) _tmp4_;
 		_tmp6_ = g_app_info_get_id (self->priv->_app_info);
-		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) _tmp5_, DBUSMENU_MENUITEM_PROP_VISIBLE, g_strcmp0 (_tmp6_, "banshee.desktop") == 0);
+		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) _tmp5_, DBUSMENU_MENUITEM_PROP_VISIBLE, g_strcmp0 (_tmp6_, "banshee-1.desktop") == 0);
 		_g_object_unref0 (_tmp5_);
 		_g_object_unref0 (playlists_menuitem);
 		return;
@@ -550,7 +550,7 @@ void player_controller_update_layout (PlayerController* self) {
 	_g_object_unref0 (_tmp10_);
 	_g_object_unref0 (_tmp8_);
 	_tmp14_ = g_app_info_get_id (self->priv->_app_info);
-	if (g_strcmp0 (_tmp14_, "banshee.desktop") == 0) {
+	if (g_strcmp0 (_tmp14_, "banshee-1.desktop") == 0) {
 		gpointer _tmp15_ = NULL;
 		PlayerItem* _tmp16_;
 		TransportMenuitem* transport;
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.c b/src/settings-manager.c
index a22d4fa..8c67740 100644
--- a/src/settings-manager.c
+++ b/src/settings-manager.c
@@ -154,6 +154,12 @@ GeeArrayList* settings_manager_fetch_interested (SettingsManager* self) {
 			_tmp5_ = g_strdup (s_collection[s_it]);
 			s = _tmp5_;
 			{
+				gboolean _tmp6_;
+				_tmp6_ = gee_abstract_collection_contains ((GeeAbstractCollection*) list, s);
+				if (_tmp6_) {
+					_g_free0 (s);
+					continue;
+				}
 				if (_vala_string_array_contains (blacklisted, blacklisted_length1, s)) {
 					_g_free0 (s);
 					continue;
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;