diff options
author | Ted Gould <ted@gould.cx> | 2012-02-15 11:36:32 -0600 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2012-02-15 11:36:32 -0600 |
commit | 387f0a7dc93b30a211b569746e951520f13fa9df (patch) | |
tree | d00023519498498c389f1c83f6cb745bcd67376a /libdbusmenu-glib/client.c | |
parent | 6719880bf5790e4eb3c998b79304161d0430f85e (diff) | |
parent | aeee68e0dd671630e9d1ffa4c8bee5dd78db2066 (diff) | |
download | libdbusmenu-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/client.c')
-rw-r--r-- | libdbusmenu-glib/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index a2330d1..e64d923 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -395,7 +395,7 @@ dbusmenu_client_dispose (GObject *object) /* Only used for queueing up a new command, so we can just drop this array. */ - if (priv->delayed_property_list == NULL) { + if (priv->delayed_property_list != NULL) { gchar ** dataregion = (gchar **)g_array_free(priv->delayed_property_list, FALSE); if (dataregion != NULL) { g_strfreev(dataregion); @@ -403,7 +403,7 @@ dbusmenu_client_dispose (GObject *object) priv->delayed_property_list = NULL; } - if (priv->delayed_property_listeners == NULL) { + if (priv->delayed_property_listeners != NULL) { gint i; GError * localerror = NULL; @@ -2210,7 +2210,7 @@ dbusmenu_client_get_status (DbusmenuClient * client) * memory managed by the client. Duplicate if you want * to keep them. */ -const GStrv +GStrv dbusmenu_client_get_icon_paths (DbusmenuClient * client) { g_return_val_if_fail(DBUSMENU_IS_CLIENT(client), NULL); |