Changeset 2b14eef

Timestamp:

2006-06-20T22:14:46Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

00ab350

Parents:

9b46b64

Message:

Implemented handling of autoconnect attribute.

Files:

• account.c (modified) (1 diff)
• account.h (modified) (1 diff)
• root_commands.c (modified) (1 diff)
• storage_xml.c (modified) (4 diffs)

account.c

@@ -45 +45 @@
         a->user = g_strdup( user );
         a->pass = g_strdup( pass );
+        a->auto_connect = 1;
         a->irc = irc;
         

account.h

@@ -34 +34 @@
         char *server;
         
+        int auto_connect;
         int reconnect;
         

root_commands.c

@@ -307 +307 @@
                         
                                 for( a = irc->accounts; a; a = a->next )
-                                        if( !a->gc )
+                                        if( !a->gc && a->auto_connect )
                                                 account_on( irc, a );
                         } 

storage_xml.c

@@ -126 +126 @@
         else if( g_strcasecmp( element_name, "account" ) == 0 )
         {
-                char *protocol, *handle, *server, *password;
+                char *protocol, *handle, *server, *password, *autoconnect;
                 struct prpl *prpl = NULL;
                 
@@ -132 +132 @@
                 password = xml_attr( attr_names, attr_values, "password" );
                 server = xml_attr( attr_names, attr_values, "server" );
+                autoconnect = xml_attr( attr_names, attr_values, "autoconnect" );
                 
                 protocol = xml_attr( attr_names, attr_values, "protocol" );
@@ -148 +149 @@
                         if( server )
                                 xd->current_account->server = g_strdup( server );
+                        if( autoconnect )
+                                /* Return value doesn't matter, since account_add() already sets
+                                   a default! */
+                                sscanf( autoconnect, "%d", &xd->current_account->auto_connect );
                 }
         }
@@ -385 +390 @@
         for( acc = irc->accounts; acc; acc = acc->next )
         {
-                if( !xml_printf( fd, "\t<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%s\"", acc->prpl->name, acc->user, acc->pass, "yes" ) )
+                if( !xml_printf( fd, "\t<account protocol=\"%s\" handle=\"%s\" password=\"%s\" autoconnect=\"%d\"", acc->prpl->name, acc->user, acc->pass, acc->auto_connect ) )
                         goto write_error;
                 if( acc->server && acc->server[0] && !xml_printf( fd, " server=\"%s\"", acc->server ) )