From 150bf7ca2d1d01f02aca5fb27385cd3cbdb81c49 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Fri, 14 Oct 2005 19:51:14 +0000 Subject: [PATCH] 2005-10-14 Christopher Aillon * gnome/libnm_glib/libnm_glib.c: * gnome/libnm_glib/libnm_glib.h: Use guint instead of gint for callback IDs. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1022 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ gnome/libnm_glib/libnm_glib.c | 18 +++++++++--------- gnome/libnm_glib/libnm_glib.h | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b0dd6e0ab..7e4c3cddb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-14 Christopher Aillon + + * gnome/libnm_glib/libnm_glib.c: + * gnome/libnm_glib/libnm_glib.h: + Use guint instead of gint for callback IDs. + 2005-10-12 Christopher Aillon * gnome/applet/applet.c: diff --git a/gnome/libnm_glib/libnm_glib.c b/gnome/libnm_glib/libnm_glib.c index fe6fb48e93..8ec7ee3c45 100644 --- a/gnome/libnm_glib/libnm_glib.c +++ b/gnome/libnm_glib/libnm_glib.c @@ -44,14 +44,14 @@ struct libnm_glib_ctx GSList * callbacks; GMutex * callbacks_lock; - gint callback_id_last; + guint callback_id_last; libnm_glib_state nm_state; }; typedef struct libnm_glib_callback { - gint id; + guint id; GMainContext * gmain_ctx; libnm_glib_ctx * libnm_glib_ctx; libnm_glib_callback_func func; @@ -487,16 +487,16 @@ libnm_glib_state libnm_glib_get_network_state (const libnm_glib_ctx *ctx) } -gint libnm_glib_register_callback (libnm_glib_ctx *ctx, libnm_glib_callback_func func, gpointer user_data, GMainContext *g_main_ctx) +guint libnm_glib_register_callback (libnm_glib_ctx *ctx, libnm_glib_callback_func func, gpointer user_data, GMainContext *g_main_ctx) { libnm_glib_callback *callback = NULL; - g_return_val_if_fail (ctx != NULL, -1); - g_return_val_if_fail (func != NULL, -1); - + g_return_val_if_fail (ctx != NULL, 0); + g_return_val_if_fail (func != NULL, 0); + callback = g_malloc0 (sizeof (libnm_glib_callback)); - callback->id = ctx->callback_id_last++; + callback->id = ++ (ctx->callback_id_last); callback->func = func; callback->gmain_ctx = g_main_ctx; callback->libnm_glib_ctx = ctx; @@ -511,12 +511,12 @@ gint libnm_glib_register_callback (libnm_glib_ctx *ctx, libnm_glib_callback_func } -void libnm_glib_unregister_callback (libnm_glib_ctx *ctx, gint id) +void libnm_glib_unregister_callback (libnm_glib_ctx *ctx, guint id) { GSList *elem; g_return_if_fail (ctx != NULL); - g_return_if_fail (id < 0); + g_return_if_fail (id > 0); g_mutex_lock (ctx->callbacks_lock); elem = ctx->callbacks; diff --git a/gnome/libnm_glib/libnm_glib.h b/gnome/libnm_glib/libnm_glib.h index 76e1fa602e..17d050bf57 100644 --- a/gnome/libnm_glib/libnm_glib.h +++ b/gnome/libnm_glib/libnm_glib.h @@ -48,8 +48,8 @@ void libnm_glib_shutdown (libnm_glib_ctx *ctx); libnm_glib_state libnm_glib_get_network_state (const libnm_glib_ctx *ctx); -gint libnm_glib_register_callback (libnm_glib_ctx *ctx, libnm_glib_callback_func func, gpointer user_data, GMainContext *g_main_ctx); -void libnm_glib_unregister_callback (libnm_glib_ctx *ctx, gint id); +guint libnm_glib_register_callback (libnm_glib_ctx *ctx, libnm_glib_callback_func func, gpointer user_data, GMainContext *g_main_ctx); +void libnm_glib_unregister_callback (libnm_glib_ctx *ctx, guint id); #ifdef __cplusplus }