[gnome-keyring/gnome-3-2] dbus: Free the object path of a prompt later
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring/gnome-3-2] dbus: Free the object path of a prompt later
- Date: Mon, 17 Oct 2011 20:25:25 +0000 (UTC)
commit ae61fdfa6e464a0c9fd0f8d7b2c68193de62aaea
Author: Stef Walter <stefw collabora co uk>
Date: Thu Sep 29 23:04:48 2011 +0200
dbus: Free the object path of a prompt later
* Saw an assertion where we were sending a signal after dispose
had run once.
daemon/dbus/gkd-secret-unlock.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/daemon/dbus/gkd-secret-unlock.c b/daemon/dbus/gkd-secret-unlock.c
index ff233e1..a4be4ba 100644
--- a/daemon/dbus/gkd-secret-unlock.c
+++ b/daemon/dbus/gkd-secret-unlock.c
@@ -404,9 +404,6 @@ gkd_secret_unlock_dispose (GObject *obj)
{
GkdSecretUnlock *self = GKD_SECRET_UNLOCK (obj);
- g_free (self->object_path);
- self->object_path = NULL;
-
if (self->service) {
g_object_remove_weak_pointer (G_OBJECT (self->service),
(gpointer*)&(self->service));
@@ -421,6 +418,9 @@ gkd_secret_unlock_finalize (GObject *obj)
{
GkdSecretUnlock *self = GKD_SECRET_UNLOCK (obj);
+ g_free (self->object_path);
+ self->object_path = NULL;
+
if (g_queue_find (&unlock_prompt_queue, self))
g_warning ("unlock queue is not in sync with prompting");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]