changeset
[gaim-migrate @ 17346]
Mon, 25 Sep 2006 06:01:12 +0000
- author
- Etan Reisner <deryni@pidgin.im>
- date
- Mon, 25 Sep 2006 06:01:12 +0000
- changeset 14680
- f9ccad545789
- parent 14679
- 96db8bea9ee0
- child 14681
- c0edc843f47e
[gaim-migrate @ 17346]
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.
| libgaim/ft.c | file | annotate | diff | comparison | revisions | |
| libgaim/sound.c | file | annotate | diff | comparison | revisions |
--- a/libgaim/ft.c Mon Sep 25 03:35:02 2006 +0000 +++ b/libgaim/ft.c Mon Sep 25 06:01:12 2006 +0000 @@ -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
--- a/libgaim/sound.c Mon Sep 25 03:35:02 2006 +0000 +++ b/libgaim/sound.c Mon Sep 25 06:01:12 2006 +0000 @@ -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);
