Changeset 7d31002

Timestamp:

2006-03-31T21:09:36Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e6e1f18

Parents:

e27661d

Message:

Tested and fixed one issue, and got rid of one more superfluous iconv call.

Files:

• irc.c (modified) (3 diffs)
• root_commands.c (modified) (1 diff)

irc.c

@@ -355 +355 @@
                 for( i = 0; *lines[i] != '\0'; i ++ )
                 {
+                        char conv[IRC_MAX_LINE+1];
+                        
                         /* [WvG] Because irc_tokenize splits at every newline, the lines[] list
                             should end with an empty string. This is why this actually works.
@@ -367 +369 @@
                         }
                         
-                        if( ( cs = set_getstr( irc, "charset" ) ) )
+                        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
                         {
-                                char conv[IRC_MAX_LINE+1];
-                                
                                 conv[IRC_MAX_LINE] = 0;
                                 if( do_iconv( cs, "UTF-8", lines[i], conv, 0, IRC_MAX_LINE - 2 ) != -1 )
-                                        strcpy( lines[i], conv );
+                                        lines[i] = conv;
                         }
                         
@@ -588 +588 @@
         
         strip_newlines( line );
-        if( ( cs = set_getstr( irc, "charset" ) ) )
+        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
         {
                 char conv[IRC_MAX_LINE+1];

root_commands.c

@@ -753 +753 @@
         else
         {
-                char utf8[1024];
-                
                 irc_usermsg( irc, "Setting your name to `%s'", cmd[2] );
                 
-                if( g_strncasecmp( set_getstr( irc, "charset" ), "none", 4 ) != 0 &&
-                    do_iconv( set_getstr( irc, "charset" ), "UTF-8", cmd[2], utf8, 0, 1024 ) != -1 )
-                        a->gc->prpl->set_info( a->gc, utf8 );
-                else
-                        a->gc->prpl->set_info( a->gc, cmd[2] );
+                a->gc->prpl->set_info( a->gc, cmd[2] );
         }
 }