Changes in protocols/jabber/jabber.c [ba9edaa:75cde5d]

File:

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

protocols/jabber/jabber.c

@@ -471 +471 @@
 }
 
-static gboolean jabber_callback(gpointer data, gint source, b_input_condition condition)
+static void jabber_callback(gpointer data, gint source, GaimInputCondition condition)
 {
         struct gaim_connection *gc = (struct gaim_connection *)data;
@@ -477 +477 @@
 
         gjab_recv(jd->gjc);
-        
-        return TRUE;
 }
 
@@ -489 +487 @@
 }
 
-static gboolean gjab_connected(gpointer data, gint source, b_input_condition cond)
+static void gjab_connected(gpointer data, gint source, GaimInputCondition cond)
 {
         xmlnode x;
@@ -499 +497 @@
         if (!g_slist_find(get_connections(), gc)) {
                 closesocket(source);
-                return FALSE;
+                return;
         }
 
@@ -510 +508 @@
         if (source == -1) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return FALSE;
+                return;
         }
 
@@ -532 +530 @@
 
         gc = GJ_GC(gjc);
-        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)
+        gc->inpa = gaim_input_add(gjc->fd, GAIM_INPUT_READ, jabber_callback, gc);
+}
+
+static void gjab_connected_ssl(gpointer data, void *source, GaimInputCondition cond)
 {
         struct gaim_connection *gc = data;
@@ -548 +544 @@
         if (source == NULL) {
                 STATE_EVT(JCONN_STATE_OFF)
-                return FALSE;
+                return;
         }
         
         if (!g_slist_find(get_connections(), gc)) {
                 ssl_disconnect(source);
-                return FALSE;
+                return;
         }
         
-        return gjab_connected(data, gjc->fd, cond);
+        gjab_connected(data, gjc->fd, cond);
 }
 
@@ -1547 +1543 @@
 }
 
-static gboolean jabber_free(gpointer data, gint fd, b_input_condition cond)
+static gboolean jabber_free(gpointer data)
 {
         struct jabber_data *jd = data;
@@ -1553 +1549 @@
         if(jd->gjc != NULL) {
                 gjab_delete(jd->gjc);
+                /* YAY for modules with their own memory pool managers!...
                 g_free(jd->gjc->sid);
+                And a less sarcastic yay for valgrind. :-) */
                 jd->gjc = NULL;
         }
@@ -1590 +1588 @@
         }
         if (gc->inpa)
-                b_event_remove(gc->inpa);
+                gaim_input_remove(gc->inpa);
 
         if(jd) {
-                b_timeout_add(50, jabber_free, jd);
+                g_timeout_add(50, jabber_free, jd);
                 if(jd->gjc != NULL)
                         xmlnode_free(jd->gjc->current);