Changes in protocols/nogaim.h [5b52a48:fb62f81f]

File:

• protocols/nogaim.h (modified) (6 diffs)

protocols/nogaim.h

@@ -39 +39 @@
 
 #include "bitlbee.h"
-#include "account.h"
 #include "proxy.h"
 #include "md5.h"
@@ -64 +63 @@
 struct gaim_connection
 {
-        account_t *acc;
+        struct prpl *prpl;
         guint32 flags;
         
@@ -79 +78 @@
         GSList *deny;
         int permdeny;
+        
+        struct aim_user *user;
         
         char username[64];
@@ -125 +126 @@
 };
 
+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 (* acc_init)       (account_t *);
-        void (* login)          (account_t *);
+        void (* login)          (struct aim_user *);
         void (* keepalive)      (struct gaim_connection *);
         void (* close)          (struct gaim_connection *);
@@ -165 +180 @@
         
         /* Mainly for AOL, since they think "Bung hole" == "Bu ngho le". *sigh* */
-        int (* handle_cmp) (const char *who1, const char *who2);
+        int (* cmp_buddynames) (const char *who1, const char *who2);
 };
 
@@ -191 +206 @@
 
 void nogaim_init();
-char *set_eval_away_devoice( set_t *set, char *value );
-
-gboolean auto_reconnect( gpointer data, gint fd, b_input_condition cond );
+char *set_eval_away_devoice( irc_t *irc, set_t *set, char *value );
+
+gboolean auto_reconnect( gpointer data );
 void cancel_auto_reconnect( struct account *a );
 
 /* multi.c */
-G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( account_t *acc );
+G_MODULE_EXPORT struct gaim_connection *new_gaim_conn( struct aim_user *user );
 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 );