aboutsummaryrefslogtreecommitdiffstats
path: root/lib/events_glib.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2008-01-05 15:00:15 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2008-01-05 15:00:15 +0000
commitf394500c46003237373a47c5a1dcb4af16029e4d (patch)
tree5fee46236b39aad35311e10c92d1dca02a0de3d0 /lib/events_glib.c
parent6f7ac174bb8fbde5e07e1c7da3cf691ecb4e172b (diff)
Removed closure->result. I was planning to add some more stuff, but will
do that later.
Diffstat (limited to 'lib/events_glib.c')
-rw-r--r--lib/events_glib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/events_glib.c b/lib/events_glib.c
index 38938380..1198dba6 100644
--- a/lib/events_glib.c
+++ b/lib/events_glib.c
@@ -47,7 +47,6 @@
typedef struct _GaimIOClosure {
b_event_handler function;
- guint result;
gpointer data;
} GaimIOClosure;
@@ -100,6 +99,7 @@ gint b_input_add(gint source, b_input_condition condition, b_event_handler funct
GaimIOClosure *closure = g_new0(GaimIOClosure, 1);
GIOChannel *channel;
GIOCondition cond = 0;
+ int st;
closure->function = function;
closure->data = data;
@@ -110,13 +110,13 @@ gint b_input_add(gint source, b_input_condition condition, b_event_handler funct
cond |= GAIM_WRITE_COND;
channel = g_io_channel_unix_new(source);
- closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
- gaim_io_invoke, closure, gaim_io_destroy);
+ st = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, cond,
+ gaim_io_invoke, closure, gaim_io_destroy);
- event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) = %d (0x%x)\n", source, condition, function, data, closure->result, closure );
+ event_debug( "b_input_add( %d, %d, 0x%x, 0x%x ) = %d (%p)\n", source, condition, function, data, st, closure );
g_io_channel_unref(channel);
- return closure->result;
+ return st;
}
gint b_timeout_add(gint timeout, b_event_handler func, gpointer data)