[Telepathy-commits] [telepathy-salut/master] lib/gibber/gibber-iq-helper.c: Check that priv->xmpp_connection is not NULL

[Alban Crequy]

20080721115837-a41c0-4ebbb4e973d22dba06c3ce9c8922db6cee91f24e.gz
---
 lib/gibber/gibber-iq-helper.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/gibber/gibber-iq-helper.c b/lib/gibber/gibber-iq-helper.c
index 8a5bebe..a1fae02 100644
--- a/lib/gibber/gibber-iq-helper.c
+++ b/lib/gibber/gibber-iq-helper.c
@@ -235,14 +235,11 @@ gibber_iq_helper_dispose (GObject *object)
 
   priv->dispose_has_run = TRUE;
 
+  g_assert (priv->xmpp_connection != NULL);
   g_signal_handlers_disconnect_by_func (priv->xmpp_connection,
       xmpp_connection_received_stanza_cb, self);
-
-  if (priv->xmpp_connection != NULL)
-    {
-      g_object_unref (priv->xmpp_connection);
-      priv->xmpp_connection = NULL;
-    }
+  g_object_unref (priv->xmpp_connection);
+  priv->xmpp_connection = NULL;
 
   if (G_OBJECT_CLASS (gibber_iq_helper_parent_class)->dispose)
     G_OBJECT_CLASS (gibber_iq_helper_parent_class)->dispose (object);
-- 
1.5.6.5