Changes in irc.c [0baed0d:92a9c68]

File:

• irc.c (modified) (4 diffs)

irc.c

@@ -52 +52 @@
 {
         irc_t *irc = set->data;
+        char *test;
+        gsize test_bytes = 0;
         GIConv ic, oc;
 
@@ -57 +59 @@
                 value = g_strdup( "utf-8" );
 
+        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
+        {
+                return NULL;
+        }
+        
+        /* Do a test iconv to see if the user picked an IRC-compatible
+           charset (for example utf-16 goes *horribly* wrong). */
+        if( ( test = g_convert_with_iconv( " ", 1, oc, NULL, &test_bytes, NULL ) ) == NULL ||
+            test_bytes > 1 )
+        {
+                g_free( test );
+                g_iconv_close( oc );
+                irc_usermsg( irc, "Unsupported character set: The IRC protocol "
+                                  "only supports 8-bit character sets." );
+                return NULL;
+        }
+        g_free( test );
+        
         if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
         {
-                return NULL;
-        }
-        if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
-        {
-                g_iconv_close( ic );
+                g_iconv_close( oc );
                 return NULL;
         }
@@ -175 +191 @@
         s = set_add( &irc->set, "default_target", "root", NULL, irc );
         s = set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
+        s = set_add( &irc->set, "display_timestamps", "true", set_eval_bool, irc );
         s = set_add( &irc->set, "handle_unknown", "root", NULL, irc );
         s = set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
@@ -188 +205 @@
         s->flags |= SET_NULL_OK;
         s = set_add( &irc->set, "strip_html", "true", NULL, irc );
+        s = set_add( &irc->set, "timezone", "local", set_eval_timezone, irc );
         s = set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
         s = set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );