Changeset 975708a for irc_im.c

Timestamp:

2010-09-05T12:08:12Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2c6b0f4

Parents:

4e1be76 (diff), ed320e8 (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:

Mainline merge.

File:

• irc_im.c (modified) (4 diffs)

irc_im.c

@@ -252 +252 @@
 {
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
-        irc_t *irc = (irc_t *) bee->ui_data;
         char *s;
         
@@ -266 +265 @@
         if( ( bu->ic->flags & OPT_LOGGED_IN ) && set_getbool( &bee->set, "display_namechanges" ) )
         {
+                /* People don't like this /NOTICE. Meh, let's go back to the old one.
                 char *msg = g_strdup_printf( "<< \002BitlBee\002 - Changed name to `%s' >>", iu->fullname );
                 irc_send_msg( iu, "NOTICE", irc->user->nick, msg, NULL );
+                */
+                imcb_log( bu->ic, "User `%s' changed name to `%s'", iu->nick, iu->fullname );
         }
         
@@ -691 +693 @@
                 {
                         *s = '\0';
-                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) &&
+                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) && iu->bu &&
                             iu->bu->nick && irc_channel_has_user( ic, iu ) )
                         {
@@ -796 +798 @@
                 c->ic->acc->prpl->chat_topic( c, topic );
                 g_free( topic );
-                return TRUE;
-        }
-                
+        }
+                
+        /* Whatever happened, the IM module should ack the topic change. */
         return FALSE;
 }