Changeset 0da65d5 for protocols/oscar

Timestamp:

2007-03-31T05:40:45Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

aef4828

Parents:

fa29d093

Message:

s/gaim_connection/im_connection/ and some other minor API changes. The rest
will come tomorrow. It compiles, I'll leave the real testing up to someone
else. ;-)

Location:

protocols/oscar

Files:

• aim.h (modified) (1 diff)
• im.c (modified) (2 diffs)
• oscar.c (modified) (111 diffs)
• service.c (modified) (1 diff)

protocols/oscar/aim.h

@@ -574 +574 @@
 
 struct aim_chat_invitation {
-        struct gaim_connection * gc;
+        struct im_connection * ic;
         char * name;
         guint8 exchange;

protocols/oscar/im.c

@@ -1417 +1417 @@
     guint8 *plugin;
     int i = 0, tmp = 0;
-    struct gaim_connection *gc = sess->aux_data;
+    struct im_connection *ic = sess->aux_data;
 
     /* at the moment we just can deal with requests, not with cancel or accept */
@@ -1469 +1469 @@
             case 0x9c:  /* ICQ 5 seems to send this */
                 aim_send_im_ch2_statusmessage(sess, userinfo->sn, args->cookie,
-                        gc->away ? gc->away : "", sess->aim_icq_state, dc);
+                        ic->away ? ic->away : "", sess->aim_icq_state, dc);
                 break;
 

protocols/oscar/oscar.c

@@ -116 +116 @@
         int inpa;
         int id;
-        struct gaim_connection *gc; /* i hate this. */
-        struct conversation *cnv; /* bah. */
+        struct im_connection *ic; /* i hate this. */
+        struct groupchat *cnv; /* bah. */
         int maxlen;
         int maxvis;
@@ -123 +123 @@
 
 struct ask_direct {
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         char *sn;
         char ip[64];
@@ -130 +130 @@
 
 struct icq_auth {
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         guint32 uin;
 };
@@ -158 +158 @@
 }
 
