Changeset b74b287 for protocols/purple

Timestamp:

2009-10-11T21:08:26Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ec5e57d

Parents:

0f7ee7e5

Message:

Fixed account cleanup (use remove, not destroy) and now using user's account
settings.

File:

• protocols/purple/purple.c (modified) (4 diffs)

protocols/purple/purple.c

@@ -93 +93 @@
 }
 
+static void purple_sync_settings( account_t *acc, PurpleAccount *pa )
+{
+        PurplePlugin *prpl = purple_plugins_find_with_id( pa->protocol_id );
+        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
+        GList *i;
+        
+        for( i = pi->protocol_options; i; i = i->next )
+        {
+                PurpleAccountOption *o = i->data;
+                const char *name;
+                set_t *s;
+                
+                name = purple_account_option_get_setting( o );
+                s = set_find( &acc->set, name );
+                if( s->value == NULL )
+                        continue;
+                
+                switch( purple_account_option_get_type( o ) )
+                {
+                case PURPLE_PREF_STRING:
+                        purple_account_set_string( pa, name, set_getstr( &acc->set, name ) );
+                        break;
+                
+                case PURPLE_PREF_INT:
+                        purple_account_set_int( pa, name, set_getint( &acc->set, name ) );
+                        break;
+                
+                case PURPLE_PREF_BOOLEAN:
+                        purple_account_set_bool( pa, name, set_getbool( &acc->set, name ) );
+                        break;
+                
+                default:
+                        break;
+                }
+        }
+}
+
 static void purple_login( account_t *acc )
 {
@@ -103 +140 @@
         purple_connections = g_slist_prepend( purple_connections, ic );
         
-        pa = purple_account_new( acc->user, acc->prpl->name );
+        ic->proto_data = pa = purple_account_new( acc->user, acc->prpl->name );
         purple_account_set_password( pa, acc->pass );
-        
-        ic->proto_data = pa;
+        purple_sync_settings( acc, pa );
         
         purple_account_set_enabled( pa, "BitlBee", TRUE );
@@ -117 +153 @@
         purple_account_set_enabled( pa, "BitlBee", FALSE );
         purple_connections = g_slist_remove( purple_connections, ic );
-        purple_account_destroy( pa );
+        purple_accounts_remove( pa );
 }
 
@@ -194 +230 @@
         
         if( ic != NULL )
+        {
                 imc_logout( ic, TRUE );
+        }
 }