Changeset b556e46 for irc_im.c

Timestamp:

2010-07-09T23:25:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f3b6764

Parents:

c5bff81 (diff), 9a9b520 (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:

Merging main ui-fix.

File:

• irc_im.c (modified) (5 diffs)

irc_im.c

@@ -603 +603 @@
 {
         struct groupchat *c = ic->data;
+        char *trans = NULL, *s;
         
         if( c == NULL )
                 return FALSE;
-        else if( set_getbool( &ic->irc->b->set, "paste_buffer" ) )
+        
+        if( set_getbool( &ic->set, "translate_to_nicks" ) )
+        {
+                char nick[MAX_NICK_LENGTH+1];
+                irc_user_t *iu;
+                
+                strncpy( nick, msg, MAX_NICK_LENGTH );
+                nick[MAX_NICK_LENGTH] = '\0';
+                if( ( s = strchr( nick, ':' ) ) || ( s = strchr( nick, ',' ) ) )
+                {
+                        *s = '\0';
+                        if( ( iu = irc_user_by_name( ic->irc, nick ) ) &&
+                            iu->bu->nick && irc_channel_has_user( ic, iu ) )
+                        {
+                                trans = g_strconcat( iu->bu->nick, msg + ( s - nick ), NULL );
+                                msg = trans;
+                        }
+                }
+        }
+        
+        if( set_getbool( &ic->irc->b->set, "paste_buffer" ) )
         {
                 int delay;
@@ -623 +644 @@
                 ic->pastebuf_timer = b_timeout_add( delay, bee_irc_channel_chat_privmsg_cb, ic );
                 
+                g_free( trans );
                 return TRUE;
         }
@@ -628 +650 @@
                 bee_chat_msg( ic->irc->b, c, msg, 0 );
         
+        g_free( trans );
         return TRUE;
 }
@@ -747 +770 @@
         set_add( &ic->set, "nick", NULL, NULL, ic );
         set_add( &ic->set, "room", NULL, NULL, ic );
+        set_add( &ic->set, "translate_to_nicks", "true", set_eval_bool, ic );
         
         /* chat_type == groupchat */
@@ -790 +814 @@
         set_del( &ic->set, "nick" );
         set_del( &ic->set, "room" );
+        set_del( &ic->set, "translate_to_nicks" );
         
         ic->flags &= ~IRC_CHANNEL_TEMP;