pidgin: 24fa455f: Duh, it helps to use the right marshalle...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 24fa455ff976c0eedc134be0c68ba4ea8a167a31
Ancestor: d62410ed64c89b0439756c956b6ed4a91b3152cc
Author: darkrain42 at pidgin.im
Date: 2009-05-22T06:01:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/24fa455ff976c0eedc134be0c68ba4ea8a167a31

Modified files:
        libpurple/protocols/jabber/libxmpp.c libpurple/signals.c
        libpurple/signals.h

ChangeLog: 

Duh, it helps to use the right marshallers.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/libxmpp.c	2b06cdcf7e2d15ccff7a0526b721ad80cd99c36d
+++ libpurple/protocols/jabber/libxmpp.c	f24ea99c7fdf3626f1a4d989327353768986bd79
@@ -141,7 +141,7 @@ static gboolean load_plugin(PurplePlugin
 			     purple_value_new_outgoing(PURPLE_TYPE_STRING));
 
 	purple_signal_register(plugin, "jabber-receiving-message",
-			purple_marshal_BOOLEAN__POINTER_POINTER_POINTER,
+			purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER,
 			purple_value_new(PURPLE_TYPE_BOOLEAN), 6,
 			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
 			purple_value_new(PURPLE_TYPE_STRING), /* type */
@@ -169,13 +169,13 @@ static gboolean load_plugin(PurplePlugin
 			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_XMLNODE)); /* child */
 
 	purple_signal_register(plugin, "jabber-register-namespace-watcher",
-			purple_marshal_VOID__POINTER_POINTER_POINTER,
+			purple_marshal_VOID__POINTER_POINTER,
 			NULL, 2,
 			purple_value_new(PURPLE_TYPE_STRING),  /* node */
 			purple_value_new(PURPLE_TYPE_STRING)); /* namespace */
 
 	purple_signal_register(plugin, "jabber-unregister-namespace-watcher",
-			purple_marshal_VOID__POINTER_POINTER_POINTER,
+			purple_marshal_VOID__POINTER_POINTER,
 			NULL, 2,
 			purple_value_new(PURPLE_TYPE_STRING),  /* node */
 			purple_value_new(PURPLE_TYPE_STRING)); /* namespace */
============================================================
--- libpurple/signals.c	495b2f8b608279cbb850e4794a49f56abd7e9b32
+++ libpurple/signals.c	b45610a2a29f17768cee6119e1ac478b579e79cb
@@ -975,6 +975,26 @@ void
 }
 
 void
+purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER(
+		PurpleCallback cb, va_list args, void *data, void **return_val)
+{
+	gboolean ret_val;
+	void *arg1 = va_arg(args, void *);
+	void *arg2 = va_arg(args, void *);
+	void *arg3 = va_arg(args, void *);
+	void *arg4 = va_arg(args, void *);
+	void *arg5 = va_arg(args, void *);
+	void *arg6 = va_arg(args, void *);
+
+	ret_val =
+		((gboolean (*)(void *, void *, void *, void *, void *, void *, void *))cb)(
+			arg1, arg2, arg3, arg4, arg5, arg6, data);
+
+	if (return_val != NULL)
+		*return_val = GINT_TO_POINTER(ret_val);
+}
+
+void
 purple_marshal_BOOLEAN__INT_POINTER(PurpleCallback cb, va_list args, void *data,
                                   void **return_val)
 {
============================================================
--- libpurple/signals.h	43a23f0283841d3e22575607c64bd51fec8c2195
+++ libpurple/signals.h	57dd2aaf0627e25415addcd5e8ee8a413d2cbfbb
@@ -349,6 +349,8 @@ void purple_marshal_BOOLEAN__POINTER_POI
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER(
+		PurpleCallback cb, va_list args, void *data, void **return_val);
 
 void purple_marshal_BOOLEAN__INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);