Mercurial > pidgin.yaz
changeset 32177:e0856c50cdd8
Fix the merge some more
I don't know whether this was me, kdiff3, or monotone on something.
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sun, 26 Jun 2011 20:37:03 +0000 |
| parents | f2a3c59fc4a6 |
| children | 979bab4c3bca |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Sat Jun 25 19:56:59 2011 +0000 +++ b/pidgin/gtkconv.c Sun Jun 26 20:37:03 2011 +0000 @@ -6320,6 +6320,8 @@ gtk_list_store_remove(GTK_LIST_STORE(model), &iter); gtk_tree_row_reference_free(ref); cbuddy->ui_data = NULL; + } + if (cbuddy) add_chat_buddy_common(conv, cbuddy, NULL); }