Changeset e046390 for protocols/oscar

Timestamp:

2009-10-10T23:25:54Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c5c18c1

Parents:

0cbef26

Message:

Make purple use BitlBee's event handling API. Since the APIs never really
diverged too much this is fairly transparent. I did rename and redefine
GAIM_INPUT_* variables to really make it work without adding another stupid
layer in between.

One problem left, the new libpurple input API doesn't care about return
values. Fixing that in the next CL.

File:

• protocols/oscar/oscar.c (modified) (7 diffs)

protocols/oscar/oscar.c

@@ -291 +291 @@
         odata = (struct oscar_data *)ic->proto_data;
 
-        if (condition & GAIM_INPUT_READ) {
+        if (condition & B_EV_IO_READ) {
                 if (aim_get_command(odata->sess, conn) >= 0) {
                         aim_rxdispatch(odata->sess);
@@ -363 +363 @@
 
         aim_conn_completeconnect(sess, conn);
-        ic->inpa = b_input_add(conn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(conn->fd, B_EV_IO_READ,
                         oscar_callback, conn);
         
@@ -487 +487 @@
 
         aim_conn_completeconnect(sess, bosconn);
-        ic->inpa = b_input_add(bosconn->fd, GAIM_INPUT_READ,
+        ic->inpa = b_input_add(bosconn->fd, B_EV_IO_READ,
                         oscar_callback, bosconn);
         imcb_log(ic, _("Connection established, cookie sent"));
@@ -663 +663 @@
         if (pos->modname)
                 g_free(pos->modname);
-        pos->inpa = b_input_add(pos->fd, GAIM_INPUT_READ, damn_you, pos);
+        pos->inpa = b_input_add(pos->fd, B_EV_IO_READ, damn_you, pos);
         return FALSE;
 }
@@ -832 +832 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->cnpa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->cnpa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                         oscar_callback, tstconn);
         
@@ -860 +860 @@
 
         aim_conn_completeconnect(sess, tstconn);
-        odata->paspa = b_input_add(tstconn->fd, GAIM_INPUT_READ,
+        odata->paspa = b_input_add(tstconn->fd, B_EV_IO_READ,
                                 oscar_callback, tstconn);
         
@@ -896 +896 @@
         aim_conn_completeconnect(sess, ccon->conn);
         ccon->inpa = b_input_add(tstconn->fd,
-                        GAIM_INPUT_READ,
+                        B_EV_IO_READ,
                         oscar_callback, tstconn);
         odata->oscar_chats = g_slist_append(odata->oscar_chats, ccon);