Changeset e046390 for protocols/purple/purple.c

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/purple/purple.c (modified) (4 diffs)

protocols/purple/purple.c

@@ -63 +63 @@
 }
 
-static void purple_glib_io_destroy(gpointer data)
-{
-        g_free(data);
-}
-
-static gboolean purple_glib_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
-{
-        PurpleGLibIOClosure *closure = data;
-        PurpleInputCondition purple_cond = 0;
-
-        if (condition & PURPLE_GLIB_READ_COND)
-                purple_cond |= PURPLE_INPUT_READ;
-        if (condition & PURPLE_GLIB_WRITE_COND)
-                purple_cond |= PURPLE_INPUT_WRITE;
-
-        closure->function(closure->data, g_io_channel_unix_get_fd(source),
-                          purple_cond);
-
-        return TRUE;
-}
-
-static guint glib_input_add(gint fd, PurpleInputCondition condition, PurpleInputFunction function,
-                                                           gpointer data)
-{
-        PurpleGLibIOClosure *closure = g_new0(PurpleGLibIOClosure, 1);
-        GIOChannel *channel;
-        GIOCondition cond = 0;
-
-        closure->function = function;
-        closure->data = data;
-
-        if (condition & PURPLE_INPUT_READ)
-                cond |= PURPLE_GLIB_READ_COND;
-        if (condition & PURPLE_INPUT_WRITE)
-                cond |= PURPLE_GLIB_WRITE_COND;
-
-        channel = g_io_channel_unix_new(fd);
-        closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
-                                              purple_glib_io_invoke, closure, purple_glib_io_destroy);
-
-        g_io_channel_unref(channel);
-        return closure->result;
+static guint prplcb_ev_timeout_add( guint interval, GSourceFunc func, gpointer udata )
+{
+        return b_timeout_add( interval, (b_event_handler) func, udata );
+}
+
+static guint prplcb_ev_input_add( int fd, PurpleInputCondition cond, PurpleInputFunction func, gpointer udata )
+{
+        return (guint) b_input_add( fd, cond, (b_event_handler) func, udata );
 }
 
 static PurpleEventLoopUiOps glib_eventloops = 
 {
-        g_timeout_add,
-        g_source_remove,
-        glib_input_add,
-        g_source_remove,
-        NULL,
-#if GLIB_CHECK_VERSION(2,14,0)
-        g_timeout_add_seconds,
-#else
-        NULL,
-#endif
-
-        /* padding */
-        NULL,
-        NULL,
-        NULL
+        prplcb_ev_timeout_add,
+        b_event_remove,
+        prplcb_ev_input_add,
+        b_event_remove,
 };
 
@@ -137 +92 @@
         PurpleAccount *pa;
         //PurpleSavedStatus *ps;
-        GList *i;
+        //GList *i;
         
         /* For now this is needed in the _connected() handlers if using
@@ -343 +298 @@
         NULL,                      /* write_chat           */
         prplcb_conv_im,            /* write_im             */
-        NULL, //null_write_conv,           /* write_conv           */
+        NULL,                      /* write_conv           */
         NULL,                      /* chat_add_users       */
         NULL,                      /* chat_rename_user     */
@@ -381 +336 @@
 {
         GList *prots;
+        
+        if( B_EV_IO_READ != PURPLE_INPUT_READ ||
+            B_EV_IO_WRITE != PURPLE_INPUT_WRITE )
+        {
+                /* FIXME FIXME FIXME FIXME FIXME :-) */
+                exit( 1 );
+        }
         
         purple_util_set_user_dir("/tmp");