# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1338445222 0
# Node ID 071a0e568ac5d69101bd1957a17e0926325a0f94
# Parent  3d6528f36877b946db312fd7b3fafcdd16a221d9# Parent  b31f7945d9b6f768779b85f704fdbd7b54ac7f8e
merge of '688484ce559f68e7d5e5ac8e67cc667f96c3791a'
     and '9b2b55b0c80013fc7794f6334575fb6b7e9ed5b7'

diff -r b31f7945d9b6 -r 071a0e568ac5 ChangeLog
--- a/ChangeLog	Thu May 31 06:09:59 2012 +0000
+++ b/ChangeLog	Thu May 31 06:20:22 2012 +0000
@@ -48,7 +48,9 @@
 	  was an offline message. (Flavius Anton) (#2497)
 
 version 2.10.5:
-	No changes
+	Pidgin:
+	* Fix a crash that may occur when trying to ignore a user who is
+	  not in the current chat room. (#15139)
 
 version 2.10.4 (05/06/2012):
 	General:
diff -r b31f7945d9b6 -r 071a0e568ac5 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Thu May 31 06:09:59 2012 +0000
+++ b/pidgin/gtkconv.c	Thu May 31 06:20:22 2012 +0000
@@ -6642,10 +6642,13 @@
 
 static gboolean get_iter_from_chatbuddy(PurpleConvChatBuddy *cb, GtkTreeIter *iter)
 {
-	GtkTreeRowReference *ref = purple_conv_chat_cb_get_ui_data(cb);
+	GtkTreeRowReference *ref;
 	GtkTreePath *path;
 	GtkTreeModel *model;
 
+	g_return_val_if_fail(cb != NULL, FALSE);
+
+	ref = purple_conv_chat_cb_get_ui_data(cb);
 	if (!ref)
 		return FALSE;
 
@@ -6825,6 +6828,9 @@
 		return;
 
 	cbuddy = purple_conv_chat_cb_find(chat, user);
+	if (!cbuddy)
+		return;
+
 	if (get_iter_from_chatbuddy(cbuddy, &iter)) {
 		GtkTreeRowReference *ref = purple_conv_chat_cb_get_ui_data(cbuddy);
 		gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
diff -r b31f7945d9b6 -r 071a0e568ac5 po/de.po