Mercurial > pidgin
changeset 32815:3d6528f36877
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 5ca378b115ef36cfafb203fb88623734a7c6bb23)
to branch 'im.pidgin.pidgin' (head ccfb262bb9e313a5281f05015530ef94fc58a573)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 31 May 2012 03:48:16 +0000 |
| parents | 626c339b60ae (diff) fb8263d936e5 (current diff) |
| children | 071a0e568ac5 |
| files | ChangeLog gaim-uninstalled.pc.in gaim.pc.in libpurple/gaim-compat.h libpurple/protocols/silc10/Makefile.am libpurple/protocols/silc10/Makefile.mingw libpurple/protocols/silc10/README libpurple/protocols/silc10/TODO libpurple/protocols/silc10/buddy.c libpurple/protocols/silc10/chat.c libpurple/protocols/silc10/ft.c libpurple/protocols/silc10/ops.c libpurple/protocols/silc10/pk.c libpurple/protocols/silc10/silc.c libpurple/protocols/silc10/silcpurple.h libpurple/protocols/silc10/util.c libpurple/protocols/silc10/wb.c libpurple/protocols/silc10/wb.h libpurple/purple-2-uninstalled.pc.in libpurple/purple-2.pc.in libpurple/purple-uninstalled.pc.in libpurple/purple.pc.in pidgin/gtkconv.c pidgin/gtkdocklet-gtk.c pidgin/gtkgaim-compat.h pidgin/pidgin-2-uninstalled.pc.in pidgin/pidgin-2.pc.in pidgin/pidgin-uninstalled.pc.in pidgin/pidgin.pc.in |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 28 22:34:59 2012 +0000 +++ b/ChangeLog Thu May 31 03:48:16 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:
--- a/pidgin/gtkconv.c Mon May 28 22:34:59 2012 +0000 +++ b/pidgin/gtkconv.c Thu May 31 03:48:16 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);