diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2009-10-11 00:25:54 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2009-10-11 00:25:54 +0100 |
| commit | e046390da36e369c94af607fdedfe7b9f99d9e47 (patch) | |
| tree | 7955564156898b8ca738c383ae561f91cc347f17 /lib/events_glib.c | |
| parent | 0cbef26bd1f82787a8107e92b14839a59187e0c2 (diff) | |
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.
Diffstat (limited to 'lib/events_glib.c')
| -rw-r--r-- | lib/events_glib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/events_glib.c b/lib/events_glib.c index 3e194e98..2260ec4e 100644 --- a/lib/events_glib.c +++ b/lib/events_glib.c @@ -75,9 +75,9 @@ static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpoin gboolean st; if (condition & GAIM_READ_COND) - gaim_cond |= GAIM_INPUT_READ; + gaim_cond |= B_EV_IO_READ; if (condition & GAIM_WRITE_COND) - gaim_cond |= GAIM_INPUT_WRITE; + gaim_cond |= B_EV_IO_WRITE; event_debug( "gaim_io_invoke( %d, %d, 0x%x )\n", g_io_channel_unix_get_fd(source), condition, data ); @@ -105,9 +105,9 @@ gint b_input_add(gint source, b_input_condition condition, b_event_handler funct closure->function = function; closure->data = data; - if (condition & GAIM_INPUT_READ) + if (condition & B_EV_IO_READ) cond |= GAIM_READ_COND; - if (condition & GAIM_INPUT_WRITE) + if (condition & B_EV_IO_WRITE) cond |= GAIM_WRITE_COND; channel = g_io_channel_unix_new(source); |