aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib/menuitem.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-02-15 11:36:32 -0600
committerTed Gould <ted@gould.cx>2012-02-15 11:36:32 -0600
commit387f0a7dc93b30a211b569746e951520f13fa9df (patch)
treed00023519498498c389f1c83f6cb745bcd67376a /libdbusmenu-glib/menuitem.c
parent6719880bf5790e4eb3c998b79304161d0430f85e (diff)
parentaeee68e0dd671630e9d1ffa4c8bee5dd78db2066 (diff)
downloadlibdbusmenu-387f0a7dc93b30a211b569746e951520f13fa9df.tar.gz
libdbusmenu-387f0a7dc93b30a211b569746e951520f13fa9df.tar.bz2
libdbusmenu-387f0a7dc93b30a211b569746e951520f13fa9df.zip
* 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;
}