aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorMike Ruprecht <mike.ruprecht@collabora.co.uk>2010-09-01 10:35:11 +0800
committerMike Ruprecht <mike.ruprecht@collabora.co.uk>2010-09-01 10:35:11 +0800
commit4e0778f0e0033d922d2fd0a925df9c12865fb832 (patch)
tree42248b9469cfb9c9d1c063a83aab9989bc0edd0c /libempathy-gtk
parentb99d25fc2ec920c61fee30c98029f20785800ce5 (diff)
downloadgsoc2013-empathy-4e0778f0e0033d922d2fd0a925df9c12865fb832.tar
gsoc2013-empathy-4e0778f0e0033d922d2fd0a925df9c12865fb832.tar.gz
gsoc2013-empathy-4e0778f0e0033d922d2fd0a925df9c12865fb832.tar.bz2
gsoc2013-empathy-4e0778f0e0033d922d2fd0a925df9c12865fb832.tar.lz
gsoc2013-empathy-4e0778f0e0033d922d2fd0a925df9c12865fb832.tar.xz
gsoc2013-empathy-4e0778f0e0033d922d2fd0a925df9c12865fb832.tar.zst
gsoc2013-empathy-4e0778f0e0033d922d2fd0a925df9c12865fb832.zip
Fix crash in log_manager_got_chats_cb.
When the log window is opened through the contact list with the previous conversations menu item, Empathy crashes due to there not being a currently selected account when log_manager_got_chats_cb is called. This patch adds a condition to check if there is a selected account before using it.
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;