Changeset b8c336b for irc_send.c

Timestamp:

2015-05-09T19:50:30Z (10 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

File:

• irc_send.c (modified) (1 diff)

irc_send.c

@@ -175 +175 @@
 
         if (iu == irc->user) {
-                irc_write(irc, ":%s MODE %s +%s", irc->root->host, ic->name, ic->mode);
-                irc_send_names(ic);
                 if (ic->topic && *ic->topic) {
                         irc_send_topic(ic, FALSE);
                 }
+                irc_send_names(ic);
         }
 }