[empathy: 48/53] Keep a ref to the TpDBusDaemon so the NameOwnerChanged cb gets called.
- From: Jonny Lamb <jonnylamb src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy: 48/53] Keep a ref to the TpDBusDaemon so the NameOwnerChanged cb gets called.
- Date: Thu, 4 Jun 2009 12:19:05 -0400 (EDT)
commit b1c7419f38db35c1793e1e080c612cfdb7d68b6b
Author: Jonny Lamb <jonny lamb collabora co uk>
Date: Thu Jun 4 14:26:53 2009 +0100
Keep a ref to the TpDBusDaemon so the NameOwnerChanged cb gets called.
Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>
---
src/empathy-debug-dialog.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/empathy-debug-dialog.c b/src/empathy-debug-dialog.c
index df62fa6..745b22b 100644
--- a/src/empathy-debug-dialog.c
+++ b/src/empathy-debug-dialog.c
@@ -79,6 +79,7 @@ typedef struct
GtkWidget *view;
/* Connection */
+ TpDBusDaemon *dbus;
TpProxy *proxy;
TpProxySignalConnection *new_debug_message_signal;
TpProxySignalConnection *name_owner_changed_signal;
@@ -522,10 +523,9 @@ static void
debug_dialog_fill_cm_chooser (EmpathyDebugDialog *debug_dialog)
{
EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
- TpDBusDaemon *dbus;
GError *error = NULL;
- dbus = tp_dbus_daemon_dup (&error);
+ priv->dbus = tp_dbus_daemon_dup (&error);
if (error != NULL)
{
@@ -534,14 +534,12 @@ debug_dialog_fill_cm_chooser (EmpathyDebugDialog *debug_dialog)
return;
}
- tp_list_connection_names (dbus, debug_dialog_list_connection_names_cb,
+ tp_list_connection_names (priv->dbus, debug_dialog_list_connection_names_cb,
debug_dialog, NULL, NULL);
priv->name_owner_changed_signal =
- tp_cli_dbus_daemon_connect_to_name_owner_changed (dbus,
+ tp_cli_dbus_daemon_connect_to_name_owner_changed (priv->dbus,
debug_dialog_name_owner_changed_cb, debug_dialog, NULL, NULL, NULL);
-
- g_object_unref (dbus);
}
static void
@@ -1161,6 +1159,9 @@ debug_dialog_dispose (GObject *object)
if (priv->cms != NULL)
g_object_unref (priv->cms);
+ if (priv->dbus != NULL)
+ g_object_unref (priv->dbus);
+
(G_OBJECT_CLASS (empathy_debug_dialog_parent_class)->dispose) (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]