Changeset f7ca587 for irc_channel.c

Timestamp:

2010-07-29T18:18:54Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1521a85

Parents:

2fe5eb9

Message:

Restore default_target setting, kill last_root_cmd variable and just use
the last_channel variable, like for any other user.

File:

• irc_channel.c (modified) (2 diffs)

irc_channel.c

@@ -481 +481 @@
 {
         irc_t *irc = ic->irc;
+        irc_user_t *iu;
         const char *s;
         
@@ -489 +490 @@
         {
                 char to[s-msg+1];
-                irc_user_t *iu;
                 
                 memset( to, 0, sizeof( to ) );
                 strncpy( to, msg, s - msg );
                 while( *(++s) && isspace( *s ) ) {}
-                
-                iu = irc_user_by_name( irc, to );
-                if( iu && iu->f->privmsg )
-                {
-                        iu->last_channel = ic;
-                        iu->f->privmsg( iu, s );
-                }
+                msg = s;
+                
+                if( !( iu = irc_user_by_name( irc, to ) ) )
+                        irc_channel_printf( ic, "User does not exist: %s", to );
                 else
-                {
-                        irc_channel_printf( ic, "User does not exist: %s", to );
-                }
-        }
+                        ic->last_target = iu;
+        }
+        else if( g_strcasecmp( set_getstr( &irc->b->set, "default_target" ), "last" ) == 0 &&
+                 ic->last_target && g_slist_find( irc->users, ic->last_target ) )
+                iu = ic->last_target;
         else
-        {
-                /* TODO: Maybe just use root->privmsg here now? */
-                char cmd[strlen(msg)+1];
-                
-                g_free( ic->irc->last_root_cmd );
-                ic->irc->last_root_cmd = g_strdup( ic->name );
-                
-                strcpy( cmd, msg );
-                root_command_string( ic->irc, cmd );
+                iu = irc->root;
+        
+        if( iu && iu->f->privmsg )
+        {
+                iu->last_channel = ic;
+                iu->f->privmsg( iu, msg );
         }