pidgin/ljfisher-ssl-client-auth

Fix the merge some more

2011-06-26, Paul Aurich
9b37f17300f7
Parents 143d0ccdcfa8
Children 77896a9a09c2
Fix the merge some more

I don't know whether this was me, kdiff3, or monotone on something.
1 files changed, 2 insertions(+), 0 deletions(-)
  • +2 -0
    pidgin/gtkconv.c
    • --- 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);
    }