diff options
| author | dx <dx@dxzone.com.ar> | 2015-12-30 20:05:58 -0300 |
|---|---|---|
| committer | dx <dx@dxzone.com.ar> | 2015-12-30 20:05:58 -0300 |
| commit | 9e0a16af69f54d7c2da381c95912eeab18391c96 (patch) | |
| tree | 4cf8601fc0d868d2e26243e16fbde88b4c0bae13 | |
| parent | e0d0f00da7b04377e3117d3bdfdfc3307f699869 (diff) | |
| download | pidgin-9e0a16af69f54d7c2da381c95912eeab18391c96.tar.gz | |
Backed out 187b51ce9922 because it breaks rejoining XMPP MUCs (maybe others) upon reconnection (trac ticket #16724)
| -rw-r--r-- | libpurple/server.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libpurple/server.c b/libpurple/server.c index 1d29f863bc..27a796ffef 100644 --- a/libpurple/server.c +++ b/libpurple/server.c @@ -850,18 +850,7 @@ PurpleConversation *serv_got_joined_chat(PurpleConnection *gc, 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); |