aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib/menuitem.c
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-03-09 11:42:25 +0100
committerSebastien Bacher <seb128@ubuntu.com>2012-03-09 11:42:25 +0100
commit733d05b34953bfbfa31db852e2eaab72d659fadf (patch)
tree3529ce1a20ff2e153d4a99e31ba07b7ccf99b254 /libdbusmenu-glib/menuitem.c
parentca576cbf1273ca628b97ae2e08e14c0dd525373b (diff)
parent77d28d4bba23bd23214cc0c5741a3a5dbcb19aee (diff)
downloadlibdbusmenu-733d05b34953bfbfa31db852e2eaab72d659fadf.tar.gz
libdbusmenu-733d05b34953bfbfa31db852e2eaab72d659fadf.tar.bz2
libdbusmenu-733d05b34953bfbfa31db852e2eaab72d659fadf.zip
* New upstream release.
* Setting the ATK Role on menu items (LP: #878708) * Cleaning up code paths to avoid goto's (LP: #940651) * Fixing setting an icon multiple times (LP: #934574)
Diffstat (limited to 'libdbusmenu-glib/menuitem.c')
-rw-r--r--libdbusmenu-glib/menuitem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 18db4ef..c81c36e 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1253,7 +1253,7 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
becuse it has been unref'd when replaced in the hash
table. But the fact that there was a value is
the imporant part. */
- if (!inhash || replaced) {
+ if (replaced) {
GVariant * signalval = value;
if (signalval == NULL) {
@@ -1462,8 +1462,8 @@ dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property
* by the menuitem but the list is not and should be freed using
* g_list_free() when the calling function is done with it.
*
- * Return value: (transfer container): A list of strings or NULL if there are
- * none.
+ * Return value: (transfer container) (element-type utf8): A list of
+ * strings or NULL if there are none.
*/
GList *
dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi)