Changeset 81e04e1 for protocols/account.c

Timestamp:

2010-04-01T02:32:25Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d860a8d

Parents:

10a96f4

Message:

nogaim.c is close to doing something useful again without speaking any IRC
itself.

File:

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

protocols/account.c

@@ -29 +29 @@
 #include "chat.h"
 
-account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
+account_t *account_add( bee_t *bee, struct prpl *prpl, char *user, char *pass )
 {
         account_t *a;
         set_t *s;
         
-        if( irc->accounts )
-        {
-                for( a = irc->accounts; a->next; a = a->next );
+        if( bee->accounts )
+        {
+                for( a = bee->accounts; a->next; a = a->next );
                 a = a->next = g_new0( account_t, 1 );
         }
         else
         {
-                irc->accounts = a = g_new0 ( account_t, 1 );
+                bee->accounts = a = g_new0 ( account_t, 1 );
         }
         
@@ -48 +48 @@
         a->pass = g_strdup( pass );
         a->auto_connect = 1;
-        a->irc = irc;
+        a->bee = bee;
         
         s = set_add( &a->set, "auto_connect", "true", set_eval_account, a );
@@ -153 +153 @@
 }
 
-account_t *account_get( irc_t *irc, char *id )
+account_t *account_get( bee_t *bee, char *id )
 {
         account_t *a, *ret = NULL;
@@ -169 +169 @@
                 if( ( proto = find_protocol( id ) ) )
                 {
-                        for( a = irc->accounts; a; a = a->next )
+                        for( a = bee->accounts; a; a = a->next )
                                 if( a->prpl == proto &&
                                     a->prpl->handle_cmp( handle, a->user ) == 0 )
@@ -186 +186 @@
         if( sscanf( id, "%d", &nr ) == 1 && nr < 1000 )
         {
-                for( a = irc->accounts; a; a = a->next )
+                for( a = bee->accounts; a; a = a->next )
                         if( ( nr-- ) == 0 )
                                 return( a );
@@ -193 +193 @@
         }
         
-        for( a = irc->accounts; a; a = a->next )
+        for( a = bee->accounts; a; a = a->next )
         {
                 if( g_strcasecmp( id, a->prpl->name ) == 0 )
@@ -214 +214 @@
 }
 
-void account_del( irc_t *irc, account_t *acc )
+void account_del( bee_t *bee, account_t *acc )
 {
         account_t *a, *l = NULL;
@@ -223 +223 @@
                 return;
         
-        for( a = irc->accounts; a; a = (l=a)->next )
+        for( a = bee->accounts; a; a = (l=a)->next )
                 if( a == acc )
                 {
@@ -229 +229 @@
                                 l->next = a->next;
                         else
-                                irc->accounts = a->next;
-                        
-                        for( c = irc->chatrooms; c; c = nc )
+                                bee->accounts = a->next;
+                        
+                        /** FIXME
+                        for( c = bee->chatrooms; c; c = nc )
                         {
                                 nc = c->next;
                                 if( acc == c->acc )
-                                        chat_del( irc, c );
+                                        chat_del( bee, c );
                         }
+                        */
                         
                         while( a->set )
@@ -254 +256 @@
 }
 
-void account_on( irc_t *irc, account_t *a )
+void account_on( bee_t *bee, account_t *a )
 {
         if( a->ic )
@@ -268 +270 @@
 }
 
-void account_off( irc_t *irc, account_t *a )
+void account_off( bee_t *bee, account_t *a )
 {
         imc_logout( a->ic, FALSE );
@@ -336 +338 @@
 int account_reconnect_delay( account_t *a )
 {
-        char *setting = set_getstr( &a->irc->b->set, "auto_reconnect_delay" );
+        char *setting = set_getstr( &a->bee->set, "auto_reconnect_delay" );
         struct account_reconnect_delay p;