Changeset 5c9512f for irc.c

Timestamp:

2006-06-30T09:17:18Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0a3c243

Parents:

1719464

Message:

Made set.c API more generic so it's not specific to irc_t structures anymore,
but can be used for account_t structures too, for example.

File:

• irc.c (modified) (9 diffs)

irc.c

@@ -121 +121 @@
         irc_connection_list = g_slist_append( irc_connection_list, irc );
         
-        set_add( irc, "away_devoice", "true",  set_eval_away_devoice );
-        set_add( irc, "auto_connect", "true", set_eval_bool );
-        set_add( irc, "auto_reconnect", "false", set_eval_bool );
-        set_add( irc, "auto_reconnect_delay", "300", set_eval_int );
-        set_add( irc, "buddy_sendbuffer", "false", set_eval_bool );
-        set_add( irc, "buddy_sendbuffer_delay", "200", set_eval_int );
-        set_add( irc, "charset", "iso8859-1", set_eval_charset );
-        set_add( irc, "debug", "false", set_eval_bool );
-        set_add( irc, "default_target", "root", NULL );
-        set_add( irc, "display_namechanges", "false", set_eval_bool );
-        set_add( irc, "handle_unknown", "root", NULL );
-        set_add( irc, "lcnicks", "true", set_eval_bool );
-        set_add( irc, "ops", "both", set_eval_ops );
-        set_add( irc, "private", "true", set_eval_bool );
-        set_add( irc, "query_order", "lifo", NULL );
-        set_add( irc, "save_on_quit", "true", set_eval_bool );
-        set_add( irc, "strip_html", "true", NULL );
-        set_add( irc, "to_char", ": ", set_eval_to_char );
-        set_add( irc, "typing_notice", "false", set_eval_bool );
-        set_add( irc, "password", NULL, passchange);
+        set_add( &irc->set, "away_devoice", "true",  set_eval_away_devoice, irc );
+        set_add( &irc->set, "auto_connect", "true", set_eval_bool, irc );
+        set_add( &irc->set, "auto_reconnect", "false", set_eval_bool, irc );
+        set_add( &irc->set, "auto_reconnect_delay", "300", set_eval_int, irc );
+        set_add( &irc->set, "buddy_sendbuffer", "false", set_eval_bool, irc );
+        set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
+        set_add( &irc->set, "charset", "iso8859-1", set_eval_charset, irc );
+        set_add( &irc->set, "debug", "false", set_eval_bool, irc );
+        set_add( &irc->set, "default_target", "root", NULL, irc );
+        set_add( &irc->set, "display_namechanges", "false", set_eval_bool, irc );
+        set_add( &irc->set, "handle_unknown", "root", NULL, irc );
+        set_add( &irc->set, "lcnicks", "true", set_eval_bool, irc );
+        set_add( &irc->set, "ops", "both", set_eval_ops, irc );
+        set_add( &irc->set, "password", NULL, passchange, irc );
+        set_add( &irc->set, "private", "true", set_eval_bool, irc );
+        set_add( &irc->set, "query_order", "lifo", NULL, irc );
+        set_add( &irc->set, "save_on_quit", "true", set_eval_bool, irc );
+        set_add( &irc->set, "strip_html", "true", NULL, irc );
+        set_add( &irc->set, "to_char", ": ", set_eval_to_char, irc );
+        set_add( &irc->set, "typing_notice", "false", set_eval_bool, irc );
         
         conf_loaddefaults( irc );
@@ -212 +212 @@
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
-        if( irc->status & USTATUS_IDENTIFIED && set_getint( irc, "save_on_quit" ) ) 
+        if( irc->status & USTATUS_IDENTIFIED && set_getint( &irc->set, "save_on_quit" ) ) 
                 if( storage_save( irc, TRUE ) != STORAGE_OK )
                         irc_usermsg( irc, "Error while saving settings!" );
@@ -364 +364 @@
                         }
                         
-                        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+                        if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
                         {
                                 conv[IRC_MAX_LINE] = 0;
@@ -584 +584 @@
         
         strip_newlines( line );
-        if( ( cs = set_getstr( irc, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
+        if( ( cs = set_getstr( &irc->set, "charset" ) ) && ( g_strcasecmp( cs, "utf-8" ) != 0 ) )
         {
                 char conv[IRC_MAX_LINE+1];
@@ -666 +666 @@
                         if( u->gc && control )
                         {
-                                if( set_getint( irc, "away_devoice" ) && !u->away )
+                                if( set_getint( &irc->set, "away_devoice" ) && !u->away )
                                         s = "+";
                                 else
@@ -675 +675 @@
                         else if( !u->gc )
                         {
-                                if( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( set_getstr( irc, "ops" ), "root" ) == 0 || strcmp( set_getstr( irc, "ops" ), "both" ) == 0 ) )
+                                if( strcmp( u->nick, irc->mynick ) == 0 && ( strcmp( set_getstr( &irc->set, "ops" ), "root" ) == 0 || strcmp( set_getstr( &irc->set, "ops" ), "both" ) == 0 ) )
                                         s = "@";
-                                else if( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( set_getstr( irc, "ops" ), "user" ) == 0 || strcmp( set_getstr( irc, "ops" ), "both" ) == 0 ) )
+                                else if( strcmp( u->nick, irc->nick ) == 0 && ( strcmp( set_getstr( &irc->set, "ops" ), "user" ) == 0 || strcmp( set_getstr( &irc->set, "ops" ), "both" ) == 0 ) )
                                         s = "@";
                                 else
@@ -1084 +1084 @@
         if( !u || !u->gc ) return;
         
-        if( set_getint( irc, "buddy_sendbuffer" ) && set_getint( irc, "buddy_sendbuffer_delay" ) > 0 )
+        if( set_getint( &irc->set, "buddy_sendbuffer" ) && set_getint( &irc->set, "buddy_sendbuffer_delay" ) > 0 )
         {
                 int delay;
@@ -1111 +1111 @@
                 strcat( u->sendbuf, "\n" );
                 
-                delay = set_getint( irc, "buddy_sendbuffer_delay" );
+                delay = set_getint( &irc->set, "buddy_sendbuffer_delay" );
                 if( delay <= 5 )
                         delay *= 1000;
@@ -1176 +1176 @@
                 int len = strlen( irc->nick) + 3;
                 prefix = g_new (char, len );
-                g_snprintf( prefix, len, "%s%s", irc->nick, set_getstr( irc, "to_char" ) );
+                g_snprintf( prefix, len, "%s%s", irc->nick, set_getstr( &irc->set, "to_char" ) );
                 prefix[len-1] = 0;
         }