Changeset a3019499

Timestamp:

2015-11-26T02:14:34Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

1ec454c

Parents:

42a418e

Message:

purple: fix /join #channel, which joined a different channel

When joining named channels, purple_chat_join() returned NULL instead of
a struct groupchat, which was actually created in the conversation
created callback (prplcb_conv_new()).

If the name of this channel turned out to be different to the joined
one, this meant having one empty window in the irc client, and another
one for the other channel.

The fix is to return a mostly-empty struct groupchat immediately, and
pick it up later when the PurpleConversation is created using
bee_chat_by_title(). If that fails, fall back to creating a new one.

This bug also meant there was no proper way to report a join failure.
Future commits will address that, this one just makes that easier.

Thanks to Etan Reisner (deryni) for enlightening me while i was trying
to figure out how to fix this.

File:

• protocols/purple/purple.c (modified) (2 diffs)

protocols/purple/purple.c

@@ -718 +718 @@
         serv_join_chat(purple_account_get_connection(pd->account), chat_hash);
 
-        return NULL;
+        return imcb_chat_new(ic, room);
 }
 
@@ -902 +902 @@
                 struct groupchat *gc;
 
-                gc = imcb_chat_new(ic, conv->name);
-                if (conv->title != NULL) {
-                        imcb_chat_name_hint(gc, conv->title);
+                gc = bee_chat_by_title(ic->bee, ic, conv->name);
+
+                if (!gc) {
+                        gc = imcb_chat_new(ic, conv->name);
+                        if (conv->title != NULL) {
+                                imcb_chat_name_hint(gc, conv->title);
+                        }
+                }
+
+                /* don't set the topic if it's just the name */
+                if (conv->title != NULL && strcmp(conv->name, conv->title) != 0) {
                         imcb_chat_topic(gc, NULL, conv->title, 0);
                 }