Changeset 5f40da7 for set.c

Timestamp:

2011-12-26T10:51:19Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

199fea6

Parents:

96f954d (diff), 644b808 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging oauth-xmpp branch, which adds support for OAuth2 authentication
against some XMPP services (Google Talk, Facebook and Microsoft's MSN-XMPP
gateway).

File:

• set.c (modified) (2 diffs)

set.c

@@ -85 +85 @@
                 return NULL;
         
-        return s->value ? s->value : s->def;
+        return set_value( s );
 }
 
@@ -250 +250 @@
 }
 
-/*
-char *set_eval_ops( set_t *set, char *value )
-{
-        irc_t *irc = set->data;
-        
-        if( g_strcasecmp( value, "user" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "+o-o", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "root" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "-o+o", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "both" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "+oo", irc->nick, irc->mynick );
-        else if( g_strcasecmp( value, "none" ) == 0 )
-                irc_write( irc, ":%s!%s@%s MODE %s %s %s %s", irc->mynick, irc->mynick, irc->myhost,
-                                                              irc->channel, "-oo", irc->nick, irc->mynick );
-        else
-                return SET_INVALID;
-        
-        return value;
-}
-*/
+char *set_eval_oauth( set_t *set, char *value )
+{
+        account_t *acc = set->data;
+        
+        if( bool2int( value ) && strcmp( acc->pass, PASSWORD_PENDING ) == 0 )
+                *acc->pass = '\0';
+        
+        return set_eval_bool( set, value );
+}