- Timestamp:
- 2005-12-15T11:55:27Z (18 years ago)
- Branches:
- master
- Children:
- 15832cc, bd69a21
- Parents:
- 11e090b (diff), 547f937 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
account.c
r11e090b rbf02a67 28 28 #include "account.h" 29 29 30 account_t *account_add( irc_t *irc, int protocol, char *user, char *pass )30 account_t *account_add( irc_t *irc, struct prpl *prpl, char *user, char *pass ) 31 31 { 32 32 account_t *a; … … 42 42 } 43 43 44 a->pr otocol = protocol;44 a->prpl = prpl; 45 45 a->user = g_strdup( user ); 46 46 a->pass = g_strdup( pass ); … … 66 66 for( a = irc->accounts; a; a = a->next ) 67 67 { 68 if( g_strcasecmp( id, proto_name[a->protocol]) == 0 )68 if( g_strcasecmp( id, a->prpl->name ) == 0 ) 69 69 { 70 70 if( !ret ) … … 124 124 } 125 125 126 if( proto_prpl[a->protocol]->login == NULL )127 {128 irc_usermsg( irc, "Support for protocol %s is not included in this BitlBee", proto_name[a->protocol] );129 return;130 }131 132 126 cancel_auto_reconnect( a ); 133 127 134 128 u = g_new0 ( struct aim_user, 1 ); 135 129 u->irc = irc; 136 u->pr otocol = a->protocol;130 u->prpl = a->prpl; 137 131 strncpy( u->username, a->user, sizeof( u->username ) - 1 ); 138 132 strncpy( u->password, a->pass, sizeof( u->password ) - 1 ); … … 142 136 a->reconnect = 0; 143 137 144 proto_prpl[a->protocol]->login( u );138 a->prpl->login( u ); 145 139 } 146 140
Note: See TracChangeset
for help on using the changeset viewer.