diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 15:37:40 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 15:37:40 +0800 |
| commit | 9a1a49ed9ddf5a3d1da99eabca27882705688545 (patch) | |
| tree | 5626cc6bb9aa534c4734de4fe76caf82d42f72a4 /src/empathy-chat-manager.c | |
| parent | 77fab8ebc60ce2625c4f449cde6296b25b10b05d (diff) | |
| parent | 0fda59487b536e49bfcec7ab1ee6e9c6d7b6f306 (diff) | |
| download | gsoc2013-empathy-9a1a49ed9ddf5a3d1da99eabca27882705688545.tar gsoc2013-empathy-9a1a49ed9ddf5a3d1da99eabca27882705688545.tar.gz gsoc2013-empathy-9a1a49ed9ddf5a3d1da99eabca27882705688545.tar.bz2 gsoc2013-empathy-9a1a49ed9ddf5a3d1da99eabca27882705688545.tar.lz gsoc2013-empathy-9a1a49ed9ddf5a3d1da99eabca27882705688545.tar.xz gsoc2013-empathy-9a1a49ed9ddf5a3d1da99eabca27882705688545.tar.zst gsoc2013-empathy-9a1a49ed9ddf5a3d1da99eabca27882705688545.zip | |
Merge branch 'sms-support-rebase'
Diffstat (limited to 'src/empathy-chat-manager.c')
| -rw-r--r-- | src/empathy-chat-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 9c2a17891..a90c2d08c 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -128,7 +128,8 @@ process_tp_chat (EmpathyChatManager *self, id = empathy_tp_chat_get_id (tp_chat); if (!tp_str_empty (id)) { - chat = empathy_chat_window_find_chat (account, id); + chat = empathy_chat_window_find_chat (account, id, + empathy_tp_chat_is_sms_channel (tp_chat)); } if (chat != NULL) |