-static struct chat_connection *find_oscar_chat_by_conn(struct gaim_connection *gc,
+static struct chat_connection *find_oscar_chat_by_conn(struct im_connection *ic,
                                                         aim_conn_t *conn) {
-        GSList *g = ((struct oscar_data *)gc->proto_data)->oscar_chats;
+        GSList *g = ((struct oscar_data *)ic->proto_data)->oscar_chats;
         struct chat_connection *c = NULL;
 
@@ -243 +243 @@
         aim_conn_t *conn = (aim_conn_t *)data;
         aim_session_t *sess = aim_conn_getsess(conn);
-        struct gaim_connection *gc = sess ? sess->aux_data : NULL;
+        struct im_connection *ic = sess ? sess->aux_data : NULL;
         struct oscar_data *odata;
 
-        if (!gc) {
-                /* gc is null. we return, else we seg SIGSEG on next line. */
+        if (!ic) {
+                /* ic is null. we return, else we seg SIGSEG on next line. */
                 return FALSE;
         }
       
-        if (!g_slist_find(get_connections(), gc)) {
+        if (!g_slist_find(get_connections(), ic)) {
                 /* oh boy. this is probably bad. i guess the only thing we 
                  * can really do is return? */
@@ -257 +257 @@
         }
 
-        odata = (struct oscar_data *)gc->proto_data;
+        odata = (struct oscar_data *)ic->proto_data;
 
         if (condition & GAIM_INPUT_READ) {
@@ -263 +263 @@
                         aim_rxdispatch(odata->sess);
                                if (odata->killme)
-                                       signoff(gc);
+                                       signoff(ic);
                 } else {
                         if ((conn->type == AIM_CONN_TYPE_BOS) ||
                                    !(aim_getconn_type(odata->sess, AIM_CONN_TYPE_BOS))) {
-                                hide_login_progress_error(gc, _("Disconnected."));
-                                signoff(gc);
+                                hide_login_progress_error(ic, _("Disconnected."));
+                                signoff(ic);
                         } else if (conn->type == AIM_CONN_TYPE_CHAT) {
-                                struct chat_connection *c = find_oscar_chat_by_conn(gc, conn);
+                                struct chat_connection *c = find_oscar_chat_by_conn(ic, conn);
                                 char buf[BUF_LONG];
                                 c->conn = NULL;
@@ -313 +313 @@
 static gboolean oscar_login_connect(gpointer data, gint source, b_input_condition cond)
 {
-        struct gaim_connection *gc = data;
+        struct im_connection *ic = data;
         struct oscar_data *odata;
         aim_session_t *sess;
         aim_conn_t *conn;
 
-        if (!g_slist_find(get_connections(), gc)) {
+        if (!g_slist_find(get_connections(), ic)) {
                 closesocket(source);
                 return FALSE;
         }
 
-        odata = gc->proto_data;
+        odata = ic->proto_data;
         sess = odata->sess;
         conn = aim_getconn_type_all(sess, AIM_CONN_TYPE_AUTH);
 
         if (source < 0) {
-                hide_login_progress(gc, _("Couldn't connect to host"));
-                signoff(gc);
+                hide_login_progress(ic, _("Couldn't connect to host"));
+                signoff(ic);
                 return FALSE;
         }
 
         aim_conn_completeconnect(sess, conn);
-        gc->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
                         oscar_callback, conn);
         
@@ -340 +340 @@
 }
 
-static void oscar_acc_init(account_t *acc)
+static void oscar_init(account_t *acc)
 {
         set_t *s;
@@ -357 +357 @@
         aim_conn_t *conn;
         char buf[256];
-        struct gaim_connection *gc = new_gaim_conn(acc);
-        struct oscar_data *odata = gc->proto_data = g_new0(struct oscar_data, 1);
+        struct im_connection *ic = new_gaim_conn(acc);
+        struct oscar_data *odata = ic->proto_data = g_new0(struct oscar_data, 1);
 
         if (isdigit(acc->user[0])) {
@@ -365 +365 @@
                    We don't do those anymore, but let's stick with it, just in case
                    it accidentally fixes something else too... </bitlbee> */
-                gc->password[8] = 0;
+                ic->password[8] = 0;
         } else {
-                gc->flags |= OPT_CONN_HTML;
+                ic->flags |= OPT_CONN_HTML;
         }
 
@@ -378 +378 @@
         aim_tx_setenqueue(sess, AIM_TX_IMMEDIATE, NULL);
         odata->sess = sess;
-        sess->aux_data = gc;
+        sess->aux_data = ic;
 
         conn = aim_newconn(sess, AIM_CONN_TYPE_AUTH, NULL);
         if (conn == NULL) {
-                hide_login_progress(gc, _("Unable to login to AIM"));
-                signoff(gc);
+                hide_login_progress(ic, _("Unable to login to AIM"));
+                signoff(ic);
                 return;
         }
         
         if (acc->server == NULL) {
-                hide_login_progress(gc, "No servername specified");
-                signoff(gc);
+                hide_login_progress(ic, "No servername specified");
+                signoff(ic);
                 return;
         }
@@ -395 +395 @@
         if (g_strcasecmp(acc->server, "login.icq.com") != 0 &&
             g_strcasecmp(acc->server, "login.oscar.aol.com") != 0) {
-                serv_got_crap(gc, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
-        }
-        
-        g_snprintf(buf, sizeof(buf), _("Signon: %s"), gc->username);
-        set_login_progress(gc, 2, buf);
+                serv_got_crap(ic, "Warning: Unknown OSCAR server: `%s'. Please review your configuration if the connection fails.",acc->server);
+        }
+        
+        g_snprintf(buf, sizeof(buf), _("Signon: %s"), ic->username);
+        set_login_progress(ic, 2, buf);
 
         aim_conn_addhandler(sess, conn, 0x0017, 0x0007, gaim_parse_login, 0);
@@ -405 +405 @@
 
         conn->status |= AIM_CONN_STATUS_INPROGRESS;
-        conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, gc);
+        conn->fd = proxy_connect(acc->server, AIM_LOGIN_PORT, oscar_login_connect, ic);
         if (conn->fd < 0) {
-                hide_login_progress(gc, _("Couldn't connect to host"));
-                signoff(gc);
+                hide_login_progress(ic, _("Couldn't connect to host"));
+                signoff(ic);
                 return;
         }
-        aim_request_login(sess, conn, gc->username);
-}
-
-static void oscar_close(struct gaim_connection *gc) {
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
+        aim_request_login(sess, conn, ic->username);
+}
+
+static void oscar_logout(struct im_connection *ic) {
+        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
         
         while (odata->oscar_chats) {
@@ -438 +438 @@
         if (odata->oldp)
                 g_free(odata->oldp);
-        if (gc->inpa > 0)
-                b_event_remove(gc->inpa);
+        if (ic->inpa > 0)
+                b_event_remove(ic->inpa);
         if (odata->cnpa > 0)
                 b_event_remove(odata->cnpa);
@@ -447 +447 @@
         g_free(odata->sess);
         odata->sess = NULL;
-        g_free(gc->proto_data);
-        gc->proto_data = NULL;
+        g_free(ic->proto_data);
+        ic->proto_data = NULL;
 }
 
 static gboolean oscar_bos_connect(gpointer data, gint source, b_input_condition cond) {
-        struct gaim_connection *gc = data;
+        struct im_connection *ic = data;
         struct oscar_data *odata;
         aim_session_t *sess;
         aim_conn_t *bosconn;
 
-        if (!g_slist_find(get_connections(), gc)) {
+        if (!g_slist_find(get_connections(), ic)) {
                 closesocket(source);
                 return FALSE;
         }
 
-        odata = gc->proto_data;
+        odata = ic->proto_data;
         sess = odata->sess;
         bosconn = odata->conn;
 
         if (source < 0) {
-                hide_login_progress(gc, _("Could Not Connect"));
-                signoff(gc);
+                hide_login_progress(ic, _("Could Not Connect"));
+                signoff(ic);
                 return FALSE;
         }
 
         aim_conn_completeconnect(sess, bosconn);
-        gc->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
                         oscar_callback, bosconn);
-        set_login_progress(gc, 4, _("Connection established, cookie sent"));
+        set_login_progress(ic, 4, _("Connection established, cookie sent"));
         
         return FALSE;
@@ -486 +486 @@
         aim_conn_t *bosconn;
 
-        struct gaim_connection *gc = sess->aux_data;
-        struct oscar_data *od = gc->proto_data;
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *od = ic->proto_data;
         port = AIM_LOGIN_PORT;
 
@@ -498 +498 @@
                 case 0x05:
                         /* Incorrect nick/password */
-                        hide_login_progress(gc, _("Incorrect nickname or password."));
+                        hide_login_progress(ic, _("Incorrect nickname or password."));
 //                      plugin_event(event_error, (void *)980, 0, 0, 0);
                         break;
                 case 0x11:
                         /* Suspended account */
-                        hide_login_progress(gc, _("Your account is currently suspended."));
+                        hide_login_progress(ic, _("Your account is currently suspended."));
                         break;
                 case 0x18:
                         /* connecting too frequently */
-                        hide_login_progress(gc, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
+                        hide_login_progress(ic, _("You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."));
                         break;
                 case 0x1c:
                         /* client too old */
-                        hide_login_progress(gc, _("The client version you are using is too old. Please upgrade at " WEBSITE));
+                        hide_login_progress(ic, _("The client version you are using is too old. Please upgrade at " WEBSITE));
                         break;
                 default:
-                        hide_login_progress(gc, _("Authentication Failed"));
+                        hide_login_progress(ic, _("Authentication Failed"));
                         break;
                 }
@@ -526 +526 @@
         bosconn = aim_newconn(sess, AIM_CONN_TYPE_BOS, NULL);
         if (bosconn == NULL) {
-                hide_login_progress(gc, _("Internal Error"));
+                hide_login_progress(ic, _("Internal Error"));
                 od->killme = TRUE;
                 return 0;
@@ -560 +560 @@
         aim_conn_addhandler(sess, bosconn, AIM_CB_FAM_MSG, AIM_CB_MSG_MTN, gaim_parsemtn, 0);
 
-        ((struct oscar_data *)gc->proto_data)->conn = bosconn;
+        ((struct oscar_data *)ic->proto_data)->conn = bosconn;
         for (i = 0; i < (int)strlen(info->bosip); i++) {
                 if (info->bosip[i] == ':') {
@@ -569 +569 @@
         host = g_strndup(info->bosip, i);
         bosconn->status |= AIM_CONN_STATUS_INPROGRESS;
-        bosconn->fd = proxy_connect(host, port, oscar_bos_connect, gc);
+        bosconn->fd = proxy_connect(host, port, oscar_bos_connect, ic);
         g_free(host);
         if (bosconn->fd < 0) {
-                hide_login_progress(gc, _("Could Not Connect"));
+                hide_login_progress(ic, _("Could Not Connect"));
                 od->killme = TRUE;
                 return 0;
         }
         aim_sendcookie(sess, bosconn, info->cookie);
-        b_event_remove(gc->inpa);
+        b_event_remove(ic->inpa);
 
         return 1;
@@ -583 +583 @@
 
 struct pieceofcrap {
-        struct gaim_connection *gc;
+        struct im_connection *ic;
         unsigned long offset;
         unsigned long len;
@@ -595 +595 @@
 {
         struct pieceofcrap *pos = data;
-        struct oscar_data *od = pos->gc->proto_data;
+        struct oscar_data *od = pos->ic->proto_data;
         char in = '\0';
         int x = 0;
@@ -610 +610 @@
         }
         if (in != '\n') {
-                do_error_dialog(pos->gc, "Gaim was unable to get a valid hash for logging into AIM."
+                do_error_dialog(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
                                 " You may be disconnected shortly.", "Login Error");
                 b_event_remove(pos->inpa);
@@ -633 +633 @@
 
         if (source < 0) {
-                do_error_dialog(pos->gc, "Gaim was unable to get a valid hash for logging into AIM."
+                do_error_dialog(pos->ic, "Gaim was unable to get a valid hash for logging into AIM."
                                 " You may be disconnected shortly.", "Login Error");
                 if (pos->modname)
@@ -699 +699 @@
 
         pos = g_new0(struct pieceofcrap, 1);
-        pos->gc = sess->aux_data;
+        pos->ic = sess->aux_data;
         pos->conn = fr->conn;
 
@@ -727 +727 @@
         char *key;
         va_list ap;
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
 
         va_start(ap, fr);
@@ -733 +733 @@
         va_end(ap);
 
-        aim_send_login(sess, fr->conn, gc->username, gc->password, &info, key);
+        aim_send_login(sess, fr->conn, ic->username, ic->password, &info, key);
 
         return 1;
@@ -739 +739 @@
 
 static int conninitdone_chat(aim_session_t *sess, aim_frame_t *fr, ...) {
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
         struct chat_connection *chatcon;
         static int id = 1;
@@ -751 +751 @@
         aim_clientready(sess, fr->conn);
 
-        chatcon = find_oscar_chat_by_conn(gc, fr->conn);
+        chatcon = find_oscar_chat_by_conn(ic, fr->conn);
         chatcon->id = id;
-        chatcon->cnv = serv_got_joined_chat(gc, chatcon->show);
+        chatcon->cnv = serv_got_joined_chat(ic, chatcon->show);
         chatcon->cnv->data = chatcon;
 
@@ -772 +772 @@
 
 static gboolean oscar_chatnav_connect(gpointer data, gint source, b_input_condition cond) {
-        struct gaim_connection *gc = data;
+        struct im_connection *ic = data;
         struct oscar_data *odata;
         aim_session_t *sess;
         aim_conn_t *tstconn;
 
-        if (!g_slist_find(get_connections(), gc)) {
+        if (!g_slist_find(get_connections(), ic)) {
                 closesocket(source);
                 return FALSE;
         }
 
-        odata = gc->proto_data;
+        odata = ic->proto_data;
         sess = odata->sess;
         tstconn = aim_getconn_type_all(sess, AIM_CONN_TYPE_CHATNAV);
@@ -800 +800 @@
 static gboolean oscar_auth_connect(gpointer data, gint source, b_input_condition cond)
 {
-        struct gaim_connection *gc = data;
+        struct im_connection *ic = data;
         struct oscar_data *odata;
         aim_session_t *sess;
         aim_conn_t *tstconn;
 
-        if (!g_slist_find(get_connections(), gc)) {
+        if (!g_slist_find(get_connections(), ic)) {
                 closesocket(source);
                 return FALSE;
         }
 
-        odata = gc->proto_data;
+        odata = ic->proto_data;
         sess = odata->sess;
         tstconn = aim_getconn_type_all(sess, AIM_CONN_TYPE_AUTH);
@@ -829 +829 @@
 {
         struct chat_connection *ccon = data;
-        struct gaim_connection *gc = ccon->gc;
+        struct im_connection *ic = ccon->ic;
         struct oscar_data *odata;
         aim_session_t *sess;
         aim_conn_t *tstconn;
 
-        if (!g_slist_find(get_connections(), gc)) {
+        if (!g_slist_find(get_connections(), ic)) {
                 closesocket(source);
                 g_free(ccon->show);
@@ -842 +842 @@
         }
 
-        odata = gc->proto_data;
+        odata = ic->proto_data;
         sess = odata->sess;
         tstconn = ccon->conn;
@@ -867 +867 @@
         va_list ap;
         struct aim_redirect_data *redir;
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
         aim_conn_t *tstconn;
         int i;
@@ -899 +899 @@
 
                 tstconn->status |= AIM_CONN_STATUS_INPROGRESS;
-                tstconn->fd = proxy_connect(host, port, oscar_auth_connect, gc);
+                tstconn->fd = proxy_connect(host, port, oscar_auth_connect, ic);
                 if (tstconn->fd < 0) {
                         aim_conn_kill(sess, &tstconn);
@@ -916 +916 @@
 
                 tstconn->status |= AIM_CONN_STATUS_INPROGRESS;
-                tstconn->fd = proxy_connect(host, port, oscar_chatnav_connect, gc);
+                tstconn->fd = proxy_connect(host, port, oscar_chatnav_connect, ic);
                 if (tstconn->fd < 0) {
                         aim_conn_kill(sess, &tstconn);
@@ -938 +938 @@
                 ccon = g_new0(struct chat_connection, 1);
                 ccon->conn = tstconn;
-                ccon->gc = gc;
+                ccon->ic = ic;
                 ccon->fd = -1;
                 ccon->name = g_strdup(redir->chat.room);
@@ -967 +967 @@
 
 static int gaim_parse_oncoming(aim_session_t *sess, aim_frame_t *fr, ...) {
-        struct gaim_connection *gc = sess->aux_data;
-        struct oscar_data *od = gc->proto_data;
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *od = ic->proto_data;
         aim_userinfo_t *info;
         time_t time_idle = 0, signon = 0;
@@ -1018 +1018 @@
                 signon = time(NULL) - info->sessionlen;
 
-        tmp = g_strdup(normalize(gc->username));
+        tmp = g_strdup(normalize(ic->username));
         if (!strcmp(tmp, normalize(info->sn)))
-                g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", info->sn);
+                g_snprintf(ic->displayname, sizeof(ic->displayname), "%s", info->sn);
         g_free(tmp);
 
-        serv_got_update(gc, info->sn, 1, info->warnlevel/10, signon,
+        serv_got_update(ic, info->sn, 1, info->warnlevel/10, signon,
                         time_idle, type, caps);
 
@@ -1032 +1032 @@
         aim_userinfo_t *info;
         va_list ap;
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
 
         va_start(ap, fr);
@@ -1038 +1038 @@
         va_end(ap);
 
-        serv_got_update(gc, info->sn, 0, 0, 0, 0, 0, 0);
+        serv_got_update(ic, info->sn, 0, 0, 0, 0, 0, 0);
 
         return 1;
@@ -1045 +1045 @@
 static int incomingim_chan1(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch1_args *args) {
         char *tmp = g_malloc(BUF_LONG + 1);
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
         int flags = 0;
         
@@ -1083 +1083 @@
         
         strip_linefeed(tmp);
-        serv_got_im(gc, userinfo->sn, tmp, flags, time(NULL), -1);
+        serv_got_im(ic, userinfo->sn, tmp, flags, time(NULL), -1);
         g_free(tmp);
         
@@ -1093 +1093 @@
         
 static int incomingim_chan2(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch2_args *args) {
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
 
         if (args->status != AIM_RENDEZVOUS_PROPOSE)
@@ -1111 +1111 @@
                 g_snprintf( txt, 1024, "Got an invitation to chatroom %s from %s: %s", name, userinfo->sn, args->msg );
 
-                inv->gc = gc;
+                inv->ic = ic;
                 inv->exchange = *exch;
                 inv->name = g_strdup(name);
                 
-                do_ask_dialog( gc, txt, inv, oscar_accept_chat, oscar_reject_chat);
+                do_ask_dialog( ic, txt, inv, oscar_accept_chat, oscar_reject_chat);
         
                 if (name)
@@ -1126 +1126 @@
 static void gaim_icq_authgrant(gpointer w, struct icq_auth *data) {
         char *uin, message;
-        struct oscar_data *od = (struct oscar_data *)data->gc->proto_data;
+        struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
         
         uin = g_strdup_printf("%u", data->uin);
@@ -1132 +1132 @@
         aim_ssi_auth_reply(od->sess, od->conn, uin, 1, "");
         // aim_send_im_ch4(od->sess, uin, AIM_ICQMSG_AUTHGRANTED, &message);
-        if(find_buddy(data->gc, uin) == NULL)
-                show_got_added(data->gc, uin, NULL);
+        if(find_buddy(data->ic, uin) == NULL)
+                show_got_added(data->ic, uin, NULL);
         
         g_free(uin);
@@ -1141 +1141 @@
 static void gaim_icq_authdeny(gpointer w, struct icq_auth *data) {
         char *uin, *message;
-        struct oscar_data *od = (struct oscar_data *)data->gc->proto_data;
+        struct oscar_data *od = (struct oscar_data *)data->ic->proto_data;
         
         uin = g_strdup_printf("%u", data->uin);
@@ -1156 +1156 @@
  * For when other people ask you for authorization
  */
-static void gaim_icq_authask(struct gaim_connection *gc, guint32 uin, char *msg) {
+static void gaim_icq_authask(struct im_connection *ic, guint32 uin, char *msg) {
         struct icq_auth *data = g_new(struct icq_auth, 1);
         char *reason = NULL;
@@ -1165 +1165 @@
         
         dialog_msg = g_strdup_printf("The user %u wants to add you to their buddy list for the following reason: %s", uin, reason ? reason : "No reason given.");
-        data->gc = gc;
+        data->ic = ic;
         data->uin = uin;
-        do_ask_dialog(gc, dialog_msg, data, gaim_icq_authgrant, gaim_icq_authdeny);
+        do_ask_dialog(ic, dialog_msg, data, gaim_icq_authgrant, gaim_icq_authdeny);
         g_free(dialog_msg);
 }
 
 static int incomingim_chan4(aim_session_t *sess, aim_conn_t *conn, aim_userinfo_t *userinfo, struct aim_incomingim_ch4_args *args) {
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
 
         switch (args->type) {
@@ -1180 +1180 @@
                         message = g_strdup(args->msg);
                         strip_linefeed(message);
-                        serv_got_im(gc, uin, message, 0, time(NULL), -1);
+                        serv_got_im(ic, uin, message, 0, time(NULL), -1);
                         g_free(uin);
                         g_free(message);
@@ -1199 +1199 @@
 
                         strip_linefeed(message);
-                        serv_got_im(gc, uin, message, 0, time(NULL), -1);
+                        serv_got_im(ic, uin, message, 0, time(NULL), -1);
                         g_free(uin);
                         g_free(m);
@@ -1206 +1206 @@
                 
                 case 0x0006: { /* Someone requested authorization */
-                        gaim_icq_authask(gc, args->uin, args->msg);
+                        gaim_icq_authask(ic, args->uin, args->msg);
                 } break;
 
@@ -1418 +1418 @@
         va_list ap;
         guint16 type;
-        struct gaim_connection *gc = sess->aux_data;
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
 
         va_start(ap, fr);
@@ -1477 +1477 @@
         int count, i;
         aim_userinfo_t *info;
-        struct gaim_connection *g = sess->aux_data;
+        struct im_connection *g = sess->aux_data;
 
         struct chat_connection *c = NULL;
@@ -1500 +1500 @@
         int count, i;
         aim_userinfo_t *info;
-        struct gaim_connection *g = sess->aux_data;
+        struct im_connection *g = sess->aux_data;
 
         struct chat_connection *c = NULL;
@@ -1528 +1528 @@
         guint16 unknown_c9, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen;
         guint32 creationtime;
-        struct gaim_connection *gc = sess->aux_data;
-        struct chat_connection *ccon = find_oscar_chat_by_conn(gc, fr->conn);
+        struct im_connection *ic = sess->aux_data;
+        struct chat_connection *ccon = find_oscar_chat_by_conn(ic, fr->conn);
 
         va_start(ap, fr);
@@ -1555 +1555 @@
         aim_userinfo_t *info;
         char *msg;
-        struct gaim_connection *gc = sess->aux_data;
-        struct chat_connection *ccon = find_oscar_chat_by_conn(gc, fr->conn);
+        struct im_connection *ic = sess->aux_data;
+        struct chat_connection *ccon = find_oscar_chat_by_conn(ic, fr->conn);
         char *tmp;
 
@@ -1617 +1617 @@
         va_list ap;
         aim_userinfo_t *info;
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
 
         va_start(ap, fr);
@@ -1623 +1623 @@
         va_end(ap);
 
-        gc->evil = info->warnlevel/10;
-        /* gc->correction_time = (info->onlinesince - gc->login_time); */
+        ic->evil = info->warnlevel/10;
+        /* ic->correction_time = (info->onlinesince - ic->login_time); */
 
         return 1;
@@ -1646 +1646 @@
 
 static int conninitdone_admin(aim_session_t *sess, aim_frame_t *fr, ...) {
-        struct gaim_connection *gc = sess->aux_data;
-        struct oscar_data *od = gc->proto_data;
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *od = ic->proto_data;
 
         aim_clientready(sess, fr->conn);
@@ -1704 +1704 @@
         va_list ap;
         guint16 maxsiglen;
-        struct gaim_connection *gc = sess->aux_data;
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
 
         va_start(ap, fr);
@@ -1715 +1715 @@
         /* FIXME: It seems we're not really using this, and it broke now that
            struct aim_user is dead.
-        aim_bos_setprofile(sess, fr->conn, gc->user->user_info, NULL, gaim_caps);
+        aim_bos_setprofile(sess, fr->conn, ic->user->user_info, NULL, gaim_caps);
         */
         
@@ -1724 +1724 @@
         va_list ap;
         guint16 maxbuddies, maxwatchers;
-        struct gaim_connection *gc = sess->aux_data;
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
 
         va_start(ap, fr);
@@ -1741 +1741 @@
         guint16 maxpermits, maxdenies;
         va_list ap;
-        struct gaim_connection *gc = sess->aux_data;
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
+        struct im_connection *ic = sess->aux_data;
+        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
 
         va_start(ap, fr);
@@ -1765 +1765 @@
         va_list ap;
         struct aim_icq_offlinemsg *msg;
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
 
         va_start(ap, fr);
@@ -1778 +1778 @@
                         g_snprintf(sender, sizeof(sender), "%u", msg->sender);
                         strip_linefeed(dialog_msg);
-                        serv_got_im(gc, sender, dialog_msg, 0, t, -1);
+                        serv_got_im(ic, sender, dialog_msg, 0, t, -1);
                         g_free(dialog_msg);
                 } break;
@@ -1799 +1799 @@
 
                         strip_linefeed(dialog_msg);
-                        serv_got_im(gc, sender, dialog_msg, 0, t, -1);
+                        serv_got_im(ic, sender, dialog_msg, 0, t, -1);
                         g_free(dialog_msg);
                         g_free(m);
@@ -1805 +1805 @@
                 
                 case 0x0006: { /* Authorization request */
-                        gaim_icq_authask(gc, msg->sender, msg->msg);
+                        gaim_icq_authask(ic, msg->sender, msg->msg);
                 } break;
 
@@ -1833 +1833 @@
 }
 
-static void oscar_keepalive(struct gaim_connection *gc) {
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
+static void oscar_keepalive(struct im_connection *ic) {
+        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
         aim_flap_nop(odata->sess, odata->conn);
 }
 
-static int oscar_send_im(struct gaim_connection *gc, char *name, char *message, int len, int imflags) {
-        struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
-        int ret = 0;
+static int oscar_send_im(struct im_connection *ic, char *name, char *message, int imflags) {
+        struct oscar_data *odata = (struct oscar_data *)ic->proto_data;
+        int ret = 0, len = strlen(message);
         if (imflags & IM_FLAG_AWAY) {
                 ret = aim_send_im(odata->sess, name, AIM_IMFLAGS_AWAY, message);
@@ -1892 +1892 @@
 }
 
-static void oscar_get_info(struct gaim_connection *g, char *name) {
+static void oscar_get_info(struct im_connection *g, char *name) {
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         if (odata->icq)
@@ -1902 +1902 @@
 }
 
-static void oscar_get_away(struct gaim_connection *g, char *who) {
+static void oscar_get_away(struct im_connection *g, char *who) {
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         if (odata->icq) {
@@ -1914 +1914 @@
 }
 
-static void oscar_set_away_aim(struct gaim_connection *gc, struct oscar_data *od, const char *state, const char *message)
+static void oscar_set_away_aim(struct im_connection *ic, struct oscar_data *od, const char *state, const char *message)
 {
 
@@ -1926 +1926 @@
 
         if (od->rights.maxawaymsglen == 0)
-                do_error_dialog(gc, "oscar_set_away_aim called before locate rights received", "Protocol Error");
+                do_error_dialog(ic, "oscar_set_away_aim called before locate rights received", "Protocol Error");
 
         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_NORMAL);
 
-        if (gc->away)
-                g_free(gc->away);
-        gc->away = NULL;
+        if (ic->away)
+                g_free(ic->away);
+        ic->away = NULL;
 
         if (!message) {
@@ -1944 +1944 @@
                 errstr = g_strdup_printf("Maximum away message length of %d bytes exceeded, truncating", od->rights.maxawaymsglen);
 
-                do_error_dialog(gc, errstr, "Away Message Too Long");
+                do_error_dialog(ic, errstr, "Away Message Too Long");
 
                 g_free(errstr);
         }
 
-        gc->away = g_strndup(message, od->rights.maxawaymsglen);
-        aim_bos_setprofile(od->sess, od->conn, NULL, gc->away, gaim_caps);
+        ic->away = g_strndup(message, od->rights.maxawaymsglen);
+        aim_bos_setprofile(od->sess, od->conn, NULL, ic->away, gaim_caps);
 
         return;
 }
 
-static void oscar_set_away_icq(struct gaim_connection *gc, struct oscar_data *od, const char *state, const char *message)
+static void oscar_set_away_icq(struct im_connection *ic, struct oscar_data *od, const char *state, const char *message)
 {
     const char *msg = NULL;
@@ -1961 +1961 @@
 
         /* clean old states */
-    if (gc->away) {
-                g_free(gc->away);
-                gc->away = NULL;
+    if (ic->away) {
+                g_free(ic->away);
+                ic->away = NULL;
     }
         od->sess->aim_icq_state = 0;
@@ -1979 +1979 @@
         } else if (!g_strcasecmp(state, "Away")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY);
-        gc->away = g_strdup(msg);
+        ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTOAWAY;
         } else if (!g_strcasecmp(state, "Do Not Disturb")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY | AIM_ICQ_STATE_DND | AIM_ICQ_STATE_BUSY);
-        gc->away = g_strdup(msg);
+        ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTODND;
         } else if (!g_strcasecmp(state, "Not Available")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_OUT | AIM_ICQ_STATE_AWAY);
-        gc->away = g_strdup(msg);
+        ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTONA;
         } else if (!g_strcasecmp(state, "Occupied")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY | AIM_ICQ_STATE_BUSY);
-        gc->away = g_strdup(msg);
+        ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTOBUSY;
         } else if (!g_strcasecmp(state, "Free For Chat")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_CHAT);
-        gc->away = g_strdup(msg);
+        ic->away = g_strdup(msg);
                 od->sess->aim_icq_state = AIM_MTYPE_AUTOFFC;
         } else if (!g_strcasecmp(state, "Invisible")) {
                 aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_INVISIBLE);
-        gc->away = g_strdup(msg);
+        ic->away = g_strdup(msg);
         } else if (!g_strcasecmp(state, GAIM_AWAY_CUSTOM)) {
                 if (no_message) {
@@ -2005 +2005 @@
                 } else {
                         aim_setextstatus(od->sess, od->conn, AIM_ICQ_STATE_AWAY);
-            gc->away = g_strdup(msg);
+            ic->away = g_strdup(msg);
                         od->sess->aim_icq_state = AIM_MTYPE_AUTOAWAY;
                 }
@@ -2013 +2013 @@
 }
 
-static void oscar_set_away(struct gaim_connection *gc, char *state, char *message)
-{
-        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
-
-    oscar_set_away_aim(gc, od, state, message);
+static void oscar_set_away(struct im_connection *ic, char *state, char *message)
+{
+        struct oscar_data *od = (struct oscar_data *)ic->proto_data;
+
+    oscar_set_away_aim(ic, od, state, message);
         if (od->icq)
-                oscar_set_away_icq(gc, od, state, message);
+                oscar_set_away_icq(ic, od, state, message);
 
         return;
 }
 
-static void oscar_add_buddy(struct gaim_connection *g, char *name) {
+static void oscar_add_buddy(struct im_connection *g, char *name, char *group) {
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         aim_ssi_addbuddies(odata->sess, odata->conn, OSCAR_GROUP, &name, 1, 0);
 }
 
-static void oscar_remove_buddy(struct gaim_connection *g, char *name, char *group) {
+static void oscar_remove_buddy(struct im_connection *g, char *name, char *group) {
         struct oscar_data *odata = (struct oscar_data *)g->proto_data;
         struct aim_ssi_item *ssigroup;
@@ -2040 +2040 @@
 
 static int gaim_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...) {
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
         struct aim_ssi_item *curitem;
         int tmp;
@@ -2049 +2049 @@
                 switch (curitem->type) {
                         case 0x0000: /* Buddy */
-                                if ((curitem->name) && (!find_buddy(gc, curitem->name))) {
+                                if ((curitem->name) && (!find_buddy(ic, curitem->name))) {
                                         char *realname = NULL;
 
@@ -2055 +2055 @@
                                                     realname = aim_gettlv_str(curitem->data, 0x0131, 1);
                                                 
-                                        add_buddy(gc, NULL, curitem->name, realname);
+                                        add_buddy(ic, NULL, curitem->name, realname);
                                         
                                         if (realname)
@@ -2065 +2065 @@
                                 if (curitem->name) {
                                         GSList *list;
-                                        for (list=gc->permit; (list && aim_sncmp(curitem->name, list->data)); list=list->next);
+                                        for (list=ic->permit; (list && aim_sncmp(curitem->name, list->data)); list=list->next);
                                         if (!list) {
                                                 char *name;
                                                 name = g_strdup(normalize(curitem->name));
-                                                gc->permit = g_slist_append(gc->permit, name);
+                                                ic->permit = g_slist_append(ic->permit, name);
                                                 tmp++;
                                         }
@@ -2078 +2078 @@
                                 if (curitem->name) {
                                         GSList *list;
-                                        for (list=gc->deny; (list && aim_sncmp(curitem->name, list->data)); list=list->next);
+                                        for (list=ic->deny; (list && aim_sncmp(curitem->name, list->data)); list=list->next);
                                         if (!list) {
                                                 char *name;
                                                 name = g_strdup(normalize(curitem->name));
-                                                gc->deny = g_slist_append(gc->deny, name);
+                                                ic->deny = g_slist_append(ic->deny, name);
                                                 tmp++;
                                         }
@@ -2091 +2091 @@
                                 if (curitem->data) {
                                         guint8 permdeny;
-                                        if ((permdeny = aim_ssi_getpermdeny(sess->ssi.items)) && (permdeny != gc->permdeny)) {
-                                                gc->permdeny = permdeny;
+                                        if ((permdeny = aim_ssi_getpermdeny(sess->ssi.items)) && (permdeny != ic->permdeny)) {
+                                                ic->permdeny = permdeny;
                                                 tmp++;
                                         }
@@ -2110 +2110 @@
         
         /* Now that we have a buddy list, we can tell BitlBee that we're online. */
-        account_online(gc);
+        account_online(ic);
         
         return 1;
@@ -2155 +2155 @@
 }
 
-static void oscar_set_permit_deny(struct gaim_connection *gc) {
-        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+static void oscar_set_permit_deny(struct im_connection *ic) {
+        struct oscar_data *od = (struct oscar_data *)ic->proto_data;
         if (od->icq) {
                 GSList *list;
@@ -2162 +2162 @@
                 int at;
 
-                switch(gc->permdeny) {
+                switch(ic->permdeny) {
                 case 1:
-                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_DENYADD, gc->username);
+                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_DENYADD, ic->username);
                         break;
                 case 2:
-                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_PERMITADD, gc->username);
+                        aim_bos_changevisibility(od->sess, od->conn, AIM_VISIBILITYCHANGE_PERMITADD, ic->username);
                         break;
                 case 3:
-                        list = gc->permit;
+                        list = ic->permit;
                         at = 0;
                         while (list) {
@@ -2179 +2179 @@
                         break;
                 case 4:
-                        list = gc->deny;
+                        list = ic->deny;
                         at = 0;
                         while (list) {
@@ -2190 +2190 @@
                         break;
                 }
-                signoff_blocked(gc);
+                signoff_blocked(ic);
         } else {
                 if (od->sess->ssi.received_data)
-                        aim_ssi_setpermdeny(od->sess, od->conn, gc->permdeny, 0xffffffff);
-        }
-}
-
-static void oscar_add_permit(struct gaim_connection *gc, char *who) {
-        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+                        aim_ssi_setpermdeny(od->sess, od->conn, ic->permdeny, 0xffffffff);
+        }
+}
+
+static void oscar_add_permit(struct im_connection *ic, char *who) {
+        struct oscar_data *od = (struct oscar_data *)ic->proto_data;
         if (od->icq) {
                 aim_ssi_auth_reply(od->sess, od->conn, who, 1, "");
@@ -2207 +2207 @@
 }
 
-static void oscar_add_deny(struct gaim_connection *gc, char *who) {
-        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+static void oscar_add_deny(struct im_connection *ic, char *who) {
+        struct oscar_data *od = (struct oscar_data *)ic->proto_data;
         if (od->icq) {
                 aim_ssi_auth_reply(od->sess, od->conn, who, 0, "");
@@ -2217 +2217 @@
 }
 
-static void oscar_rem_permit(struct gaim_connection *gc, char *who) {
-        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+static void oscar_rem_permit(struct im_connection *ic, char *who) {
+        struct oscar_data *od = (struct oscar_data *)ic->proto_data;
         if (!od->icq) {
                 if (od->sess->ssi.received_data)
@@ -2225 +2225 @@
 }
 
-static void oscar_rem_deny(struct gaim_connection *gc, char *who) {
-        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+static void oscar_rem_deny(struct im_connection *ic, char *who) {
+        struct oscar_data *od = (struct oscar_data *)ic->proto_data;
         if (!od->icq) {
                 if (od->sess->ssi.received_data)
@@ -2233 +2233 @@
 }
 
-static GList *oscar_away_states(struct gaim_connection *gc)
-{
-        struct oscar_data *od = gc->proto_data;
+static GList *oscar_away_states(struct im_connection *ic)
+{
+        struct oscar_data *od = ic->proto_data;
         GList *m = NULL;
 
@@ -2254 +2254 @@
 static int gaim_icqinfo(aim_session_t *sess, aim_frame_t *fr, ...)
 {
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
         gchar who[16];
         GString *str;
@@ -2330 +2330 @@
         }
 
-                serv_got_crap(gc, "%s\n%s", _("User Info"), str->str);
+                serv_got_crap(ic, "%s\n%s", _("User Info"), str->str);
         g_string_free(str, TRUE);
 
@@ -2395 +2395 @@
 static int gaim_parseaiminfo(aim_session_t *sess, aim_frame_t *fr, ...)
 {
-        struct gaim_connection *gc = sess->aux_data;
+        struct im_connection *ic = sess->aux_data;
         va_list ap;
         aim_userinfo_t *userinfo;
@@ -2424 +2424 @@
                         idletime.tm_sec = 0;
                         strftime(buff, 256, _("%d days %H hours %M minutes"), &idletime);
-                        serv_got_crap(gc, "%s: %s", _("Idle Time"), buff);
+                        serv_got_crap(ic, "%s: %s", _("Idle Time"), buff);
                 }
                 
                 if(text) {
                         utf8 = oscar_encoding_to_utf8(extracted_encoding, text, text_length);
-                        serv_got_crap(gc, "%s\n%s", _("User Info"), utf8);
+                        serv_got_crap(ic, "%s\n%s", _("User Info"), utf8);
                 } else {
-                        serv_got_crap(gc, _("No user info available."));
+                        serv_got_crap(ic, _("No user info available."));
                 }
         } else if(infotype == AIM_GETINFO_AWAYMESSAGE && userinfo->flags & AIM_FLAG_AWAY) {
                 utf8 = oscar_encoding_to_utf8(extracted_encoding, text, text_length);
-                serv_got_crap(gc, "%s\n%s", _("Away Message"), utf8);
+                serv_got_crap(ic, "%s\n%s", _("Away Message"), utf8);
         }
 
@@ -2445 +2445 @@
 int gaim_parsemtn(aim_session_t *sess, aim_frame_t *fr, ...)
 {
-        struct gaim_connection * gc = sess->aux_data;
+        struct im_connection * ic = sess->aux_data;
         va_list ap;
         guint16 type1, type2;
@@ -2458 +2458 @@
         if(type2 == 0x0002) {
                 /* User is typing */
-                serv_got_typing(gc, sn, 0, 1);
+                serv_got_typing(ic, sn, 0, 1);
         } 
         else if (type2 == 0x0001) {
                 /* User has typed something, but is not actively typing (stale) */
-                serv_got_typing(gc, sn, 0, 2);
+                serv_got_typing(ic, sn, 0, 2);
         }
         else {
                 /* User has stopped typing */
-                serv_got_typing(gc, sn, 0, 0);
+                serv_got_typing(ic, sn, 0, 0);
         }        
         
@@ -2472 +2472 @@
 }
 
-static char *oscar_get_status_string( struct gaim_connection *gc, int number )
-{
-        struct oscar_data *od = gc->proto_data;
+static char *oscar_get_status_string( struct im_connection *ic, int number )
+{
+        struct oscar_data *od = ic->proto_data;
         
         if( ! number & UC_UNAVAILABLE )
@@ -2500 +2500 @@
 }
 
-int oscar_send_typing(struct gaim_connection *gc, char * who, int typing)
-{
-        struct oscar_data *od = gc->proto_data;
+int oscar_send_typing(struct im_connection *ic, char * who, int typing)
+{
+        struct oscar_data *od = ic->proto_data;
         return( aim_im_sendmtn(od->sess, 1, who, typing ? 0x0002 : 0x0000) );
 }
 
-int oscar_chat_send(struct conversation *c, char *message)
-{
-        struct gaim_connection *gc = c->gc;
-        struct oscar_data * od = (struct oscar_data*)gc->proto_data;
+void oscar_chat_send(struct groupchat *c, char *message, int msgflags)
+{
+        struct im_connection *ic = c->ic;
+        struct oscar_data * od = (struct oscar_data*)ic->proto_data;
         struct chat_connection * ccon;
         int ret;
@@ -2550 +2550 @@
   }
   
-  return (ret >= 0);
-}
-
-void oscar_chat_invite(struct conversation *c, char *message, char *who)
-{
-        struct gaim_connection *gc = c->gc;
-        struct oscar_data * od = (struct oscar_data *)gc->proto_data;
+/*  return (ret >= 0); */
+}
+
+void oscar_chat_invite(struct groupchat *c, char *message, char *who)
+{
+        struct im_connection *ic = c->ic;
+        struct oscar_data * od = (struct oscar_data *)ic->proto_data;
         struct chat_connection *ccon = c->data;
         
@@ -2563 +2563 @@
 }
 
-void oscar_chat_kill(struct gaim_connection *gc, struct chat_connection *cc)
-{
-        struct oscar_data *od = (struct oscar_data *)gc->proto_data;
+void oscar_chat_kill(struct im_connection *ic, struct chat_connection *cc)
+{
+        struct oscar_data *od = (struct oscar_data *)ic->proto_data;
 
         /* Notify the conversation window that we've left the chat */
@@ -2580 +2580 @@
 }
 
-void oscar_chat_leave(struct conversation *c)
-{
-        oscar_chat_kill(c->gc, c->data);
-}
-
-int oscar_chat_join(struct gaim_connection * gc, char * name)
-{
-        struct oscar_data * od = (struct oscar_data *)gc->proto_data;
+void oscar_chat_leave(struct groupchat *c)
+{
+        oscar_chat_kill(c->ic, c->data);
+}
+
+int oscar_chat_join(struct im_connection * ic, char * name)
+{
+        struct oscar_data * od = (struct oscar_data *)ic->proto_data;
         
         aim_conn_t * cur;
@@ -2605 +2605 @@
 }
 
-struct conversation *oscar_chat_open(struct gaim_connection * gc, char *who)
-{
-        struct oscar_data * od = (struct oscar_data *)gc->proto_data;
+struct groupchat *oscar_chat_with(struct im_connection * ic, char *who)
+{
+        struct oscar_data * od = (struct oscar_data *)ic->proto_data;
         int ret;
         static int chat_id = 0;
         char * chatname;
         
-        chatname = g_strdup_printf("%s%d", gc->username, chat_id++);
+        chatname = g_strdup_printf("%s%d", ic->username, chat_id++);
   
-        ret = oscar_chat_join(gc, chatname);
+        ret = oscar_chat_join(ic, chatname);
 
         aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
@@ -2625 +2625 @@
 void oscar_accept_chat(gpointer w, struct aim_chat_invitation * inv)
 {
-        oscar_chat_join(inv->gc, inv->name);
+        oscar_chat_join(inv->ic, inv->name);
         g_free(inv->name);
         g_free(inv);
@@ -2636 +2636 @@
 }
 
-void oscar_init() 
+void oscar_initmodule() 
 {
         struct prpl *ret = g_new0(struct prpl, 1);
         ret->name = "oscar";
         ret->away_states = oscar_away_states;
+        ret->init = oscar_init;
         ret->login = oscar_login;
-        ret->acc_init = oscar_acc_init;
-        ret->close = oscar_close;
+        ret->keepalive = oscar_keepalive;
+        ret->logout = oscar_logout;
         ret->send_im = oscar_send_im;
         ret->get_info = oscar_get_info;
@@ -2653 +2654 @@
         ret->chat_invite = oscar_chat_invite;
         ret->chat_leave = oscar_chat_leave;
-        ret->chat_open = oscar_chat_open;
+        ret->chat_with = oscar_chat_with;
         ret->add_permit = oscar_add_permit;
         ret->add_deny = oscar_add_deny;
@@ -2659 +2660 @@
         ret->rem_deny = oscar_rem_deny;
         ret->set_permit_deny = oscar_set_permit_deny;
-        ret->keepalive = oscar_keepalive;
         ret->get_status_string = oscar_get_status_string;
         ret->send_typing = oscar_send_typing;

protocols/oscar/service.c

@@ -732 +732 @@
         guint32 data;
         int tlvlen;
-        struct gaim_connection *gc = sess ? sess->aux_data : NULL;
+        struct im_connection *ic = sess ? sess->aux_data : NULL;
 
         data = AIM_ICQ_STATE_HIDEIP | status; /* yay for error checking ;^) */
         
-        if (gc && set_getbool(&gc->acc->set, "web_aware"))
+        if (ic && set_getbool(&ic->acc->set, "web_aware"))
                 data |= AIM_ICQ_STATE_WEBAWARE;