From 0fda59487b536e49bfcec7ab1ee6e9c6d7b6f306 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Thu, 5 May 2011 16:22:23 +1000 Subject: 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. --- src/empathy-chat-window.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/empathy-chat-window.h') diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index 5477479ac..2112b6647 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -59,7 +59,8 @@ struct _EmpathyChatWindowClass { GType empathy_chat_window_get_type (void); 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); -- cgit v1.2.3