diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-09-21 03:53:14 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-09-21 03:53:14 +0800 |
| commit | db0a8206853d58375960fabe1ae38267ba0576ec (patch) | |
| tree | 49b35917bce6cc2e9fdf32219e2b932939532f47 /src | |
| parent | 3f69fecb7d8405f7a9e3c8e7b34665e536b7de0c (diff) | |
| parent | 1ca52da13f25b623adb55127aee61c6ea2f68bea (diff) | |
| download | gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.gz gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.bz2 gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.lz gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.xz gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.tar.zst gsoc2013-empathy-db0a8206853d58375960fabe1ae38267ba0576ec.zip | |
Merge commit 'istaz/handle_none'
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/empathy.c b/src/empathy.c index fe9caf6c6..1d478c357 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; |