Changeset 5c9512f for protocols

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.

Location:

protocols

Files:

• nogaim.c (modified) (20 diffs)
• nogaim.h (modified) (1 diff)

protocols/nogaim.c

@@ -220 +220 @@
         va_end( params );
 
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
                 strip_html( text );
         
@@ -324 +324 @@
                 /* Uhm... This is very sick. */
         }
-        else if( !gc->wants_to_die && set_getint( irc, "auto_reconnect" ) )
-        {
-                int delay = set_getint( irc, "auto_reconnect_delay" );
+        else if( !gc->wants_to_die && set_getint( &irc->set, "auto_reconnect" ) )
+        {
+                int delay = set_getint( &irc->set, "auto_reconnect_delay" );
                 
                 serv_got_crap( gc, "Reconnecting in %d seconds..", delay );
@@ -365 +365 @@
         irc_t *irc = gc->irc;
         
-        if( set_getint( irc, "debug" ) && 0 ) /* This message is too useless */
+        if( set_getint( &irc->set, "debug" ) && 0 ) /* This message is too useless */
                 serv_got_crap( gc, "Receiving user add from handle: %s", handle );
         
         if( user_findhandle( gc, handle ) )
         {
-                if( set_getint( irc, "debug" ) )
+                if( set_getint( &irc->set, "debug" ) )
                         serv_got_crap( gc, "User already exists, ignoring add request: %s", handle );
                 
@@ -458 +458 @@
                 u->realname = g_strdup( realname );
                 
-                if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( gc->irc, "display_namechanges" ) )
+                if( ( gc->flags & OPT_LOGGED_IN ) && set_getint( &gc->irc->set, "display_namechanges" ) )
                         serv_got_crap( gc, "User `%s' changed name to `%s'", u->nick, u->realname );
         }
@@ -514 +514 @@
         if( !u )
         {
-                if( g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "add" ) == 0 )
+                if( g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "add" ) == 0 )
                 {
                         add_buddy( gc, NULL, handle, NULL );
@@ -521 +521 @@
                 else
                 {
-                        if( set_getint( gc->irc, "debug" ) || g_strcasecmp( set_getstr( gc->irc, "handle_unknown" ), "ignore" ) != 0 )
+                        if( set_getint( &gc->irc->set, "debug" ) || g_strcasecmp( set_getstr( &gc->irc->set, "handle_unknown" ), "ignore" ) != 0 )
                         {
                                 serv_got_crap( gc, "serv_got_update() for handle %s:", handle );
@@ -580 +580 @@
         
         /* LISPy... */
-        if( ( set_getint( gc->irc, "away_devoice" ) ) &&                /* Don't do a thing when user doesn't want it */
+        if( ( set_getint( &gc->irc->set, "away_devoice" ) ) &&          /* Don't do a thing when user doesn't want it */
             ( u->online ) &&                                            /* Don't touch offline people */
             ( ( ( u->online != oo ) && !u->away ) ||                    /* Voice joining people */
@@ -599 +599 @@
         if( !u )
         {
-                char *h = set_getstr( irc, "handle_unknown" );
+                char *h = set_getstr( &irc->set, "handle_unknown" );
                 
                 if( g_strcasecmp( h, "ignore" ) == 0 )
                 {
-                        if( set_getint( irc, "debug" ) )
+                        if( set_getint( &irc->set, "debug" ) )
                                 serv_got_crap( gc, "Ignoring message from unknown handle %s", handle );
                         
@@ -610 +610 @@
                 else if( g_strncasecmp( h, "add", 3 ) == 0 )
                 {
-                        int private = set_getint( irc, "private" );
+                        int private = set_getint( &irc->set, "private" );
                         
                         if( h[3] )
@@ -631 +631 @@
         }
         
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
                 strip_html( msg );
 
@@ -672 +672 @@
         user_t *u;
         
-        if( !set_getint( gc->irc, "typing_notice" ) )
+        if( !set_getint( &gc->irc->set, "typing_notice" ) )
                 return;
         
@@ -694 +694 @@
         GList *ir;
         
-        if( set_getint( gc->irc, "debug" ) )
+        if( set_getint( &gc->irc->set, "debug" ) )
                 serv_got_crap( gc, "You were removed from conversation %d", (int) id );
         
@@ -739 +739 @@
         for( c = gc->conversations; c && c->id != id; c = c->next );
         
-        if( ( g_strcasecmp( set_getstr( gc->irc, "strip_html" ), "always" ) == 0 ) ||
-            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( gc->irc, "strip_html" ) ) )
+        if( ( g_strcasecmp( set_getstr( &gc->irc->set, "strip_html" ), "always" ) == 0 ) ||
+            ( ( gc->flags & OPT_CONN_HTML ) && set_getint( &gc->irc->set, "strip_html" ) ) )
                 strip_html( msg );
         
@@ -773 +773 @@
         g_free( s );
         
-        if( set_getint( gc->irc, "debug" ) )
+        if( set_getint( &gc->irc->set, "debug" ) )
                 serv_got_crap( gc, "Creating new conversation: (id=%d,handle=%s)", id, handle );
         
@@ -787 +787 @@
         int me = 0;
         
-        if( set_getint( b->gc->irc, "debug" ) )
+        if( set_getint( &b->gc->irc->set, "debug" ) )
                 serv_got_crap( b->gc, "User %s added to conversation %d", handle, b->id );
         
@@ -821 +821 @@
         int me = 0;
         
-        if( set_getint( b->gc->irc, "debug" ) )
+        if( set_getint( &b->gc->irc->set, "debug" ) )
                 serv_got_crap( b->gc, "User %s removed from conversation %d (%s)", handle, b->id, reason ? reason : "" );
         
@@ -883 +883 @@
 }
 
-char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value )
-{
+char *set_eval_away_devoice( set_t *set, char *value )
+{
+        irc_t *irc = set->data;
         int st;
         
@@ -898 +899 @@
         /* Horror.... */
         
-        if( st != set_getint( irc, "away_devoice" ) )
+        if( st != set_getint( &irc->set, "away_devoice" ) )
         {
                 char list[80] = "";
@@ -938 +939 @@
         }
         
-        return( set_eval_bool( irc, set, value ) );
+        return( set_eval_bool( set, value ) );
 }
 
@@ -1018 +1019 @@
                 {
                         gc->prpl->set_away( gc, s, away );
-                        if( set_getint( gc->irc, "debug" ) )
+                        if( set_getint( &gc->irc->set, "debug" ) )
                                 serv_got_crap( gc, "Setting away state to %s", s );
                 }

protocols/nogaim.h

@@ -206 +206 @@
 
 void nogaim_init();
-char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
+char *set_eval_away_devoice( set_t *set, char *value );
 
 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );