[telepathy-gabble/master] wocky_pep_service_dispose: if a porter has been defined, we registered the handler for sure

[Guillaume Desmottes]

---
 src/wocky-pep-service.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/wocky-pep-service.c b/src/wocky-pep-service.c
index 9657db0..5f7fbe3 100644
--- a/src/wocky-pep-service.c
+++ b/src/wocky-pep-service.c
@@ -129,15 +129,13 @@ wocky_pep_service_dispose (GObject *object)
 
   priv->dispose_has_run = TRUE;
 
-  if (priv->handler_id != 0)
+  if (priv->porter != NULL)
     {
+      g_assert (priv->handler_id != 0);
       wocky_porter_unregister_handler (priv->porter, priv->handler_id);
-      priv->handler_id = 0;
+      g_object_unref (priv->porter);
     }
 
-  if (priv->porter != NULL)
-    g_object_unref (priv->porter);
-
   if (priv->contact_factory != NULL)
     g_object_unref (priv->contact_factory);
 
-- 
1.5.6.5