aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-04-23 12:57:05 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-04-23 12:57:05 -0500
commit6984728ec8b7d32962a413288dd52f09d5d4e64b (patch)
treee139636403d8753b4119ed23e7b15cc7cac57269
parentc45a8fe03a7b3653af2d2f8586668dcb3c21899b (diff)
parent678a41767787d26f624d38bd573e8c5a36fc72e0 (diff)
downloadlibdbusmenu-6984728ec8b7d32962a413288dd52f09d5d4e64b.tar.gz
libdbusmenu-6984728ec8b7d32962a413288dd52f09d5d4e64b.tar.bz2
libdbusmenu-6984728ec8b7d32962a413288dd52f09d5d4e64b.zip
merge lp:~charlesk/dbusmenu/lp-981766 to fix a leaked dbus_object_path string
-rw-r--r--libdbusmenu-glib/server.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index 9e5ef0c..f47bb5d 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -463,6 +463,11 @@ dbusmenu_server_finalize (GObject *object)
{
DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(object);
+ if (priv->dbusobject != NULL) {
+ g_free (priv->dbusobject);
+ priv->dbusobject = NULL;
+ }
+
if (priv->icon_dirs != NULL) {
g_strfreev(priv->icon_dirs);
priv->icon_dirs = NULL;