From 1ca52da13f25b623adb55127aee61c6ea2f68bea Mon Sep 17 00:00:00 2001
From: Olivier Le Thanh Duong <olivier@lethanh.be>
Date: Sun, 20 Sep 2009 18:42:20 +0200
Subject: Fallback to the contact id if present when there is no room id for
 empathy_tp_chat

---
 src/empathy.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/empathy.c b/src/empathy.c
index 8a2f107b7..d1c44da03 100644
--- 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;
-- 
cgit v1.2.3