summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2015-01-31 10:13:28 +0000
committerRoss Lagerwall <rosslagerwall@gmail.com>2015-01-31 10:26:14 +0000
commita4f175b90d3495a7b41751ab5eeb6f09462a5595 (patch)
treec8013299e4d355f162ca88b0e129a8d8e78bd3a0
parent94db801c8251893b89751fb87ed2501dbe8078e6 (diff)
downloadgvfs-a4f175b90d3495a7b41751ab5eeb6f09462a5595.tar.gz
metadata: Free objects on error
https://bugzilla.gnome.org/show_bug.cgi?id=743653
-rw-r--r--metadata/meta-daemon.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/metadata/meta-daemon.c b/metadata/meta-daemon.c
index 95729409..a7b86bec 100644
--- a/metadata/meta-daemon.c
+++ b/metadata/meta-daemon.c
@@ -500,8 +500,6 @@ main (int argc, char *argv[])
return 0;
}
- loop = g_main_loop_new (NULL, FALSE);
-
error = NULL;
conn = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
if (!conn)
@@ -517,6 +515,7 @@ main (int argc, char *argv[])
NULL,
(GDestroyNotify)tree_info_free);
+ loop = g_main_loop_new (NULL, FALSE);
g_dbus_connection_set_exit_on_close (conn, FALSE);
g_signal_connect (conn, "closed", G_CALLBACK (on_connection_closed), loop);
@@ -539,6 +538,8 @@ main (int argc, char *argv[])
g_printerr ("Error exporting metadata daemon: %s (%s, %d)\n",
error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
+ g_object_unref (conn);
+ g_main_loop_unref (loop);
return 1;
}