Mercurial > pidgin
diff libpurple/signals.c @ 15822:32c366eeeb99
sed -ie 's/gaim/purple/g'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 19 Mar 2007 07:01:17 +0000 |
| parents | b15cc37605c4 |
| children | f4d05584369e |
line wrap: on
line diff
--- a/libpurple/signals.c Mon Mar 19 06:11:46 2007 +0000 +++ b/libpurple/signals.c Mon Mar 19 07:01:17 2007 +0000 @@ -2,9 +2,9 @@ * @file signals.c Signal API * @ingroup core * - * gaim + * purple * - * Gaim is the legal property of its developers, whose names are too numerous + * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * @@ -41,39 +41,39 @@ gulong next_signal_id; -} GaimInstanceData; +} PurpleInstanceData; typedef struct { gulong id; - GaimSignalMarshalFunc marshal; + PurpleSignalMarshalFunc marshal; int num_values; - GaimValue **values; - GaimValue *ret_value; + PurpleValue **values; + PurpleValue *ret_value; GList *handlers; size_t handler_count; gulong next_handler_id; -} GaimSignalData; +} PurpleSignalData; typedef struct { gulong id; - GaimCallback cb; + PurpleCallback cb; void *handle; void *data; gboolean use_vargs; int priority; -} GaimSignalHandlerData; +} PurpleSignalHandlerData; static GHashTable *instance_table = NULL; static void -destroy_instance_data(GaimInstanceData *instance_data) +destroy_instance_data(PurpleInstanceData *instance_data) { g_hash_table_destroy(instance_data->signals); @@ -81,7 +81,7 @@ } static void -destroy_signal_data(GaimSignalData *signal_data) +destroy_signal_data(PurpleSignalData *signal_data) { g_list_foreach(signal_data->handlers, (GFunc)g_free, NULL); g_list_free(signal_data->handlers); @@ -91,23 +91,23 @@ int i; for (i = 0; i < signal_data->num_values; i++) - gaim_value_destroy((GaimValue *)signal_data->values[i]); + purple_value_destroy((PurpleValue *)signal_data->values[i]); g_free(signal_data->values); } if (signal_data->ret_value != NULL) - gaim_value_destroy(signal_data->ret_value); + purple_value_destroy(signal_data->ret_value); g_free(signal_data); } gulong -gaim_signal_register(void *instance, const char *signal, - GaimSignalMarshalFunc marshal, - GaimValue *ret_value, int num_values, ...) +purple_signal_register(void *instance, const char *signal, + PurpleSignalMarshalFunc marshal, + PurpleValue *ret_value, int num_values, ...) { - GaimInstanceData *instance_data; - GaimSignalData *signal_data; + PurpleInstanceData *instance_data; + PurpleSignalData *signal_data; va_list args; g_return_val_if_fail(instance != NULL, 0); @@ -115,11 +115,11 @@ g_return_val_if_fail(marshal != NULL, 0); instance_data = - (GaimInstanceData *)g_hash_table_lookup(instance_table, instance); + (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); if (instance_data == NULL) { - instance_data = g_new0(GaimInstanceData, 1); + instance_data = g_new0(PurpleInstanceData, 1); instance_data->instance = instance; instance_data->next_signal_id = 1; @@ -131,7 +131,7 @@ g_hash_table_insert(instance_table, instance, instance_data); } - signal_data = g_new0(GaimSignalData, 1); + signal_data = g_new0(PurpleSignalData, 1); signal_data->id = instance_data->next_signal_id; signal_data->marshal = marshal; signal_data->next_handler_id = 1; @@ -142,12 +142,12 @@ { int i; - signal_data->values = g_new0(GaimValue *, num_values); + signal_data->values = g_new0(PurpleValue *, num_values); va_start(args, num_values); for (i = 0; i < num_values; i++) - signal_data->values[i] = va_arg(args, GaimValue *); + signal_data->values[i] = va_arg(args, PurpleValue *); va_end(args); } @@ -162,15 +162,15 @@ } void -gaim_signal_unregister(void *instance, const char *signal) +purple_signal_unregister(void *instance, const char *signal) { - GaimInstanceData *instance_data; + PurpleInstanceData *instance_data; g_return_if_fail(instance != NULL); g_return_if_fail(signal != NULL); instance_data = - (GaimInstanceData *)g_hash_table_lookup(instance_table, instance); + (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); g_return_if_fail(instance_data != NULL); @@ -186,7 +186,7 @@ } void -gaim_signals_unregister_by_instance(void *instance) +purple_signals_unregister_by_instance(void *instance) { gboolean found; @@ -202,12 +202,12 @@ } void -gaim_signal_get_values(void *instance, const char *signal, - GaimValue **ret_value, - int *num_values, GaimValue ***values) +purple_signal_get_values(void *instance, const char *signal, + PurpleValue **ret_value, + int *num_values, PurpleValue ***values) { - GaimInstanceData *instance_data; - GaimSignalData *signal_data; + PurpleInstanceData *instance_data; + PurpleSignalData *signal_data; g_return_if_fail(instance != NULL); g_return_if_fail(signal != NULL); @@ -216,13 +216,13 @@ /* Get the instance data */ instance_data = - (GaimInstanceData *)g_hash_table_lookup(instance_table, instance); + (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); g_return_if_fail(instance_data != NULL); /* Get the signal data */ signal_data = - (GaimSignalData *)g_hash_table_lookup(instance_data->signals, signal); + (PurpleSignalData *)g_hash_table_lookup(instance_data->signals, signal); g_return_if_fail(signal_data != NULL); @@ -234,8 +234,8 @@ } static gint handler_priority(void * a, void * b) { - GaimSignalHandlerData *ah = (GaimSignalHandlerData*)a; - GaimSignalHandlerData *bh = (GaimSignalHandlerData*)b; + PurpleSignalHandlerData *ah = (PurpleSignalHandlerData*)a; + PurpleSignalHandlerData *bh = (PurpleSignalHandlerData*)b; if (ah->priority > bh->priority) return 1; if (ah->priority < bh->priority) return -1; return 0; @@ -243,11 +243,11 @@ static gulong signal_connect_common(void *instance, const char *signal, void *handle, - GaimCallback func, void *data, int priority, gboolean use_vargs) + PurpleCallback func, void *data, int priority, gboolean use_vargs) { - GaimInstanceData *instance_data; - GaimSignalData *signal_data; - GaimSignalHandlerData *handler_data; + PurpleInstanceData *instance_data; + PurpleSignalData *signal_data; + PurpleSignalHandlerData *handler_data; g_return_val_if_fail(instance != NULL, 0); g_return_val_if_fail(signal != NULL, 0); @@ -256,11 +256,11 @@ /* Get the instance data */ instance_data = - (GaimInstanceData *)g_hash_table_lookup(instance_table, instance); + (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); if (instance_data == NULL) { - gaim_debug_warning("signals", "Something tried to register a callback " + purple_debug_warning("signals", "Something tried to register a callback " "for the '%s' signal, but we do not have any signals " "registered with the given handle\n", signal); g_return_val_if_reached(0); @@ -268,17 +268,17 @@ /* Get the signal data */ signal_data = - (GaimSignalData *)g_hash_table_lookup(instance_data->signals, signal); + (PurpleSignalData *)g_hash_table_lookup(instance_data->signals, signal); if (signal_data == NULL) { - gaim_debug(GAIM_DEBUG_ERROR, "signals", + purple_debug(PURPLE_DEBUG_ERROR, "signals", "Signal data for %s not found!\n", signal); return 0; } /* Create the signal handler data */ - handler_data = g_new0(GaimSignalHandlerData, 1); + handler_data = g_new0(PurpleSignalHandlerData, 1); handler_data->id = signal_data->next_handler_id; handler_data->cb = func; handler_data->handle = handle; @@ -294,40 +294,40 @@ } gulong -gaim_signal_connect_priority(void *instance, const char *signal, void *handle, - GaimCallback func, void *data, int priority) +purple_signal_connect_priority(void *instance, const char *signal, void *handle, + PurpleCallback func, void *data, int priority) { return signal_connect_common(instance, signal, handle, func, data, priority, FALSE); } gulong -gaim_signal_connect(void *instance, const char *signal, void *handle, - GaimCallback func, void *data) +purple_signal_connect(void *instance, const char *signal, void *handle, + PurpleCallback func, void *data) { - return signal_connect_common(instance, signal, handle, func, data, GAIM_SIGNAL_PRIORITY_DEFAULT, FALSE); + return signal_connect_common(instance, signal, handle, func, data, PURPLE_SIGNAL_PRIORITY_DEFAULT, FALSE); } gulong -gaim_signal_connect_priority_vargs(void *instance, const char *signal, void *handle, - GaimCallback func, void *data, int priority) +purple_signal_connect_priority_vargs(void *instance, const char *signal, void *handle, + PurpleCallback func, void *data, int priority) { return signal_connect_common(instance, signal, handle, func, data, priority, TRUE); } gulong -gaim_signal_connect_vargs(void *instance, const char *signal, void *handle, - GaimCallback func, void *data) +purple_signal_connect_vargs(void *instance, const char *signal, void *handle, + PurpleCallback func, void *data) { - return signal_connect_common(instance, signal, handle, func, data, GAIM_SIGNAL_PRIORITY_DEFAULT, TRUE); + return signal_connect_common(instance, signal, handle, func, data, PURPLE_SIGNAL_PRIORITY_DEFAULT, TRUE); } void -gaim_signal_disconnect(void *instance, const char *signal, - void *handle, GaimCallback func) +purple_signal_disconnect(void *instance, const char *signal, + void *handle, PurpleCallback func) { - GaimInstanceData *instance_data; - GaimSignalData *signal_data; - GaimSignalHandlerData *handler_data; + PurpleInstanceData *instance_data; + PurpleSignalData *signal_data; + PurpleSignalHandlerData *handler_data; GList *l; gboolean found = FALSE; @@ -338,17 +338,17 @@ /* Get the instance data */ instance_data = - (GaimInstanceData *)g_hash_table_lookup(instance_table, instance); + (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); g_return_if_fail(instance_data != NULL); /* Get the signal data */ signal_data = - (GaimSignalData *)g_hash_table_lookup(instance_data->signals, signal); + (PurpleSignalData *)g_hash_table_lookup(instance_data->signals, signal); if (signal_data == NULL) { - gaim_debug(GAIM_DEBUG_ERROR, "signals", + purple_debug(PURPLE_DEBUG_ERROR, "signals", "Signal data for %s not found!\n", signal); return; } @@ -356,7 +356,7 @@ /* Find the handler data. */ for (l = signal_data->handlers; l != NULL; l = l->next) { - handler_data = (GaimSignalHandlerData *)l->data; + handler_data = (PurpleSignalHandlerData *)l->data; if (handler_data->handle == handle && handler_data->cb == func) { @@ -382,14 +382,14 @@ */ static void disconnect_handle_from_signals(const char *signal, - GaimSignalData *signal_data, void *handle) + PurpleSignalData *signal_data, void *handle) { GList *l, *l_next; - GaimSignalHandlerData *handler_data; + PurpleSignalHandlerData *handler_data; for (l = signal_data->handlers; l != NULL; l = l_next) { - handler_data = (GaimSignalHandlerData *)l->data; + handler_data = (PurpleSignalHandlerData *)l->data; l_next = l->next; if (handler_data->handle == handle) @@ -405,7 +405,7 @@ static void disconnect_handle_from_instance(void *instance, - GaimInstanceData *instance_data, + PurpleInstanceData *instance_data, void *handle) { g_hash_table_foreach(instance_data->signals, @@ -413,7 +413,7 @@ } void -gaim_signals_disconnect_by_handle(void *handle) +purple_signals_disconnect_by_handle(void *handle) { g_return_if_fail(handle != NULL); @@ -422,7 +422,7 @@ } void -gaim_signal_emit(void *instance, const char *signal, ...) +purple_signal_emit(void *instance, const char *signal, ...) { va_list args; @@ -430,16 +430,16 @@ g_return_if_fail(signal != NULL); va_start(args, signal); - gaim_signal_emit_vargs(instance, signal, args); + purple_signal_emit_vargs(instance, signal, args); va_end(args); } void -gaim_signal_emit_vargs(void *instance, const char *signal, va_list args) +purple_signal_emit_vargs(void *instance, const char *signal, va_list args) { - GaimInstanceData *instance_data; - GaimSignalData *signal_data; - GaimSignalHandlerData *handler_data; + PurpleInstanceData *instance_data; + PurpleSignalData *signal_data; + PurpleSignalHandlerData *handler_data; GList *l, *l_next; va_list tmp; @@ -447,16 +447,16 @@ g_return_if_fail(signal != NULL); instance_data = - (GaimInstanceData *)g_hash_table_lookup(instance_table, instance); + (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); g_return_if_fail(instance_data != NULL); signal_data = - (GaimSignalData *)g_hash_table_lookup(instance_data->signals, signal); + (PurpleSignalData *)g_hash_table_lookup(instance_data->signals, signal); if (signal_data == NULL) { - gaim_debug(GAIM_DEBUG_ERROR, "signals", + purple_debug(PURPLE_DEBUG_ERROR, "signals", "Signal data for %s not found!\n", signal); return; } @@ -465,7 +465,7 @@ { l_next = l->next; - handler_data = (GaimSignalHandlerData *)l->data; + handler_data = (PurpleSignalHandlerData *)l->data; /* This is necessary because a va_list may only be * evaluated once */ @@ -486,14 +486,14 @@ } #ifdef HAVE_DBUS - gaim_dbus_signal_emit_gaim(signal, signal_data->num_values, + purple_dbus_signal_emit_purple(signal, signal_data->num_values, signal_data->values, args); #endif /* HAVE_DBUS */ } void * -gaim_signal_emit_return_1(void *instance, const char *signal, ...) +purple_signal_emit_return_1(void *instance, const char *signal, ...) { void *ret_val; va_list args; @@ -502,19 +502,19 @@ g_return_val_if_fail(signal != NULL, NULL); va_start(args, signal); - ret_val = gaim_signal_emit_vargs_return_1(instance, signal, args); + ret_val = purple_signal_emit_vargs_return_1(instance, signal, args); va_end(args); return ret_val; } void * -gaim_signal_emit_vargs_return_1(void *instance, const char *signal, +purple_signal_emit_vargs_return_1(void *instance, const char *signal, va_list args) { - GaimInstanceData *instance_data; - GaimSignalData *signal_data; - GaimSignalHandlerData *handler_data; + PurpleInstanceData *instance_data; + PurpleSignalData *signal_data; + PurpleSignalHandlerData *handler_data; GList *l, *l_next; va_list tmp; @@ -522,23 +522,23 @@ g_return_val_if_fail(signal != NULL, NULL); instance_data = - (GaimInstanceData *)g_hash_table_lookup(instance_table, instance); + (PurpleInstanceData *)g_hash_table_lookup(instance_table, instance); g_return_val_if_fail(instance_data != NULL, NULL); signal_data = - (GaimSignalData *)g_hash_table_lookup(instance_data->signals, signal); + (PurpleSignalData *)g_hash_table_lookup(instance_data->signals, signal); if (signal_data == NULL) { - gaim_debug(GAIM_DEBUG_ERROR, "signals", + purple_debug(PURPLE_DEBUG_ERROR, "signals", "Signal data for %s not found!\n", signal); return 0; } #ifdef HAVE_DBUS G_VA_COPY(tmp, args); - gaim_dbus_signal_emit_gaim(signal, signal_data->num_values, + purple_dbus_signal_emit_purple(signal, signal_data->num_values, signal_data->values, tmp); va_end(tmp); #endif /* HAVE_DBUS */ @@ -549,7 +549,7 @@ l_next = l->next; - handler_data = (GaimSignalHandlerData *)l->data; + handler_data = (PurpleSignalHandlerData *)l->data; G_VA_COPY(tmp, args); if (handler_data->use_vargs) @@ -572,7 +572,7 @@ } void -gaim_signals_init() +purple_signals_init() { g_return_if_fail(instance_table == NULL); @@ -582,7 +582,7 @@ } void -gaim_signals_uninit() +purple_signals_uninit() { g_return_if_fail(instance_table != NULL); @@ -594,14 +594,14 @@ * Marshallers **************************************************************************/ void -gaim_marshal_VOID(GaimCallback cb, va_list args, void *data, +purple_marshal_VOID(PurpleCallback cb, va_list args, void *data, void **return_val) { ((void (*)(void *))cb)(data); } void -gaim_marshal_VOID__INT(GaimCallback cb, va_list args, void *data, +purple_marshal_VOID__INT(PurpleCallback cb, va_list args, void *data, void **return_val) { gint arg1 = va_arg(args, gint); @@ -610,7 +610,7 @@ } void -gaim_marshal_VOID__INT_INT(GaimCallback cb, va_list args, void *data, +purple_marshal_VOID__INT_INT(PurpleCallback cb, va_list args, void *data, void **return_val) { gint arg1 = va_arg(args, gint); @@ -620,7 +620,7 @@ } void -gaim_marshal_VOID__POINTER(GaimCallback cb, va_list args, void *data, +purple_marshal_VOID__POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { void *arg1 = va_arg(args, void *); @@ -629,7 +629,7 @@ } void -gaim_marshal_VOID__POINTER_UINT(GaimCallback cb, va_list args, +purple_marshal_VOID__POINTER_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) { void *arg1 = va_arg(args, void *); @@ -638,7 +638,7 @@ ((void (*)(void *, guint, void *))cb)(arg1, arg2, data); } -void gaim_marshal_VOID__POINTER_INT_INT(GaimCallback cb, va_list args, +void purple_marshal_VOID__POINTER_INT_INT(PurpleCallback cb, va_list args, void *data, void **return_val) { void *arg1 = va_arg(args, void *); @@ -649,7 +649,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER(GaimCallback cb, va_list args, +purple_marshal_VOID__POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { void *arg1 = va_arg(args, void *); @@ -659,7 +659,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_UINT(GaimCallback cb, va_list args, +purple_marshal_VOID__POINTER_POINTER_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) { void *arg1 = va_arg(args, void *); @@ -670,7 +670,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_UINT_UINT(GaimCallback cb, va_list args, +purple_marshal_VOID__POINTER_POINTER_UINT_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) { void *arg1 = va_arg(args, void *); @@ -682,7 +682,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_POINTER(GaimCallback cb, va_list args, +purple_marshal_VOID__POINTER_POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { void *arg1 = va_arg(args, void *); @@ -693,7 +693,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER(GaimCallback cb, +purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -707,7 +707,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER(GaimCallback cb, +purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -722,7 +722,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT(GaimCallback cb, +purple_marshal_VOID__POINTER_POINTER_POINTER_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -736,7 +736,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT(GaimCallback cb, +purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -751,7 +751,7 @@ } void -gaim_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT(GaimCallback cb, +purple_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -767,7 +767,7 @@ } void -gaim_marshal_INT__INT(GaimCallback cb, va_list args, void *data, +purple_marshal_INT__INT(PurpleCallback cb, va_list args, void *data, void **return_val) { gint ret_val; @@ -780,7 +780,7 @@ } void -gaim_marshal_INT__INT_INT(GaimCallback cb, va_list args, void *data, +purple_marshal_INT__INT_INT(PurpleCallback cb, va_list args, void *data, void **return_val) { gint ret_val; @@ -795,8 +795,8 @@ void -gaim_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER( - GaimCallback cb, va_list args, void *data, void **return_val) +purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER( + PurpleCallback cb, va_list args, void *data, void **return_val) { gint ret_val; void *arg1 = va_arg(args, void *); @@ -814,7 +814,7 @@ } void -gaim_marshal_BOOLEAN__POINTER(GaimCallback cb, va_list args, void *data, +purple_marshal_BOOLEAN__POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { gboolean ret_val; @@ -827,7 +827,7 @@ } void -gaim_marshal_BOOLEAN__POINTER_POINTER(GaimCallback cb, va_list args, +purple_marshal_BOOLEAN__POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { gboolean ret_val; @@ -841,7 +841,7 @@ } void -gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER(GaimCallback cb, va_list args, +purple_marshal_BOOLEAN__POINTER_POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { gboolean ret_val; @@ -857,7 +857,7 @@ } void -gaim_marshal_BOOLEAN__POINTER_POINTER_UINT(GaimCallback cb, +purple_marshal_BOOLEAN__POINTER_POINTER_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -875,7 +875,7 @@ } void -gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT(GaimCallback cb, +purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -894,7 +894,7 @@ } void -gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER(GaimCallback cb, +purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) @@ -913,8 +913,8 @@ } void -gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER( - GaimCallback cb, va_list args, void *data, void **return_val) +purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER( + PurpleCallback cb, va_list args, void *data, void **return_val) { gboolean ret_val; void *arg1 = va_arg(args, void *); @@ -932,7 +932,7 @@ } void -gaim_marshal_BOOLEAN__INT_POINTER(GaimCallback cb, va_list args, void *data, +purple_marshal_BOOLEAN__INT_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { gboolean ret_val; @@ -946,8 +946,8 @@ } void -gaim_marshal_POINTER__POINTER_INT( - GaimCallback cb, va_list args, void *data, +purple_marshal_POINTER__POINTER_INT( + PurpleCallback cb, va_list args, void *data, void **return_val) { gpointer ret_val; @@ -961,8 +961,8 @@ } void -gaim_marshal_POINTER__POINTER_INT64( - GaimCallback cb, va_list args, void *data, +purple_marshal_POINTER__POINTER_INT64( + PurpleCallback cb, va_list args, void *data, void **return_val) { gpointer ret_val; @@ -976,8 +976,8 @@ } void -gaim_marshal_POINTER__POINTER_INT_BOOLEAN( - GaimCallback cb, va_list args, void *data, +purple_marshal_POINTER__POINTER_INT_BOOLEAN( + PurpleCallback cb, va_list args, void *data, void **return_val) { gpointer ret_val; @@ -992,8 +992,8 @@ } void -gaim_marshal_POINTER__POINTER_INT64_BOOLEAN( - GaimCallback cb, va_list args, void *data, +purple_marshal_POINTER__POINTER_INT64_BOOLEAN( + PurpleCallback cb, va_list args, void *data, void **return_val) { gpointer ret_val; @@ -1008,7 +1008,7 @@ } void -gaim_marshal_POINTER__POINTER_POINTER(GaimCallback cb, va_list args, void *data, +purple_marshal_POINTER__POINTER_POINTER(PurpleCallback cb, va_list args, void *data, void **return_val) { gpointer ret_val;