im.pidgin.gobjectification: 8d63d102fe9727e30fc68d6f66eb801951c78ec1
sadrul at pidgin.im
sadrul at pidgin.im
Wed Feb 27 23:48:32 EST 2008
-----------------------------------------------------------------
Revision: 8d63d102fe9727e30fc68d6f66eb801951c78ec1
Ancestor: 1e80cdcdb5e164b38f7e86064e3ce57b47fa6ed5
Author: sadrul at pidgin.im
Date: 2008-02-28T03:47:38
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/8d63d102fe9727e30fc68d6f66eb801951c78ec1
Modified files:
libpurple/signals.h
ChangeLog:
Rename the marshallers here too, but keep things compilable.
-------------- next part --------------
============================================================
--- libpurple/signals.h 903d2697143fe490e18ef96381eb82a0eae15ed3
+++ libpurple/signals.h c11f9b0bcf075fd1d1cfcf570f0438510c387461
@@ -291,80 +291,116 @@ void purple_signals_uninit(void);
/**************************************************************************/
/*@{*/
-void purple_marshal_VOID(
+void purple_old_marshal_VOID(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__INT(
+void purple_old_marshal_VOID__INT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__INT_INT(
+void purple_old_marshal_VOID__INT_INT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER(
+void purple_old_marshal_VOID__POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_UINT(
+void purple_old_marshal_VOID__POINTER_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_INT_INT(
+void purple_old_marshal_VOID__POINTER_INT_INT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_INT_POINTER(
+void purple_old_marshal_VOID__POINTER_INT_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER(
+void purple_old_marshal_VOID__POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_UINT(
+void purple_old_marshal_VOID__POINTER_POINTER_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_UINT_UINT(
+void purple_old_marshal_VOID__POINTER_POINTER_UINT_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_POINTER(
+void purple_old_marshal_VOID__POINTER_POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER(
+void purple_old_marshal_VOID__POINTER_POINTER_POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER(
+void purple_old_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_POINTER_UINT(
+void purple_old_marshal_VOID__POINTER_POINTER_POINTER_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT(
+void purple_old_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT(
+void purple_old_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_INT__INT(
+void purple_old_marshal_INT__INT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_INT__INT_INT(
+void purple_old_marshal_INT__INT_INT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_INT__POINTER_POINTER(
+void purple_old_marshal_INT__POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER(
+void purple_old_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER(
+void purple_old_marshal_BOOLEAN__POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER_POINTER(
+void purple_old_marshal_BOOLEAN__POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER(
+void purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER_POINTER_UINT(
+void purple_old_marshal_BOOLEAN__POINTER_POINTER_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT(
+void purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER(
+void purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER(
+void purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
+void purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_BOOLEAN__INT_POINTER(
+void purple_old_marshal_BOOLEAN__INT_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_POINTER__POINTER_INT(
+void purple_old_marshal_POINTER__POINTER_INT(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_POINTER__POINTER_INT64(
+void purple_old_marshal_POINTER__POINTER_INT64(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_POINTER__POINTER_INT_BOOLEAN(
+void purple_old_marshal_POINTER__POINTER_INT_BOOLEAN(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_POINTER__POINTER_INT64_BOOLEAN(
+void purple_old_marshal_POINTER__POINTER_INT64_BOOLEAN(
PurpleCallback cb, va_list args, void *data, void **return_val);
-void purple_marshal_POINTER__POINTER_POINTER(
+void purple_old_marshal_POINTER__POINTER_POINTER(
PurpleCallback cb, va_list args, void *data, void **return_val);
/*@}*/
+/* XXX: Until the proper marshallers can be used ... */
+#define purple_marshal_VOID purple_old_marshal_VOID
+#define purple_marshal_VOID__INT purple_old_marshal_VOID__INT
+#define purple_marshal_VOID__INT_INT purple_old_marshal_VOID__INT_INT
+#define purple_marshal_VOID__POINTER purple_old_marshal_VOID__POINTER
+#define purple_marshal_VOID__POINTER_UINT purple_old_marshal_VOID__POINTER_UINT
+#define purple_marshal_VOID__POINTER_INT_INT purple_old_marshal_VOID__POINTER_INT_INT
+#define purple_marshal_VOID__POINTER_INT_POINTER purple_old_marshal_VOID__POINTER_INT_POINTER
+#define purple_marshal_VOID__POINTER_POINTER purple_old_marshal_VOID__POINTER_POINTER
+#define purple_marshal_VOID__POINTER_POINTER_UINT purple_old_marshal_VOID__POINTER_POINTER_UINT
+#define purple_marshal_VOID__POINTER_POINTER_UINT_UINT purple_old_marshal_VOID__POINTER_POINTER_UINT_UINT
+#define purple_marshal_VOID__POINTER_POINTER_POINTER purple_old_marshal_VOID__POINTER_POINTER_POINTER
+#define purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER purple_old_marshal_VOID__POINTER_POINTER_POINTER_POINTER
+#define purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER purple_old_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER
+#define purple_marshal_VOID__POINTER_POINTER_POINTER_UINT purple_old_marshal_VOID__POINTER_POINTER_POINTER_UINT
+#define purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT purple_old_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT
+#define purple_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT purple_old_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT
+#define purple_marshal_INT__INT purple_old_marshal_INT__INT
+#define purple_marshal_INT__INT_INT purple_old_marshal_INT__INT_INT
+#define purple_marshal_INT__POINTER_POINTER purple_old_marshal_INT__POINTER_POINTER
+#define purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER purple_old_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER
+#define purple_marshal_BOOLEAN__POINTER purple_old_marshal_BOOLEAN__POINTER
+#define purple_marshal_BOOLEAN__POINTER_POINTER purple_old_marshal_BOOLEAN__POINTER_POINTER
+#define purple_marshal_BOOLEAN__POINTER_POINTER_POINTER purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER
+#define purple_marshal_BOOLEAN__POINTER_POINTER_UINT purple_old_marshal_BOOLEAN__POINTER_POINTER_UINT
+#define purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT
+#define purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER
+#define purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER
+#define purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT purple_old_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT
+#define purple_marshal_BOOLEAN__INT_POINTER purple_old_marshal_BOOLEAN__INT_POINTER
+#define purple_marshal_POINTER__POINTER_INT purple_old_marshal_POINTER__POINTER_INT
+#define purple_marshal_POINTER__POINTER_INT64 purple_old_marshal_POINTER__POINTER_INT64
+#define purple_marshal_POINTER__POINTER_INT_BOOLEAN purple_old_marshal_POINTER__POINTER_INT_BOOLEAN
+#define purple_marshal_POINTER__POINTER_INT64_BOOLEAN purple_old_marshal_POINTER__POINTER_INT64_BOOLEAN
+#define purple_marshal_POINTER__POINTER_POINTER purple_old_marshal_POINTER__POINTER_POINTER
+
#ifdef __cplusplus
}
#endif
More information about the Commits
mailing list