diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2010-07-15 12:25:57 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2010-07-15 12:25:57 -0400 |
commit | 944907b441affebd907605ccd1f825e801650427 (patch) | |
tree | 6a97d672179c509aab579e39d9035928a7479aba /src/metadata-menu-item.c | |
parent | f6ffb190261dfdbbf55e90b63c1cd06f03037e35 (diff) | |
download | ayatana-indicator-sound-944907b441affebd907605ccd1f825e801650427.tar.gz ayatana-indicator-sound-944907b441affebd907605ccd1f825e801650427.tar.bz2 ayatana-indicator-sound-944907b441affebd907605ccd1f825e801650427.zip |
Import upstream version 0.3.7
Diffstat (limited to 'src/metadata-menu-item.c')
-rw-r--r-- | src/metadata-menu-item.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/metadata-menu-item.c b/src/metadata-menu-item.c index 518bad8..f297708 100644 --- a/src/metadata-menu-item.c +++ b/src/metadata-menu-item.c @@ -105,9 +105,9 @@ GeeHashSet* metadata_menuitem_attributes_format (void) { GeeHashSet* result = NULL; GeeHashSet* attrs; attrs = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); - gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_TEXT_TITLE); - gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_TEXT_ARTIST); - gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_TEXT_ALBUM); + gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_TITLE); + gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_ARTIST); + gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_ALBUM); gee_abstract_collection_add ((GeeAbstractCollection*) attrs, DBUSMENU_METADATA_MENUITEM_ARTURL); result = attrs; return result; @@ -118,8 +118,8 @@ gboolean metadata_menuitem_populated (MetadataMenuitem* self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; g_return_val_if_fail (self != NULL, FALSE); - if (dbusmenu_menuitem_property_get ((DbusmenuMenuitem*) self, DBUSMENU_METADATA_MENUITEM_TEXT_TITLE) != NULL) { - _tmp0_ = _vala_strcmp0 (dbusmenu_menuitem_property_get ((DbusmenuMenuitem*) self, DBUSMENU_METADATA_MENUITEM_TEXT_TITLE), "") != 0; + if (dbusmenu_menuitem_property_get ((DbusmenuMenuitem*) self, DBUSMENU_METADATA_MENUITEM_TITLE) != NULL) { + _tmp0_ = _vala_strcmp0 (dbusmenu_menuitem_property_get ((DbusmenuMenuitem*) self, DBUSMENU_METADATA_MENUITEM_TITLE), "") != 0; } else { _tmp0_ = FALSE; } |