Import upstream version 0.5.0.1

4 files changed, 17 insertions, 21 deletions

diff --git a/configure b/configure
index 847c514..0b1a543 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.5.0.
+# Generated by GNU Autoconf 2.67 for indicator-sound 0.5.0.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.5.0'
-PACKAGE_STRING='indicator-sound 0.5.0'
+PACKAGE_VERSION='0.5.0.1'
+PACKAGE_STRING='indicator-sound 0.5.0.1'
 PACKAGE_BUGREPORT='conor.curran@canonical.com'
 PACKAGE_URL=''
 
@@ -1560,7 +1560,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.5.0 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.5.0.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1630,7 +1630,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of indicator-sound 0.5.0:";;
+     short | recursive ) echo "Configuration of indicator-sound 0.5.0.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1761,7 +1761,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-indicator-sound configure 0.5.0
+indicator-sound configure 0.5.0.1
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2130,7 +2130,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.5.0, which was
+It was created by indicator-sound $as_me 0.5.0.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2950,7 +2950,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-sound
- VERSION=0.5.0
+ VERSION=0.5.0.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14081,7 +14081,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.5.0, which was
+This file was extended by indicator-sound $as_me 0.5.0.1, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14147,7 +14147,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.5.0
+indicator-sound config.status 0.5.0.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 300662b..2908467 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 
-AC_INIT(indicator-sound, 0.5.0, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 0.5.0.1, conor.curran@canonical.com)
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 0.5.0)
+AM_INIT_AUTOMAKE(indicator-sound, 0.5.0.1)
 
 AM_MAINTAINER_MODE
 
diff --git a/src/player-item.c b/src/player-item.c
index 707d161..cc83381 100644
--- a/src/player-item.c
+++ b/src/player-item.c
@@ -285,9 +285,7 @@ void player_item_update (PlayerItem* self, GHashTable* data, GeeHashSet* attribu
 		}
 		_g_object_unref0 (_property_it);
 	}
-	if (dbusmenu_menuitem_property_get_bool ((DbusmenuMenuitem*) self, DBUSMENU_MENUITEM_PROP_VISIBLE) == FALSE) {
-		dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) self, DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
-	}
+	dbusmenu_menuitem_property_set_bool ((DbusmenuMenuitem*) self, DBUSMENU_MENUITEM_PROP_VISIBLE, player_item_populated (self, attributes));
 }
 
 
@@ -305,10 +303,10 @@ gboolean player_item_populated (PlayerItem* self, GeeHashSet* attrs) {
 				break;
 			}
 			prop = (char*) gee_iterator_get (_prop_it);
-			g_debug ("player-item.vala:98: populated ? - prop: %s", prop);
+			g_debug ("player-item.vala:96: populated ? - prop: %s", prop);
 			value_int = dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop);
-			g_debug ("player-item.vala:100: populated ? - prop %s and value %i", prop, value_int);
 			if (dbusmenu_menuitem_property_get_int ((DbusmenuMenuitem*) self, prop) != PLAYER_ITEM_EMPTY) {
+				g_debug ("player-item.vala:99: populated ? - prop %s and value %i", prop, value_int);
 				result = TRUE;
 				_g_free0 (prop);
 				_g_object_unref0 (_prop_it);
diff --git a/src/player-item.vala b/src/player-item.vala
index 68ae6ef..2729cb7 100644
--- a/src/player-item.vala
+++ b/src/player-item.vala
@@ -87,9 +87,7 @@ public class PlayerItem : Dbusmenu.Menuitem
 				this.property_set_bool(property, v.get_boolean());
 			}
 		}
-		if(this.property_get_bool(MENUITEM_PROP_VISIBLE) == false){
-			this.property_set_bool(MENUITEM_PROP_VISIBLE, true);
-		}
+    this.property_set_bool(MENUITEM_PROP_VISIBLE, populated(attributes));        
 	}	
 	
 	public bool populated(HashSet<string> attrs)
@@ -97,8 +95,8 @@ public class PlayerItem : Dbusmenu.Menuitem
 		foreach(string prop in attrs){
 			debug("populated ? - prop: %s", prop);
 		  int value_int = property_get_int(prop);
-			debug("populated ? - prop %s and value %i", prop, value_int);
 			if(property_get_int(prop) != EMPTY){
+  			debug("populated ? - prop %s and value %i", prop, value_int);
 				return true;
 			}
 		}