pidgin/pidgin

Backed out 187b51ce9922 because it breaks rejoining XMPP MUCs (maybe others) upon reconnection (trac ticket #16724)
release-2.x.y
2015-12-30, dx
a5d1c14b6021
Parents 968ef3b0caed
Children 43646e59a8d3
Backed out 187b51ce9922 because it breaks rejoining XMPP MUCs (maybe others) upon reconnection (trac ticket #16724)
1 files changed, 1 insertions(+), 12 deletions(-)
  • +1 -12
    libpurple/server.c
    • --- a/libpurple/server.c Tue Dec 29 18:41:57 2015 -0600
    +++ b/libpurple/server.c Wed Dec 30 20:05:58 2015 -0300
    @@ -850,18 +850,7 @@
    g_return_val_if_fail(account != NULL, NULL);
    g_return_val_if_fail(name != NULL, NULL);
    - conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
    - name, account);
    - if (!conv) {
    - purple_debug_info(NULL, "Opening %s chat on account %s",
    - name, purple_account_get_username(account));
    - conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
    - }
    - else {
    - purple_debug_info(NULL, "Chat %s on account %s already exists",
    - name, purple_account_get_username(account));
    - }
    -
    + conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
    g_return_val_if_fail(conv != NULL, NULL);
    chat = PURPLE_CONV_CHAT(conv);