Changeset 51a3d12

Timestamp:

2010-07-25T09:11:48Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c6bf805

Parents:

5588edf5

Message:

Allow change nicknames when moving contacts between groups. Also fixing a
bug that caused many empty channel mode changes being sent.

Files:

• irc_im.c (modified) (1 diff)
• irc_send.c (modified) (1 diff)

irc_im.c

@@ -288 +288 @@
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
         irc_t *irc = (irc_t *) bee->ui_data;
+        bee_user_flags_t online;
+        
+        /* Take the user offline temporarily so we can change the nick (if necessary). */
+        if( ( online = bu->flags & BEE_USER_ONLINE ) )
+                bu->flags &= ~BEE_USER_ONLINE;
         
         bee_irc_channel_update( irc, NULL, iu );
         bee_irc_user_nick_update( iu );
+        
+        if( online )
+        {
+                bu->flags |= online;
+                bee_irc_channel_update( irc, NULL, iu );
+        }
         
         return TRUE;

irc_send.c

@@ -396 +396 @@
                             ic->irc->root->user, ic->irc->root->host );
         
-        irc_write( ic->irc, ":%s MODE %s %s", from, ic->name, changes );
-}
+        if( *changes )
+                irc_write( ic->irc, ":%s MODE %s %s", from, ic->name, changes );
+}