aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib/menuitem.c
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-02-15 21:38:27 +0100
committerSebastien Bacher <seb128@ubuntu.com>2012-02-15 21:38:27 +0100
commitbe1db87a7e1997e5dd1b69948136c30c7c39d960 (patch)
treef22ea28af5a331799fb6aca0c900a73e9a476720 /libdbusmenu-glib/menuitem.c
parentba23a1f5d6bed315132fb45ff7a63384e2da4e42 (diff)
parent49e45c8b23af0926ec04c50a4ac53068abba21db (diff)
downloadlibdbusmenu-be1db87a7e1997e5dd1b69948136c30c7c39d960.tar.gz
libdbusmenu-be1db87a7e1997e5dd1b69948136c30c7c39d960.tar.bz2
libdbusmenu-be1db87a7e1997e5dd1b69948136c30c7c39d960.zip
* debian/control:
- drop git binaries, the libdev depends on it - set ubuntu vcs - use the current vala version [ Ted Gould ] * New upstream release. * Remove unused const on GStrv's * Only free when there is data to free * Ensure that we only return once even with error (LP: #929856) * Fix an error on a failure to send properties (LP: #929707) * Ensure the hash variant isn't NULL in the comparison (LP: #929710) * Fix some of the issues with throwing criticals * Ensure our tests fail if they throw criticals * Parse and handle a11y descriptions * Don't pass NULL to ATK * Non-srcdir build fixes
Diffstat (limited to 'libdbusmenu-glib/menuitem.c')
-rw-r--r--libdbusmenu-glib/menuitem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 30ae277..18db4ef 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -1222,7 +1222,7 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
but we're actually replacing it no matter. This is so that
the variant passed in sticks around which the caller may
expect. They shouldn't, but it's low cost to remove bugs. */
- if (!inhash || !g_variant_equal(hash_variant, value)) {
+ if (!inhash || (hash_variant != NULL && !g_variant_equal(hash_variant, value))) {
replaced = TRUE;
}