aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-12 17:12:34 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-08-12 17:12:36 +0800
commitfaa8d609e0c6bcb70a61f1e78ea97d0557a98942 (patch)
treea00f236950adbd7dc0d59774a675fbb000bd4617
parent193a5cf3e7a55366f6ad6adb8496e0ccbd6e15b1 (diff)
downloadgsoc2013-empathy-faa8d609e0c6bcb70a61f1e78ea97d0557a98942.tar
gsoc2013-empathy-faa8d609e0c6bcb70a61f1e78ea97d0557a98942.tar.gz
gsoc2013-empathy-faa8d609e0c6bcb70a61f1e78ea97d0557a98942.tar.bz2
gsoc2013-empathy-faa8d609e0c6bcb70a61f1e78ea97d0557a98942.tar.lz
gsoc2013-empathy-faa8d609e0c6bcb70a61f1e78ea97d0557a98942.tar.xz
gsoc2013-empathy-faa8d609e0c6bcb70a61f1e78ea97d0557a98942.tar.zst
gsoc2013-empathy-faa8d609e0c6bcb70a61f1e78ea97d0557a98942.zip
compare accounts using their object paths rather than their TpAccount
It's safer and we could have 2 proxies for the same Account.
-rw-r--r--libempathy-gtk/empathy-log-window.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index ed2f14044..5e6709938 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -821,7 +821,9 @@ log_manager_got_chats_cb (GObject *manager,
COL_CHAT_IS_CHATROOM, hit->is_chatroom,
-1);
- select_account = (hit->account == window->selected_account);
+ if (!tp_strdiff (tp_proxy_get_object_path (hit->account),
+ tp_proxy_get_object_path (window->selected_account)))
+ select_account = TRUE;
/* FIXME: Update COL_CHAT_ICON/NAME */
if (hit->is_chatroom) {