[Telepathy-commits] [telepathy-sofiasip/master] Guard against disconnecting signals that were never connected

[Mikhail Zabaluev]

---
 src/media-factory.c |    7 +++++--
 src/text-factory.c  |    9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/media-factory.c b/src/media-factory.c
index 1205931..eb03a89 100644
--- a/src/media-factory.c
+++ b/src/media-factory.c
@@ -357,8 +357,11 @@ connection_status_changed_cb (TpsipConnection *conn,
 
       tpsip_media_factory_close_all (self);
 
-      g_signal_handler_disconnect (conn, priv->invite_received_id);
-      priv->invite_received_id = 0;
+      if (priv->invite_received_id != 0)
+        {
+          g_signal_handler_disconnect (conn, priv->invite_received_id);
+          priv->invite_received_id = 0;
+        }
 
       break;
     default:
diff --git a/src/text-factory.c b/src/text-factory.c
index afdd312..c842ff1 100644
--- a/src/text-factory.c
+++ b/src/text-factory.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * text-factory.c - Text channel factory for SIP connection manager
  * Copyright (C) 2007-2008 Collabora Ltd.
  * Copyright (C) 2007-2008 Nokia Corporation
@@ -618,8 +618,11 @@ connection_status_changed_cb (TpsipConnection *conn,
     case TP_CONNECTION_STATUS_DISCONNECTED:
       tpsip_text_factory_close_all (self);
 
-      g_signal_handler_disconnect (conn, priv->message_received_id);
-      priv->message_received_id = 0;
+      if (priv->message_received_id != 0)
+        {
+          g_signal_handler_disconnect (conn, priv->message_received_id);
+          priv->message_received_id = 0;
+        }
 
       break;
     default:
-- 
1.5.6.5