diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 14:22:23 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-05-05 14:22:23 +0800 |
| commit | 376bd27843d83ee42e3d731f9856fff9d522aa3c (patch) | |
| tree | bc570b10a93af270f743a6918cf33e9d89d54f7e /src/empathy-chat-window.h | |
| parent | 81a61a2bf34bf2ea7f262f96279a27978c62317e (diff) | |
| download | gsoc2013-empathy-376bd27843d83ee42e3d731f9856fff9d522aa3c.tar gsoc2013-empathy-376bd27843d83ee42e3d731f9856fff9d522aa3c.tar.gz gsoc2013-empathy-376bd27843d83ee42e3d731f9856fff9d522aa3c.tar.bz2 gsoc2013-empathy-376bd27843d83ee42e3d731f9856fff9d522aa3c.tar.lz gsoc2013-empathy-376bd27843d83ee42e3d731f9856fff9d522aa3c.tar.xz gsoc2013-empathy-376bd27843d83ee42e3d731f9856fff9d522aa3c.tar.zst gsoc2013-empathy-376bd27843d83ee42e3d731f9856fff9d522aa3c.zip | |
Include SMSChannel property in empathy_chat_window_find_chat()
The approach in https://bugzilla.gnome.org/show_bug.cgi?id=644085 was wrong
because channel paths can change across reconnects. This would cause new chat
windows to be created when they were rerequested.
A more future-proof solution would be to keep a white/black list of comparable
properties, but I think this is overengineering the problem for the time
being. Instead we'll just include the SMSChannel property in the comparison.
Diffstat (limited to 'src/empathy-chat-window.h')
| -rw-r--r-- | src/empathy-chat-window.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index 4cbd2094a..f8425e172 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -71,7 +71,8 @@ void empathy_chat_window_switch_to_chat (EmpathyChatWindow *window EmpathyChat *chat); gboolean empathy_chat_window_has_focus (EmpathyChatWindow *window); EmpathyChat * empathy_chat_window_find_chat (TpAccount *account, - const gchar *id); + const gchar *id, + gboolean sms_channel); void empathy_chat_window_present_chat (EmpathyChat *chat, gint64 timestamp); |