merge in latest trunk

1 files changed, 0 insertions, 15 deletions

diff --git a/set.c b/set.c
index 5f3e7b49..b18d7cc8 100644
--- a/set.c
+++ b/set.c
@@ -356,21 +356,6 @@ char *set_eval_voice_buddies( set_t *set, char *value )
 	return set_eval_mode_buddies(set, value, 'v');
 }
 
-char *set_eval_charset( set_t *set, char *value )
-{
-	GIConv cd;
-
-	if ( g_strncasecmp( value, "none", 4 ) == 0 )
-		return value;
-
-	cd = g_iconv_open( "UTF-8", value );
-	if( cd == (GIConv) -1 )
-		return NULL;
-
-	g_iconv_close( cd );
-	return value;
-}
-
 /* possible values: never, opportunistic, manual, always */
 char *set_eval_otr_policy( set_t *set, char *value )
 {