Changeset ba9edaa for protocols/jabber

Timestamp:

2006-05-10T17:34:46Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

13cc96c

Parents:

67b6766

Message:

Moved everything to the BitlBee event handling API.

File:

• protocols/jabber/jabber.c (modified) (9 diffs)

protocols/jabber/jabber.c

@@ -471 +471 @@
 }
 
-static void jabber_callback(gpointer data, gint source, GaimInputCondition condition)
+static gboolean jabber_callback(gpointer data, gint source, b_input_condition condition)
 {
         struct gaim_connection *gc = (struct gaim_connection *)data;
@@ -477 +477 @@
 
         gjab_recv(jd->gjc);
+        
+        return TRUE;
 }
 
@@ -487 +489 @@
 }
 
-static void gjab_connected(gpointer data, gint source, GaimInputCondition cond)
+static gboolean gjab_connected(gpointer data, gint source, b_input_condition cond)
 {
         xmlnode x;
@@ -497 +499 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return;
+                return FALSE;
         }
 
@@ -508 +510 @@
         if (source == -1) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return;
+                return FALSE;
         }
 
@@ -530 +532 @@
 
         gc = GJ_GC(gjc);
-        gc->inpa = gaim_input_add(gjc->fd, GAIM_INPUT_READ, jabber_callback, gc);
-}
-
-static void gjab_connected_ssl(gpointer data, void *source, GaimInputCondition cond)
+        gc->inpa = b_input_add(gjc->fd, GAIM_INPUT_READ, jabber_callback, gc);
+        
+        return FALSE;
+}
+
+static gboolean gjab_connected_ssl(gpointer data, void *source, b_input_condition cond)
 {
         struct gaim_connection *gc = data;
@@ -544 +548 @@
         if (source == NULL) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return;
+                return FALSE;
         }
         
         if (!g_slist_find(get_connections(), gc)) {
                 ssl_disconnect(source);
-                return;
+                return FALSE;
         }
         
-        gjab_connected(data, gjc->fd, cond);
+        return gjab_connected(data, gjc->fd, cond);
 }
 
@@ -1543 +1547 @@
 }
 
-static gboolean jabber_free(gpointer data)
+static gboolean jabber_free(gpointer data, gint fd, b_input_condition cond)
 {
         struct jabber_data *jd = data;
@@ -1586 +1590 @@
         }
         if (gc->inpa)
-                gaim_input_remove(gc->inpa);
+                b_event_remove(gc->inpa);
 
         if(jd) {
-                g_timeout_add(50, jabber_free, jd);
+                b_timeout_add(50, jabber_free, jd);
                 if(jd->gjc != NULL)
                         xmlnode_free(jd->gjc->current);