Changes in account.c [547f937:b7d3cc34]

File:

• account.c (modified) (5 diffs)

account.c

@@ -28 +28 @@
 #include "account.h"
 
-account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass )
+account_t *account_add( irc_t *irc, int protocol, char *user, char *pass )
 {
         account_t *a;
@@ -42 +42 @@
         }
         
-        a->prpl = prpl;
+        a->protocol = protocol;
         a->user = g_strdup( user );
         a->pass = g_strdup( pass );
@@ -66 +66 @@
         for( a = irc->accounts; a; a = a->next )
         {
-                if( g_strcasecmp( id, a->prpl->name ) == 0 )
+                if( g_strcasecmp( id, proto_name[a->protocol] ) == 0 )
                 {
                         if( !ret )
@@ -124 +124 @@
         }
         
+        if( proto_prpl[a->protocol]->login == NULL )
+        {
+                irc_usermsg( irc, "Support for protocol %s is not included in this BitlBee", proto_name[a->protocol] );
+                return;
+        }
+        
         cancel_auto_reconnect( a );
         
         u = g_new0 ( struct aim_user, 1 );
         u->irc = irc;
-        u->prpl = a->prpl;
+        u->protocol = a->protocol;
         strncpy( u->username, a->user, sizeof( u->username ) - 1 );
         strncpy( u->password, a->pass, sizeof( u->password ) - 1 );
@@ -136 +142 @@
         a->reconnect = 0;
         
-        a->prpl->login( u );
+        proto_prpl[a->protocol]->login( u );
 }