/pidgin/main: 7fb8821cba5f: Backed out 50884c0b222a because it b...

[Eion Robb]

Does it need a got_joined_chat() thrown in there with the find_chat() ?

On 19 July 2015 at 11:08, Kevin Stange <kevin at simguy.net> wrote:

> I backed out this change because it was causing MUCs to not rejoin
> completely.  The () is still shown around the name in the tab title and
> the chat entry widget won't allow sending messages.  New messages sent
> to the chat by others appear, so the chat room join is partial.
>
> I haven't reviewed the change for the 2.x.y branch (187b51ce9922) but it
> may have the same issue.
>
> On 07/18/2015 06:04 PM, Kevin Stange wrote:
> > Changeset: 7fb8821cba5fed0eaed0082110feaa96746421b8
> > Author:        Kevin Stange <kstange at pidgin.im>
> > Date:  2015-07-18 18:04 -0500
> > Branch:        default
> > URL: https://hg.pidgin.im/pidgin/main/rev/7fb8821cba5f
> >
> > Description:
> >
> > Backed out 50884c0b222a because it breaks rejoining XMPP MUCs (maybe
> others) upon reconnection
> >
> > diffstat:
> >
> >  libpurple/server.c |  5 +----
> >  1 files changed, 1 insertions(+), 4 deletions(-)
> >
> > diffs (15 lines):
> >
> > diff --git a/libpurple/server.c b/libpurple/server.c
> > --- a/libpurple/server.c
> > +++ b/libpurple/server.c
> > @@ -765,10 +765,7 @@ PurpleChatConversation *purple_serv_got_
> >       g_return_val_if_fail(account != NULL, NULL);
> >       g_return_val_if_fail(name != NULL, NULL);
> >
> > -     chat = purple_conversations_find_chat_with_account(name, account);
> > -     if (!chat) {
> > -             chat = purple_chat_conversation_new(account, name);
> > -     }
> > +     chat = purple_chat_conversation_new(account, name);
> >       g_return_val_if_fail(chat != NULL, NULL);
> >
> >       if (!g_slist_find(purple_connection_get_active_chats(gc), chat))
> >
> > _______________________________________________
> > Commits mailing list
> > Commits at pidgin.im
> > https://pidgin.im/cgi-bin/mailman/listinfo/commits
> >
>
> _______________________________________________
> Devel mailing list
> Devel at pidgin.im
> https://pidgin.im/cgi-bin/mailman/listinfo/devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://pidgin.im/pipermail/devel/attachments/20150719/9e007656/attachment.html>