[empathy] debug_window_dispose: use g_clear_object()
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] debug_window_dispose: use g_clear_object()
- Date: Thu, 10 May 2012 07:49:48 +0000 (UTC)
commit 77e0eed9fb363177cbd54a2659105c4e6a288c8d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Apr 16 09:39:42 2012 +0200
debug_window_dispose: use g_clear_object()
https://bugzilla.gnome.org/show_bug.cgi?id=674182
src/empathy-debug-window.c | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
---
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 8110a14..e00d59a 100644
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -2143,8 +2143,6 @@ empathy_debug_window_init (EmpathyDebugWindow *empathy_debug_window)
EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindowPriv);
empathy_debug_window->priv = priv;
-
- priv->dispose_run = FALSE;
}
static void
@@ -2191,27 +2189,13 @@ debug_window_dispose (GObject *object)
EmpathyDebugWindow *selector = EMPATHY_DEBUG_WINDOW (object);
EmpathyDebugWindowPriv *priv = GET_PRIV (selector);
- if (priv->dispose_run)
- return;
-
- priv->dispose_run = TRUE;
-
if (priv->name_owner_changed_signal != NULL)
tp_proxy_signal_connection_disconnect (priv->name_owner_changed_signal);
- if (priv->service_store != NULL)
- g_object_unref (priv->service_store);
-
- if (priv->dbus != NULL)
- g_object_unref (priv->dbus);
-
- if (priv->am != NULL)
- {
- g_object_unref (priv->am);
- priv->am = NULL;
- }
-
- tp_clear_object (&priv->all_active_buffer);
+ g_clear_object (&priv->service_store);
+ g_clear_object (&priv->dbus);
+ g_clear_object (&priv->am);
+ g_clear_object (&priv->all_active_buffer);
(G_OBJECT_CLASS (empathy_debug_window_parent_class)->dispose) (object);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]