1 files changed, 7 insertions, 22 deletions

diff --git a/protocols/nogaim.h b/protocols/nogaim.h
index 2080465c..bae4489f 100644
--- a/protocols/nogaim.h
+++ b/protocols/nogaim.h
@@ -38,6 +38,7 @@
 #define _NOGAIM_H
 
 #include "bitlbee.h"
+#include "account.h"
 #include "proxy.h"
 #include "md5.h"
 #include "sha.h"
@@ -62,7 +63,7 @@
 /* ok. now the fun begins. first we create a connection structure */
 struct gaim_connection
 {
-	struct prpl *prpl;
+	account_t *acc;
 	guint32 flags;
 	
 	/* each connection then can have its own protocol-specific data */
@@ -78,8 +79,6 @@ struct gaim_connection
 	GSList *deny;
 	int permdeny;
 	
-	struct aim_user *user;
-	
 	char username[64];
 	char displayname[128];
 	char password[32];
@@ -125,26 +124,12 @@ struct buddy {
 	struct gaim_connection *gc; /* the connection it belongs to */
 };
 
-struct aim_user {
-	char username[64];
-	char alias[SELF_ALIAS_LEN]; 
-	char password[32];
-	char user_info[2048];
-	int options;
-	struct prpl *prpl;
-	/* prpls can use this to save information about the user,
-	 * like which server to connect to, etc */
-	char proto_opt[7][256];
-
-	struct gaim_connection *gc;
-	irc_t *irc;
-};
-
 struct prpl {
 	int options;
 	const char *name;
 
-	void (* login)		(struct aim_user *);
+	void (* acc_init)	(account_t *);
+	void (* login)		(account_t *);
 	void (* keepalive)	(struct gaim_connection *);
 	void (* close)		(struct gaim_connection *);
 	
@@ -179,7 +164,7 @@ struct prpl {
 	GList *(* away_states)(struct gaim_connection *gc);
 	
 	/* Mainly for AOL, since they think "Bung hole" == "Bu ngho le". *sigh* */
-	int (* cmp_buddynames) (const char *who1, const char *who2);
+	int (* handle_cmp) (const char *who1, const char *who2);
 };
 
 #define UC_UNAVAILABLE  1
@@ -205,13 +190,13 @@ void bim_add_block( struct gaim_connection *gc, char *handle );
 void bim_rem_block( struct gaim_connection *gc, char *handle );
 
 void nogaim_init();
-char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
+char *set_eval_away_devoice( set_t *set, char *value );
 
 gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
 void cancel_auto_reconnect( struct account *a );
 
 /* multi.c */
-G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( struct aim_user *user );
+G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( account_t *acc );
 G_MODULE_EXPORT void destroy_gaim_conn( struct gaim_connection *gc );
 G_MODULE_EXPORT void set_login_progress( struct gaim_connection *gc, int step, char *msg );
 G_MODULE_EXPORT void hide_login_progress( struct gaim_connection *gc, char *msg );