Changeset d8d63a2 for protocols/nogaim.h

Timestamp:

2006-12-05T20:40:17Z (17 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

7740c4c

Parents:

f4aa393 (diff), 55078f5 (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.

Message:

[merge] wilmer

File:

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

protocols/nogaim.h

@@ -39 +39 @@
 
 #include "bitlbee.h"
+#include "account.h"
 #include "proxy.h"
 #include "md5.h"
@@ -63 +64 @@
 struct gaim_connection
 {
-        struct prpl *prpl;
+        account_t *acc;
         guint32 flags;
         
@@ -78 +79 @@
         GSList *deny;
         int permdeny;
-        
-        struct aim_user *user;
         
         char username[64];
@@ -126 +125 @@
 };
 
-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 *);
@@ -180 +165 @@
         
         /* 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);
 };
 
@@ -206 +191 @@
 
 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 );
@@ -212 +197 @@
 
 /* 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 );