pidgin: 18ae74c7: Add purple_marshal_POINTER__POINTER(), w...

rekkanoryo at pidgin.im rekkanoryo at pidgin.im
Sat Mar 6 22:05:47 EST 2010


-----------------------------------------------------------------
Revision: 18ae74c716e6e113cb591a99cefc78204a292102
Ancestor: e72dcf8b5e06438b5ceb002c28f687eea2b1e973
Author: rekkanoryo at pidgin.im
Date: 2010-03-07T01:27:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/18ae74c716e6e113cb591a99cefc78204a292102

Modified files:
        libpurple/signals.c libpurple/signals.h

ChangeLog: 

Add purple_marshal_POINTER__POINTER(), which sadrul says should be used for the
patch attached to #4598.  Refs #4598.

-------------- next part --------------
============================================================
--- libpurple/signals.c	060a54e191f5e7eebc240ad2aad9849415514ac2
+++ libpurple/signals.c	be5e86f2a278e717e7988b33967f3eda2950fa0d
@@ -1009,6 +1009,21 @@ void
 }
 
 void
+purple_marshal_POINTER__POINTER(
+                                    PurpleCallback cb, va_list args, void *data,
+                                    void **return_val)
+{
+	gpointer ret_val;
+	void *arg1 = va_arg(args, void *);
+
+	ret_val = ((gpointer(*)(void *, void *))cb)(arg1, data);
+
+	if (return_val != NULL)
+		*return_val = ret_val;
+}
+
+
+void
 purple_marshal_POINTER__POINTER_INT(
                                     PurpleCallback cb, va_list args, void *data,
                                     void **return_val)
============================================================
--- libpurple/signals.h	57dd2aaf0627e25415addcd5e8ee8a413d2cbfbb
+++ libpurple/signals.h	ea6e3f00018c125e2d80df2ffd7245343808ef21
@@ -355,6 +355,8 @@ void purple_marshal_BOOLEAN__INT_POINTER
 void purple_marshal_BOOLEAN__INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 
+void purple_marshal_POINTER__POINTER(
+		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_POINTER__POINTER_INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_POINTER__POINTER_INT64(


More information about the Commits mailing list