Changes in protocols/account.c [bb5ce568:0e788f5]

File:

• protocols/account.c (modified) (6 diffs)

protocols/account.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2010 Wilmer van der Gaast and others                *
+  * Copyright 2002-2013 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -53 +53 @@
         
         s = set_add( &a->set, "auto_connect", "true", set_eval_account, a );
-        s->flags |= SET_NOSAVE;
+        s->flags |= ACC_SET_NOSAVE;
         
         s = set_add( &a->set, "auto_reconnect", "true", set_eval_bool, a );
@@ -61 +61 @@
         
         s = set_add( &a->set, "nick_source", "handle", set_eval_nick_source, a );
-        s->flags |= SET_NOSAVE; /* Just for bw compatibility! */
+        s->flags |= ACC_SET_NOSAVE; /* Just for bw compatibility! */
         
         s = set_add( &a->set, "password", NULL, set_eval_account, a );
-        s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
+        s->flags |= ACC_SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
         
         s = set_add( &a->set, "tag", NULL, set_eval_account, a );
-        s->flags |= SET_NOSAVE;
+        s->flags |= ACC_SET_NOSAVE;
         
         s = set_add( &a->set, "username", NULL, set_eval_account, a );
-        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= ACC_SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
         set_setstr( &a->set, "username", user );
         
@@ -154 +154 @@
         else if( strcmp( set->key, "password" ) == 0 )
         {
-                if( value )
-                {
-                        g_free( acc->pass );
-                        acc->pass = g_strdup( value );
-                        return NULL;    /* password shouldn't be visible in plaintext! */
-                }
-                else
-                {
-                        /* NULL can (should) be stored in the set_t
-                           variable, but is otherwise not correct. */
-                        return SET_INVALID;
-                }
+                /* set -del should be allowed now, but I don't want to have any
+                   NULL pointers to have to deal with. */
+                if( !value )
+                        value = "";
+                
+                g_free( acc->pass );
+                acc->pass = g_strdup( value );
+                return NULL;    /* password shouldn't be visible in plaintext! */
         }
         else if( strcmp( set->key, "tag" ) == 0 )
@@ -354 +350 @@
         a->prpl->login( a );
         
-        if( a->ic && !( a->ic->flags & OPT_SLOW_LOGIN ) )
+        if( a->ic && !( a->ic->flags & ( OPT_SLOW_LOGIN | OPT_LOGGED_IN ) ) )
                 a->ic->keepalive = b_timeout_add( 120000, account_on_timeout, a->ic );
 }
@@ -373 +369 @@
         struct im_connection *ic = d;
         
-        imcb_error( ic, "Connection timeout" );
-        imc_logout( ic, TRUE );
+        if( !( ic->flags & ( OPT_SLOW_LOGIN | OPT_LOGGED_IN ) ) )
+        {
+                imcb_error( ic, "Connection timeout" );
+                imc_logout( ic, TRUE );
+        }
         
         return FALSE;