diff options
author | Ted Gould <ted@gould.cx> | 2012-04-09 09:15:17 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2012-04-09 09:15:17 -0500 |
commit | 475110aa2fe3a47cf6331fbd5941f34a9461fd81 (patch) | |
tree | bf2318e8b94cf0b74ea17b496e9d5331a3c065ec /libdbusmenu-glib/menuitem.c | |
parent | e0eb750e8c36a4116247ea80b4d055a9f821459a (diff) | |
parent | 2d60549a2394ce7d73907abcaca22b48553d6c5b (diff) | |
download | libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.tar.gz libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.tar.bz2 libdbusmenu-475110aa2fe3a47cf6331fbd5941f34a9461fd81.zip |
Catching up to trunk
Diffstat (limited to 'libdbusmenu-glib/menuitem.c')
-rw-r--r-- | libdbusmenu-glib/menuitem.c | 6 |
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) |