Changeset a83442a

Timestamp:

2008-03-21T00:39:16Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

851a8c2

Parents:

379c08a

Message:

Fixed handling of "set charset none". Fixes bug #373.

Files:

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

irc.c

@@ -309 +309 @@
                         }
                         
-                        if( ( cs = set_getstr( &irc->set, "charset" ) ) )
+                        if( ( cs = set_getstr( &irc->set, "charset" ) ) && g_strcasecmp( cs, "none" ) != 0 )
                         {
                                 conv[IRC_MAX_LINE] = 0;
@@ -330 +330 @@
                                         {
                                                 irc_write( irc, ":%s NOTICE AUTH :%s", irc->myhost,
-                                                           "Warning: invalid (non-UTF8) characters received at login time." );
+                                                           "Warning: invalid characters received at login time." );
                                                 
                                                 strncpy( conv, lines[i], IRC_MAX_LINE );
@@ -554 +554 @@
         
         strip_newlines( line );
-        if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+        if( ( cs = set_getstr( &irc->set, "charset" ) ) &&
+            g_strcasecmp( cs, "none" ) != 0 && g_strcasecmp( cs, "utf-8" ) != 0 )
         {
                 char conv[IRC_MAX_LINE+1];

set.c

@@ -235 +235 @@
         GIConv cd;
 
-        if ( g_strncasecmp( value, "none", 4 ) == 0 )
+        if( g_strcasecmp( value, "none" ) == 0 )
                 return value;