Merging loads of stuff from mainline.

1 files changed, 22 insertions, 5 deletions

diff --git a/irc.c b/irc.c
index 8f4024dd..a195adb4 100644
--- a/irc.c
+++ b/irc.c
@@ -104,6 +104,7 @@ irc_t *irc_new( int fd )
 	//s = set_add( &b->set, "control_channel", irc->channel, NULL/*set_eval_control_channel*/, irc );
 	s = set_add( &b->set, "default_target", "root", NULL, irc );
 	s = set_add( &b->set, "display_namechanges", "false", set_eval_bool, irc );
+	s = set_add( &b->set, "display_timestamps", "true", set_eval_bool, irc );
 	s = set_add( &b->set, "handle_unknown", "root", NULL, irc );
 	s = set_add( &b->set, "lcnicks", "true", set_eval_bool, irc );
 	s = set_add( &b->set, "ops", "both", NULL/*set_eval_ops*/, irc );
@@ -111,6 +112,7 @@ irc_t *irc_new( int fd )
 	s = set_add( &b->set, "query_order", "lifo", NULL, irc );
 	s = set_add( &b->set, "root_nick", ROOT_NICK, NULL/*set_eval_root_nick*/, irc );
 	s = set_add( &b->set, "simulate_netsplit", "true", set_eval_bool, irc );
+	s = set_add( &b->set, "timezone", "local", set_eval_timezone, irc );
 	s = set_add( &b->set, "to_char", ": ", set_eval_to_char, irc );
 	s = set_add( &b->set, "typing_notice", "false", set_eval_bool, irc );
 
@@ -746,22 +748,37 @@ static gboolean irc_userping( gpointer _irc, gint fd, b_input_condition cond )
 	return TRUE;
 }
 
-
 static char *set_eval_charset( set_t *set, char *value )
 {
-	irc_t *irc = set->data;
+	irc_t *irc = (irc_t*) set->data;
+	char *test;
+	gsize test_bytes = 0;
 	GIConv ic, oc;
 
 	if( g_strcasecmp( value, "none" ) == 0 )
 		value = g_strdup( "utf-8" );
 
-	if( ( ic = g_iconv_open( "utf-8", value ) ) == (GIConv) -1 )
+	if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
 	{
 		return NULL;
 	}
-	if( ( oc = g_iconv_open( value, "utf-8" ) ) == (GIConv) -1 )
+	
+	/* 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 )
 	{
-		g_iconv_close( ic );
+		g_iconv_close( oc );
 		return NULL;
 	}