# HG changeset patch # User Mark Doliner # Date 1172000168 0 # Node ID d44fca5248a1ade4caa59f69313f249a05725c9f # Parent 67ecb6a934a840cadfe98370b849a574b8aa46e7 Change out source_remove and input_remove eventloop functions to return booleans instead of guints diff -r 67ecb6a934a8 -r d44fca5248a1 console/gntgaim.c --- a/console/gntgaim.c Tue Feb 20 19:35:37 2007 +0000 +++ b/console/gntgaim.c Tue Feb 20 19:36:08 2007 +0000 @@ -146,9 +146,9 @@ static GaimEventLoopUiOps eventloop_ops = { g_timeout_add, - (guint (*)(guint))g_source_remove, + g_source_remove, gnt_input_add, - (guint (*)(guint))g_source_remove + g_source_remove }; static GaimEventLoopUiOps * diff -r 67ecb6a934a8 -r d44fca5248a1 libpurple/eventloop.c --- a/libpurple/eventloop.c Tue Feb 20 19:35:37 2007 +0000 +++ b/libpurple/eventloop.c Tue Feb 20 19:36:08 2007 +0000 @@ -34,7 +34,7 @@ return ops->timeout_add(interval, function, data); } -guint +gboolean gaim_timeout_remove(guint tag) { GaimEventLoopUiOps *ops = gaim_eventloop_get_ui_ops(); @@ -50,7 +50,7 @@ return ops->input_add(source, condition, func, user_data); } -guint +gboolean gaim_input_remove(guint tag) { GaimEventLoopUiOps *ops = gaim_eventloop_get_ui_ops(); diff -r 67ecb6a934a8 -r d44fca5248a1 libpurple/eventloop.h --- a/libpurple/eventloop.h Tue Feb 20 19:35:37 2007 +0000 +++ b/libpurple/eventloop.h Tue Feb 20 19:36:08 2007 +0000 @@ -57,7 +57,7 @@ * Removes a callback timer. * @see gaim_timeout_remove, g_source_remove */ - guint (*timeout_remove)(guint handle); + gboolean (*timeout_remove)(guint handle); /** * Adds an input handler. @@ -70,7 +70,7 @@ * Removes an input handler. * @see gaim_input_remove, g_source_remove */ - guint (*input_remove)(guint handle); + gboolean (*input_remove)(guint handle); }; /**************************************************************************/ @@ -97,7 +97,7 @@ * * @return Something. */ -guint gaim_timeout_remove(guint handle); +gboolean gaim_timeout_remove(guint handle); /** * Adds an input handler. @@ -119,7 +119,7 @@ * @param handle The handle of the input handler. Note that this is the return * value from gaim_input_add, not the file descriptor. */ -guint gaim_input_remove(guint handle); +gboolean gaim_input_remove(guint handle); /*@}*/ diff -r 67ecb6a934a8 -r d44fca5248a1 pidgin/gtkeventloop.c --- a/pidgin/gtkeventloop.c Tue Feb 20 19:35:37 2007 +0000 +++ b/pidgin/gtkeventloop.c Tue Feb 20 19:36:08 2007 +0000 @@ -116,9 +116,9 @@ static GaimEventLoopUiOps eventloop_ops = { g_timeout_add, - (guint (*)(guint))g_source_remove, + g_source_remove, pidgin_input_add, - (guint (*)(guint))g_source_remove + g_source_remove }; GaimEventLoopUiOps *