aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorOlivier Le Thanh Duong <olivier@lethanh.be>2009-09-21 00:42:20 +0800
committerOlivier Le Thanh Duong <olivier@lethanh.be>2009-09-21 00:42:20 +0800
commit1ca52da13f25b623adb55127aee61c6ea2f68bea (patch)
treeb6f199ca0e88308eacdb220bbb0a21c84c52e377 /src/empathy.c
parent92d9677c07a4591869cab86b27e21676221cf614 (diff)
downloadgsoc2013-empathy-1ca52da13f25b623adb55127aee61c6ea2f68bea.tar
gsoc2013-empathy-1ca52da13f25b623adb55127aee61c6ea2f68bea.tar.gz
gsoc2013-empathy-1ca52da13f25b623adb55127aee61c6ea2f68bea.tar.bz2
gsoc2013-empathy-1ca52da13f25b623adb55127aee61c6ea2f68bea.tar.lz
gsoc2013-empathy-1ca52da13f25b623adb55127aee61c6ea2f68bea.tar.xz
gsoc2013-empathy-1ca52da13f25b623adb55127aee61c6ea2f68bea.tar.zst
gsoc2013-empathy-1ca52da13f25b623adb55127aee61c6ea2f68bea.zip
Fallback to the contact id if present when there is no room id for empathy_tp_chat
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c11
1 files changed, 1 insertions, 10 deletions
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;