[empathy/gnome-2-34] chat_window_new_message_cb: check that we found the chatroom
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-34] chat_window_new_message_cb: check that we found the chatroom
- Date: Thu, 24 Mar 2011 09:06:08 +0000 (UTC)
commit 7b7363be0b28fcf89502036eea4d653e2244f827
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Mar 23 14:27:19 2011 +0100
chat_window_new_message_cb: check that we found the chatroom
There is a race, if the chatroom manager didn't parse the chatrooms list yet,
this was crashing.
src/empathy-chat-window.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 32339bd..0674283 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1434,7 +1434,7 @@ chat_window_new_message_cb (EmpathyChat *chat,
chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
account, room);
- if (empathy_chatroom_is_always_urgent (chatroom)) {
+ if (chatroom != NULL && empathy_chatroom_is_always_urgent (chatroom)) {
needs_urgency = TRUE;
} else {
needs_urgency = empathy_message_should_highlight (message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]