[Gaim-commits] SF.net SVN: gaim: [17346] trunk/libgaim

[<de...@us...>]

Revision: 17346
          http://svn.sourceforge.net/gaim/?rev=17346&view=rev
Author:   deryni9
Date:     2006-09-24 23:01:12 -0700 (Sun, 24 Sep 2006)

Log Message:
-----------
Fix the argument GaimValue types in a handful of signal registrations. These
being wrong didn't matter to things that knew/guessed what their arguments
were (i.e. C functions) but did matter to things that needed to trust the
GaimValue type information for the types (i.e plugin loaders). I'm pretty sure
I got this all right, it matches the docs at least.

I still think there are a couple problems (namely the *-timestamp functions
returning a GAIM_TYPE_POINTER instead of a GAIM_TYPE_STRING) but these were
much more obvious.

Modified Paths:
--------------
    trunk/libgaim/ft.c
    trunk/libgaim/sound.c

Modified: trunk/libgaim/ft.c
===================================================================
--- trunk/libgaim/ft.c	2006-09-25 03:35:02 UTC (rev 17345)
+++ trunk/libgaim/ft.c	2006-09-25 06:01:12 UTC (rev 17346)
@@ -1183,41 +1183,41 @@
 
 	/* register signals */
 	gaim_signal_register(handle, "file-recv-accept",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-send-accept",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-recv-start",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-send-start",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-send-cancel",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-recv-cancel",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-send-complete",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-recv-complete",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 	gaim_signal_register(handle, "file-recv-request",
-						 gaim_marshal_VOID__POINTER,
-						 NULL, 1,
-						 gaim_value_new(GAIM_TYPE_POINTER, GAIM_SUBTYPE_XFER));
+	                     gaim_marshal_VOID__POINTER, NULL, 1,
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_XFER));
 }
 
 void

Modified: trunk/libgaim/sound.c
===================================================================
--- trunk/libgaim/sound.c	2006-09-25 03:35:02 UTC (rev 17345)
+++ trunk/libgaim/sound.c	2006-09-25 06:01:12 UTC (rev 17346)
@@ -103,7 +103,8 @@
 	                     gaim_marshal_BOOLEAN__INT_POINTER,
 	                     gaim_value_new(GAIM_TYPE_BOOLEAN), 2,
 	                     gaim_value_new(GAIM_TYPE_INT),
-	                     gaim_value_new(GAIM_TYPE_POINTER));
+	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
+	                                    GAIM_SUBTYPE_ACCOUNT));
 
 	gaim_prefs_add_none("/core/sound");
 	gaim_prefs_add_bool("/core/sound/while_away", FALSE);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.