aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-01 16:39:07 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-09-01 16:39:07 +0800
commit6a558ab4c6d124e684544568ca85b74b25bd6c17 (patch)
treec1688156321fde950f2c228bec9668a95b7c3abd /libempathy-gtk
parent819ea9bf98a7f2c7a65090398bbb46888756ac59 (diff)
parent4e0778f0e0033d922d2fd0a925df9c12865fb832 (diff)
downloadgsoc2013-empathy-6a558ab4c6d124e684544568ca85b74b25bd6c17.tar
gsoc2013-empathy-6a558ab4c6d124e684544568ca85b74b25bd6c17.tar.gz
gsoc2013-empathy-6a558ab4c6d124e684544568ca85b74b25bd6c17.tar.bz2
gsoc2013-empathy-6a558ab4c6d124e684544568ca85b74b25bd6c17.tar.lz
gsoc2013-empathy-6a558ab4c6d124e684544568ca85b74b25bd6c17.tar.xz
gsoc2013-empathy-6a558ab4c6d124e684544568ca85b74b25bd6c17.tar.zst
gsoc2013-empathy-6a558ab4c6d124e684544568ca85b74b25bd6c17.zip
Merge remote branch 'maiku/previous-conversation-crash'
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-log-window.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 5e6709938..aa0370b94 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -821,7 +821,8 @@ log_manager_got_chats_cb (GObject *manager,
COL_CHAT_IS_CHATROOM, hit->is_chatroom,
-1);
- if (!tp_strdiff (tp_proxy_get_object_path (hit->account),
+ if (window->selected_account != NULL &&
+ !tp_strdiff (tp_proxy_get_object_path (hit->account),
tp_proxy_get_object_path (window->selected_account)))
select_account = TRUE;