Changeset 2288705 for account.c

Timestamp:

2009-12-07T21:54:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1c3008a

Parents:

aac4017 (diff), 36cf9fd (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 head.

File:

• account.c (modified) (10 diffs)

account.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "account.h"
+#include "chat.h"
 
 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
@@ -55 +56 @@
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= ACC_SET_NOSAVE;
+        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
@@ -77 +78 @@
         /* Double-check: We refuse to edit on-line accounts. */
         if( set->flags & ACC_SET_OFFLINE_ONLY && acc->ic )
-                return NULL;
-        
-        if( strcmp( set->key, "username" ) == 0 )
+                return SET_INVALID;
+        
+        if( strcmp( set->key, "server" ) == 0 )
+        {
+                g_free( acc->server );
+                if( value && *value )
+                {
+                        acc->server = g_strdup( value );
+                        return value;
+                }
+                else
+                {
+                        acc->server = g_strdup( set->def );
+                        return g_strdup( set->def );
+                }
+        }
+        else if( strcmp( set->key, "username" ) == 0 )
         {
                 g_free( acc->user );
@@ -87 +102 @@
         else if( strcmp( set->key, "password" ) == 0 )
         {
-                g_free( acc->pass );
-                acc->pass = g_strdup( value );
-                return NULL;    /* password shouldn't be visible in plaintext! */
-        }
-        else if( strcmp( set->key, "server" ) == 0 )
-        {
-                g_free( acc->server );
-                if( *value )
-                {
-                        acc->server = g_strdup( value );
-                        return value;
+                if( value )
+                {
+                        g_free( acc->pass );
+                        acc->pass = g_strdup( value );
+                        return NULL;    /* password shouldn't be visible in plaintext! */
                 }
                 else
                 {
-                        acc->server = NULL;
-                        return g_strdup( set->def );
+                        /* NULL can (should) be stored in the set_t
+                           variable, but is otherwise not correct. */
+                        return SET_INVALID;
                 }
         }
@@ -108 +118 @@
         {
                 if( !is_bool( value ) )
-                        return NULL;
+                        return SET_INVALID;
                 
                 acc->auto_connect = bool2int( value );
@@ -114 +124 @@
         }
         
-        return NULL;
+        return SET_INVALID;
 }
 
@@ -181 +191 @@
 {
         account_t *a, *l = NULL;
+        struct chat *c, *nc;
         
         if( acc->ic )
@@ -193 +204 @@
                         else
                                 irc->accounts = a->next;
+                        
+                        for( c = irc->chatrooms; c; c = nc )
+                        {
+                                nc = c->next;
+                                if( acc == c->acc )
+                                        chat_del( irc, c );
+                        }
                         
                         while( a->set )
@@ -254 +272 @@
         
         /* Sure, call me evil for implementing my own fscanf here, but it's
-           dead simple and I'm immediately at the next part to parse. */
+           dead simple and I immediately know where to continue parsing. */
         
         if( *value == 0 )
@@ -287 +305 @@
         struct account_reconnect_delay p;
         
-        return account_reconnect_delay_parse( value, &p ) ? value : NULL;
+        return account_reconnect_delay_parse( value, &p ) ? value : SET_INVALID;
 }