Merge commit 'istaz/handle_none'

[empathy.git] / src / empathy.c

diff --git a/src/empathy.c b/src/empathy.c
index fe9caf6c609cda5d9be3cec957d3d36382fd3b33..1d478c35731c415e7f16481acdafe309b3ae2814 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -100,16 +100,7 @@ dispatch_cb (EmpathyDispatcher *dispatcher,
         (empathy_dispatch_operation_get_channel_wrapper (operation));
 
       id = empathy_tp_chat_get_id (tp_chat);
-      if (!id)
-        {
-          EmpathyContact *contact;
-
-          contact = empathy_tp_chat_get_remote_contact (tp_chat);
-          if (contact)
-            id = empathy_contact_get_id (contact);
-        }
-
-      if (id)
+      if (!EMP_STR_EMPTY (id))
         {
           EmpathyAccountManager *manager;
           TpConnection *connection;