Merge ui-fix (which includes killerbee (i.e. file transfers and libpurple

support)). ui-fix rewrites the complete IRC core, fixing many things that
were broken/hacky/limited so far.

The list is too long to include here, but http://wiki.bitlbee.org/UiFix
has a summary, as does doc/CHANGES and of course the full revision history.

1 files changed, 31 insertions, 12 deletions

diff --git a/set.c b/set.c
index 18d5a50d..17befba9 100644
--- a/set.c
+++ b/set.c
@@ -28,7 +28,7 @@
 /* Used to use NULL for this, but NULL is actually a "valid" value. */
 char *SET_INVALID = "nee";
 
-set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
+set_t *set_add( set_t **head, const char *key, const char *def, set_eval eval, void *data )
 {
 	set_t *s = set_find( head, key );
 	
@@ -62,13 +62,14 @@ set_t *set_add( set_t **head, char *key, char *def, set_eval eval, void *data )
 	return s;
 }
 
-set_t *set_find( set_t **head, char *key )
+set_t *set_find( set_t **head, const char *key )
 {
 	set_t *s = *head;
 	
 	while( s )
 	{
-		if( g_strcasecmp( s->key, key ) == 0 )
+		if( g_strcasecmp( s->key, key ) == 0 ||
+		    ( s->old_key && g_strcasecmp( s->old_key, key ) == 0 ) )
 			break;
 		s = s->next;
 	}
@@ -76,7 +77,7 @@ set_t *set_find( set_t **head, char *key )
 	return s;
 }
 
-char *set_getstr( set_t **head, char *key )
+char *set_getstr( set_t **head, const char *key )
 {
 	set_t *s = set_find( head, key );
 	
@@ -86,7 +87,7 @@ char *set_getstr( set_t **head, char *key )
 	return s->value ? s->value : s->def;
 }
 
-int set_getint( set_t **head, char *key )
+int set_getint( set_t **head, const char *key )
 {
 	char *s = set_getstr( head, key );
 	int i = 0;
@@ -100,7 +101,7 @@ int set_getint( set_t **head, char *key )
 	return i;
 }
 
-int set_getbool( set_t **head, char *key )
+int set_getbool( set_t **head, const char *key )
 {
 	char *s = set_getstr( head, key );
 	
@@ -110,7 +111,7 @@ int set_getbool( set_t **head, char *key )
 	return bool2int( s );
 }
 
-int set_setstr( set_t **head, char *key, char *value )
+int set_setstr( set_t **head, const char *key, char *value )
 {
 	set_t *s = set_find( head, key );
 	char *nv = value;
@@ -149,7 +150,7 @@ int set_setstr( set_t **head, char *key, char *value )
 	return 1;
 }
 
-int set_setint( set_t **head, char *key, int value )
+int set_setint( set_t **head, const char *key, int value )
 {
 	char s[24];	/* Not quite 128-bit clean eh? ;-) */
 	
@@ -157,7 +158,7 @@ int set_setint( set_t **head, char *key, int value )
 	return set_setstr( head, key, s );
 }
 
-void set_del( set_t **head, char *key )
+void set_del( set_t **head, const char *key )
 {
 	set_t *s = *head, *t = NULL;
 	
@@ -175,13 +176,14 @@ void set_del( set_t **head, char *key )
 			*head = s->next;
 		
 		g_free( s->key );
-		if( s->value ) g_free( s->value );
-		if( s->def ) g_free( s->def );
+		g_free( s->old_key );
+		g_free( s->value );
+		g_free( s->def );
 		g_free( s );
 	}
 }
 
-int set_reset( set_t **head, char *key )
+int set_reset( set_t **head, const char *key )
 {
 	set_t *s;
 	
@@ -212,6 +214,21 @@ char *set_eval_bool( set_t *set, char *value )
 	return is_bool( value ) ? value : SET_INVALID;
 }
 
+char *set_eval_list( set_t *set, char *value )
+{
+	GSList *options = set->eval_data, *opt;
+	
+	for( opt = options; opt; opt = opt->next )
+		if( strcmp( value, opt->data ) == 0 )
+			return value;
+	
+	/* TODO: It'd be nice to show the user a list of allowed values,
+	         but we don't have enough context here to do that. May
+	         want to fix that. */
+	
+	return NULL;
+}
+
 char *set_eval_to_char( set_t *set, char *value )
 {
 	char *s = g_new( char, 3 );
@@ -224,6 +241,7 @@ char *set_eval_to_char( set_t *set, char *value )
 	return s;
 }
 
+/*
 char *set_eval_ops( set_t *set, char *value )
 {
 	irc_t *irc = set->data;
@@ -245,3 +263,4 @@ char *set_eval_ops( set_t *set, char *value )
 	
 	return value;
 }
+*/