pidgin/pidgin

Merged in CMaiku/pidgin (pull request #200)

2017-06-16, Gary Kramlich
55d38999c2fb
Parents 876661dc137568c94444252e
Children 3200c5f09dbc
Merged in CMaiku/pidgin (pull request #200)

Use generic marshaller for GObject signals

Approved-by: Gary Kramlich
Approved-by: Eion Robb
26 files changed, 96 insertions(+), 272 deletions(-)
  • +0 -3
    .hgignore
  • +1 -18
    finch/libgnt/Makefile.am
  • +0 -11
    finch/libgnt/genmarshal
  • +1 -2
    finch/libgnt/gntcheckbox.c
  • +1 -2
    finch/libgnt/gntclipboard.c
  • +1 -3
    finch/libgnt/gntcombobox.c
  • +2 -5
    finch/libgnt/gntentry.c
  • +1 -3
    finch/libgnt/gntfilesel.c
  • +1 -2
    finch/libgnt/gntmenuitem.c
  • +1 -2
    finch/libgnt/gntslider.c
  • +4 -9
    finch/libgnt/gnttree.c
  • +15 -31
    finch/libgnt/gntwidget.c
  • +2 -4
    finch/libgnt/gntwindow.c
  • +11 -23
    finch/libgnt/gntwm.c
  • +10 -21
    libpurple/Makefile.am
  • +2 -11
    libpurple/Makefile.mingw
  • +0 -10
    libpurple/marshallers.list
  • +8 -17
    libpurple/media.c
  • +5 -12
    libpurple/media/backend-iface.c
  • +4 -9
    libpurple/mediamanager.c
  • +1 -15
    libpurple/protocols/facebook/Makefile.am
  • +1 -9
    libpurple/protocols/facebook/Makefile.mingw
  • +12 -25
    libpurple/protocols/facebook/api.c
  • +0 -6
    libpurple/protocols/facebook/marshaller.list
  • +4 -9
    libpurple/protocols/facebook/mqtt.c
  • +8 -10
    pidgin/gtkwebview.c
    • --- a/.hgignore Wed Jun 14 23:13:00 2017 -0500
    +++ b/.hgignore Fri Jun 16 23:39:19 2017 +0000
    @@ -64,7 +64,6 @@
    doc/reference/.*/xml/.*
    doc/reference/.*/version.xml
    finch/finch$
    -finch/libgnt/gntmarshal.[ch]
    gtk-doc.make
    install-sh
    intltool-.*
    @@ -75,9 +74,7 @@
    libpurple/example/nullclient
    libpurple/data/purple-url-handler.desktop$
    libpurple/data/purple-url-handler.desktop.in$
    -libpurple/marshallers.[ch]
    libpurple/plugins/dbus-example-bindings.c
    -libpurple/protocols/facebook/marshal.[ch]
    libpurple/purple-client-bindings.[ch]
    libpurple/purple-client-example
    libpurple/purple.h$
    --- a/finch/libgnt/Makefile.am Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/Makefile.am Fri Jun 16 23:39:19 2017 +0000
    @@ -1,5 +1,3 @@
    -EXTRA_DIST=genmarshal
    -
    SUBDIRS = . wms
    pkgconfigdir = $(libdir)/pkgconfig
    pkgconfig_DATA = gnt.pc
    @@ -8,10 +6,7 @@
    noinst_HEADERS = gntinternal.h
    -BUILT_SOURCES = gntmarshal.h
    -
    libgnt_la_SOURCES = \
    - gntmarshal.c \
    gntwidget.c \
    gntbindable.c \
    gntbox.c \
    @@ -53,7 +48,6 @@
    gntkeys.h \
    gntlabel.h \
    gntline.h \
    - gntmarshal.h \
    gntmenu.h \
    gntmenuitem.h \
    gntmenuitemcheck.h \
    @@ -68,17 +62,6 @@
    gntws.h \
    gnt.h
    -CLEANFILES = \
    - gntmarshal.h \
    - gntmarshal.c
    -
    -gntmarshal.c: $(srcdir)/genmarshal gntmarshal.h
    - $(AM_V_GEN)echo "#include \"gntmarshal.h\"" > $@
    - $(AM_V_at)glib-genmarshal --prefix=gnt_closure_marshal --body $(srcdir)/genmarshal >> $@
    -
    -gntmarshal.h: $(srcdir)/genmarshal
    - $(AM_V_GEN)glib-genmarshal --prefix=gnt_closure_marshal --header $(srcdir)/genmarshal > $@
    -
    libgnt_laincludedir=$(includedir)/gnt
    libgnt_lainclude_HEADERS = \
    $(libgnt_la_headers)
    @@ -147,5 +130,5 @@
    $(INTROSPECTION_TYPELIBDIR)
    typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
    -CLEANFILES += $(gir_DATA) $(typelib_DATA)
    +CLEANFILES = $(gir_DATA) $(typelib_DATA)
    endif
    --- a/finch/libgnt/genmarshal Wed Jun 14 23:13:00 2017 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,11 +0,0 @@
    -BOOLEAN:VOID
    -BOOLEAN:STRING
    -VOID:INT,INT,INT,INT
    -VOID:INT,INT
    -VOID:POINTER,POINTER
    -BOOLEAN:INT,INT
    -BOOLEAN:INT,INT,INT
    -BOOLEAN:POINTER,POINTER,POINTER
    -BOOLEAN:INT,INT,INT,POINTER
    -VOID:STRING,STRING
    -VOID:POINTER,BOOLEAN
    --- a/finch/libgnt/gntcheckbox.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntcheckbox.c Fri Jun 16 23:39:19 2017 +0000
    @@ -105,8 +105,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntCheckBoxClass, toggled),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    GNTDEBUG;
    }
    --- a/finch/libgnt/gntclipboard.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntclipboard.c Fri Jun 16 23:39:19 2017 +0000
    @@ -37,8 +37,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    0,
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    }
    --- a/finch/libgnt/gntcombobox.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntcombobox.c Fri Jun 16 23:39:19 2017 +0000
    @@ -24,7 +24,6 @@
    #include "gntbox.h"
    #include "gntcombobox.h"
    #include "gnttree.h"
    -#include "gntmarshal.h"
    #include "gntstyle.h"
    #include "gntutils.h"
    @@ -283,8 +282,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    0,
    - NULL, NULL,
    - gnt_closure_marshal_VOID__POINTER_POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
    gnt_bindable_class_register_action(bindable, "dropdown", dropdown_menu,
    --- a/finch/libgnt/gntentry.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntentry.c Fri Jun 16 23:39:19 2017 +0000
    @@ -26,7 +26,6 @@
    #include "gntinternal.h"
    #include "gntbox.h"
    #include "gntentry.h"
    -#include "gntmarshal.h"
    #include "gntstyle.h"
    #include "gnttree.h"
    #include "gntutils.h"
    @@ -951,16 +950,14 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntEntryClass, text_changed),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_COMPLETION] =
    g_signal_new("completion",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    - 0, NULL, NULL,
    - gnt_closure_marshal_VOID__POINTER_POINTER,
    + 0, NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
    gnt_bindable_class_register_action(bindable, "cursor-home", move_start,
    --- a/finch/libgnt/gntfilesel.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntfilesel.c Fri Jun 16 23:39:19 2017 +0000
    @@ -28,7 +28,6 @@
    #include "gntentry.h"
    #include "gntfilesel.h"
    #include "gntlabel.h"
    -#include "gntmarshal.h"
    #include "gntstyle.h"
    #include "gnttree.h"
    @@ -506,8 +505,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntFileSelClass, file_selected),
    - NULL, NULL,
    - gnt_closure_marshal_VOID__STRING_STRING,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
    gnt_bindable_class_register_action(bindable, "toggle-tag", toggle_tag_selection, "t", NULL);
    --- a/finch/libgnt/gntmenuitem.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntmenuitem.c Fri Jun 16 23:39:19 2017 +0000
    @@ -57,8 +57,7 @@
    g_signal_new("activate",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    - 0, NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + 0, NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    }
    --- a/finch/libgnt/gntslider.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntslider.c Fri Jun 16 23:39:19 2017 +0000
    @@ -202,8 +202,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntSliderClass, changed),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__INT,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_INT);
    gnt_bindable_class_register_action(bindable, "step-backward", step_back, GNT_KEY_LEFT, NULL);
    --- a/finch/libgnt/gnttree.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gnttree.c Fri Jun 16 23:39:19 2017 +0000
    @@ -21,7 +21,6 @@
    */
    #include "gntinternal.h"
    -#include "gntmarshal.h"
    #include "gntstyle.h"
    #include "gnttree.h"
    #include "gntutils.h"
    @@ -1072,32 +1071,28 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntTreeClass, selection_changed),
    - NULL, NULL,
    - gnt_closure_marshal_VOID__POINTER_POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
    signals[SIG_SCROLLED] =
    g_signal_new("scrolled",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    0,
    - NULL, NULL,
    - g_cclosure_marshal_VOID__INT,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_INT);
    signals[SIG_TOGGLED] =
    g_signal_new("toggled",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntTreeClass, toggled),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_COLLAPSED] =
    g_signal_new("collapse-toggled",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    0,
    - NULL, NULL,
    - gnt_closure_marshal_VOID__POINTER_BOOLEAN,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
    gnt_bindable_class_register_action(bindable, "move-up", action_up,
    --- a/finch/libgnt/gntwidget.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntwidget.c Fri Jun 16 23:39:19 2017 +0000
    @@ -25,7 +25,6 @@
    #include "gntinternal.h"
    #include "gntwidget.h"
    #include "gntstyle.h"
    -#include "gntmarshal.h"
    #include "gntutils.h"
    enum
    @@ -135,104 +134,91 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, destroy),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_GIVE_FOCUS] =
    g_signal_new("gained-focus",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, gained_focus),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_LOST_FOCUS] =
    g_signal_new("lost-focus",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, lost_focus),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_ACTIVATE] =
    g_signal_new("activate",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, activate),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_MAP] =
    g_signal_new("map",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, map),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_DRAW] =
    g_signal_new("draw",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, draw),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_HIDE] =
    g_signal_new("hide",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, hide),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_EXPOSE] =
    g_signal_new("expose",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, expose),
    - NULL, NULL,
    - gnt_closure_marshal_VOID__INT_INT_INT_INT,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
    signals[SIG_POSITION] =
    g_signal_new("position-set",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, set_position),
    - NULL, NULL,
    - gnt_closure_marshal_VOID__INT_INT,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
    signals[SIG_SIZE_REQUEST] =
    g_signal_new("size_request",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, size_request),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_SIZE_CHANGED] =
    g_signal_new("size_changed",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, size_changed),
    - NULL, NULL,
    - gnt_closure_marshal_VOID__INT_INT,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
    signals[SIG_CONFIRM_SIZE] =
    g_signal_new("confirm_size",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, confirm_size),
    - NULL, NULL,
    - gnt_closure_marshal_BOOLEAN__INT_INT,
    + NULL, NULL, NULL,
    G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_INT);
    signals[SIG_KEY_PRESSED] =
    g_signal_new("key_pressed",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, key_pressed),
    - gnt_boolean_handled_accumulator, NULL,
    - gnt_closure_marshal_BOOLEAN__STRING,
    + gnt_boolean_handled_accumulator, NULL, NULL,
    G_TYPE_BOOLEAN, 1, G_TYPE_STRING);
    signals[SIG_CLICKED] =
    @@ -240,8 +226,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWidgetClass, clicked),
    - gnt_boolean_handled_accumulator, NULL,
    - gnt_closure_marshal_BOOLEAN__INT_INT_INT,
    + gnt_boolean_handled_accumulator, NULL, NULL,
    G_TYPE_BOOLEAN, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
    signals[SIG_CONTEXT_MENU] =
    @@ -249,8 +234,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    0,
    - gnt_boolean_handled_accumulator, NULL,
    - gnt_closure_marshal_BOOLEAN__VOID,
    + gnt_boolean_handled_accumulator, NULL, NULL,
    G_TYPE_BOOLEAN, 0);
    /* This is relevant for all widgets */
    --- a/finch/libgnt/gntwindow.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntwindow.c Fri Jun 16 23:39:19 2017 +0000
    @@ -94,8 +94,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    0,
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[SIG_WORKSPACE_SHOW] =
    @@ -103,8 +102,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    0,
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    gnt_bindable_class_register_action(bindable, "show-menu", show_menu,
    --- a/finch/libgnt/gntwm.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/finch/libgnt/gntwm.c Fri Jun 16 23:39:19 2017 +0000
    @@ -50,7 +50,6 @@
    #include "gntwm.h"
    #include "gntstyle.h"
    -#include "gntmarshal.h"
    #include "gnt.h"
    #include "gntbox.h"
    #include "gntbutton.h"
    @@ -1421,32 +1420,28 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, new_window),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_DECORATE_WIN] =
    g_signal_new("decorate_win",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, decorate_window),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_CLOSE_WIN] =
    g_signal_new("close_win",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, close_window),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_CONFIRM_RESIZE] =
    g_signal_new("confirm_resize",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, window_resize_confirm),
    - gnt_boolean_handled_accumulator, NULL,
    - gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER,
    + gnt_boolean_handled_accumulator, NULL, NULL,
    G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER);
    signals[SIG_CONFIRM_MOVE] =
    @@ -1454,8 +1449,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, window_move_confirm),
    - gnt_boolean_handled_accumulator, NULL,
    - gnt_closure_marshal_BOOLEAN__POINTER_POINTER_POINTER,
    + gnt_boolean_handled_accumulator, NULL, NULL,
    G_TYPE_BOOLEAN, 3, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_POINTER);
    signals[SIG_RESIZED] =
    @@ -1463,24 +1457,21 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, window_resized),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_MOVED] =
    g_signal_new("window_moved",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, window_moved),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_UPDATE_WIN] =
    g_signal_new("window_update",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, window_update),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_GIVE_FOCUS] =
    @@ -1488,8 +1479,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, give_focus),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_POINTER);
    signals[SIG_MOUSE_CLICK] =
    @@ -1497,8 +1487,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, mouse_clicked),
    - gnt_boolean_handled_accumulator, NULL,
    - gnt_closure_marshal_BOOLEAN__INT_INT_INT_POINTER,
    + gnt_boolean_handled_accumulator, NULL, NULL,
    G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_POINTER);
    signals[SIG_TERMINAL_REFRESH] =
    @@ -1506,8 +1495,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(GntWMClass, terminal_refresh),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "window-next", window_next,
    --- a/libpurple/Makefile.am Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/Makefile.am Fri Jun 16 23:39:19 2017 +0000
    @@ -5,7 +5,6 @@
    enums.c.in \
    enums.h.in \
    glibcompat.h \
    - marshallers.list \
    purple-notifications-example \
    purple-remote \
    purple-send \
    @@ -121,8 +120,7 @@
    xmlnode.c
    purple_builtsources = \
    - enums.c \
    - marshallers.c
    + enums.c
    purple_coreheaders = \
    account.h \
    @@ -241,7 +239,7 @@
    pbkdf2cipher.h \
    rc4cipher.h
    -purple_builtheaders = purple.h version.h enums.h marshallers.h
    +purple_builtheaders = purple.h version.h enums.h
    purple_enumheaders = \
    $(srcdir)/account.h \
    @@ -263,13 +261,6 @@
    $(srcdir)/xmlnode.h
    -marshallers.h: marshallers.list
    - $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
    -
    -marshallers.c: marshallers.list marshallers.h
    - $(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
    - $(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
    -
    # glib-mkenums doesn't handle VPATHs well, sed is used here to fix the
    # include paths and documentation.
    # Escaping possible . in $(srcdir) to \. for sed pattern.
    @@ -283,9 +274,7 @@
    CLEANFILES = \
    enums.c \
    - enums.h \
    - marshallers.c \
    - marshallers.h
    + enums.h
    DISTCLEANFILES = \
    data/purple-url-handler.desktop
    @@ -314,14 +303,14 @@
    prefs.h presence.h roomlist.h savedstatuses.h smiley.h smiley-list.h \
    status.h server.h util.h xmlnode.h protocol.h protocols.h
    -# Filter out enums.h and marshallers.h as they don't actually generate
    -# anything. This way making from a VPATH and distcheck doesn't fail due
    -# to not being able to find the enums.h or marshallers.h files if
    -# they've already been generated in the $(srcdir).
    +# Filter out enums.h as it doesn't actually generate anything.
    +# This way making from a VPATH and distcheck doesn't fail due
    +# to not being able to find the enums.h file if it's already
    +# been generated in the $(srcdir).
    purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
    $(addprefix $(srcdir)/ciphers/, $(purple_cipherheaders)) \
    $(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
    - $(filter-out: enums.h marshallers.h, $(purple_builtheaders))
    + $(filter-out: enums.h, $(purple_builtheaders))
    dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
    # We should probably make this better
    dbus_signals = $(addprefix $(srcdir)/, $(purple_coresources)) \
    @@ -345,7 +334,7 @@
    # Declare these as dependencies so they're built even if `make distcheck`
    # is run immediately after configuring.
    -$(libpurple_la_OBJECTS): dbus-types.h enums.h marshallers.h
    +$(libpurple_la_OBJECTS): dbus-types.h enums.h
    # libpurple-client
    @@ -398,7 +387,7 @@
    # Declare these as dependencies so they're built even if `make distcheck`
    # is run immediately after configuring.
    -$(libpurple_la_OBJECTS): enums.h marshallers.h
    +$(libpurple_la_OBJECTS): enums.h
    endif
    --- a/libpurple/Makefile.mingw Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/Makefile.mingw Fri Jun 16 23:39:19 2017 +0000
    @@ -56,7 +56,7 @@
    VV_SRC =
    endif
    -BUILT_SRC = marshallers.c enums.c
    +BUILT_SRC = enums.c
    C_SRC = \
    $(BUILT_SRC) \
    @@ -209,15 +209,6 @@
    $(OBJECTS): $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H)
    -marshallers.h: marshallers.list
    - @echo -e " GEN\t$@"
    - @$(GLIB_GENMARSHAL) --prefix=purple_smarshal $< --header > marshallers.h
    -
    -marshallers.c: marshallers.list marshallers.h
    - @echo -e " GEN\t$@"
    - @echo "#include \"marshallers.h\"" > marshallers.c
    - @$(GLIB_GENMARSHAL) --prefix=purple_smarshal $< --body >> marshallers.c
    -
    enums.h: enums.h.in $(ENUM_HEADERS)
    @echo -e " GEN\t$@"
    @$(GLIB_MKENUMS) --template enums.h.in $(ENUM_HEADERS) > enums.h
    @@ -233,7 +224,7 @@
    ## CLEAN RULES
    ##
    clean:
    - rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) marshallers.h marshallers.c enums.h enums.c
    + rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H) $(PURPLE_PURPLE_H) enums.h enums.c
    rm -f $(TARGET).dll $(TARGET).dll.a $(TARGET).def
    $(MAKE_at) $(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
    $(MAKE_at) $(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
    --- a/libpurple/marshallers.list Wed Jun 14 23:13:00 2017 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,10 +0,0 @@
    -VOID:POINTER,POINTER,OBJECT
    -BOOLEAN:OBJECT,POINTER,STRING
    -VOID:STRING,STRING
    -VOID:STRING,STRING,DOUBLE
    -VOID:ENUM,STRING,STRING
    -VOID:ENUM,STRING,STRING,BOOLEAN
    -VOID:FLAGS,FLAGS
    -VOID:STRING,STRING,OBJECT,OBJECT
    -BOOLEAN:OBJECT
    -VOID:POINTER,POINTER,OBJECT,OBJECT
    --- a/libpurple/media.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/media.c Fri Jun 16 23:39:19 2017 +0000
    @@ -29,7 +29,6 @@
    #ifdef USE_GSTREAMER
    #include "media/backend-fs2.h"
    -#include "marshallers.h"
    #include "media-gst.h"
    #endif /* USE_GSTREAMER */
    @@ -224,41 +223,33 @@
    G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
    purple_media_signals[S_ERROR] = g_signal_new("error", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - g_cclosure_marshal_VOID__STRING,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_STRING);
    purple_media_signals[CANDIDATES_PREPARED] = g_signal_new("candidates-prepared", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__STRING_STRING,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_STRING,
    G_TYPE_STRING);
    purple_media_signals[CODECS_CHANGED] = g_signal_new("codecs-changed", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - g_cclosure_marshal_VOID__STRING,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_STRING);
    purple_media_signals[LEVEL] = g_signal_new("level", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__STRING_STRING_DOUBLE,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 3, G_TYPE_STRING,
    G_TYPE_STRING, G_TYPE_DOUBLE);
    purple_media_signals[NEW_CANDIDATE] = g_signal_new("new-candidate", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__POINTER_POINTER_OBJECT,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 3, G_TYPE_POINTER,
    G_TYPE_POINTER, PURPLE_TYPE_MEDIA_CANDIDATE);
    purple_media_signals[STATE_CHANGED] = g_signal_new("state-changed", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__ENUM_STRING_STRING,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 3, PURPLE_MEDIA_TYPE_STATE,
    G_TYPE_STRING, G_TYPE_STRING);
    purple_media_signals[STREAM_INFO] = g_signal_new("stream-info", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 4, PURPLE_MEDIA_TYPE_INFO_TYPE,
    G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
    purple_media_signals[CANDIDATE_PAIR_ESTABLISHED] = g_signal_new("candidate-pair-established", G_TYPE_FROM_CLASS(klass),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__POINTER_POINTER_OBJECT_OBJECT,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 4, G_TYPE_POINTER, G_TYPE_POINTER,
    PURPLE_TYPE_MEDIA_CANDIDATE, PURPLE_TYPE_MEDIA_CANDIDATE);
    g_type_class_add_private(klass, sizeof(PurpleMediaPrivate));
    --- a/libpurple/media/backend-iface.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/media/backend-iface.c Fri Jun 16 23:39:19 2017 +0000
    @@ -23,8 +23,6 @@
    #include "backend-iface.h"
    -#include "marshallers.h"
    -
    enum {
    S_ERROR,
    CANDIDATES_PREPARED,
    @@ -67,34 +65,29 @@
    G_PARAM_STATIC_STRINGS));
    purple_media_backend_signals[S_ERROR] =
    g_signal_new("error", G_TYPE_FROM_CLASS(iface),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - g_cclosure_marshal_VOID__STRING,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_STRING);
    purple_media_backend_signals[CANDIDATES_PREPARED] =
    g_signal_new("candidates-prepared",
    G_TYPE_FROM_CLASS(iface),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__STRING_STRING,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 2, G_TYPE_STRING,
    G_TYPE_STRING);
    purple_media_backend_signals[CODECS_CHANGED] =
    g_signal_new("codecs-changed",
    G_TYPE_FROM_CLASS(iface),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - g_cclosure_marshal_VOID__STRING,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 1, G_TYPE_STRING);
    purple_media_backend_signals[NEW_CANDIDATE] =
    g_signal_new("new-candidate",
    G_TYPE_FROM_CLASS(iface),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__POINTER_POINTER_OBJECT,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 3, G_TYPE_POINTER,
    G_TYPE_POINTER, PURPLE_TYPE_MEDIA_CANDIDATE);
    purple_media_backend_signals[ACTIVE_CANDIDATE_PAIR] =
    g_signal_new("active-candidate-pair",
    G_TYPE_FROM_CLASS(iface),
    - G_SIGNAL_RUN_LAST, 0, NULL, NULL,
    - purple_smarshal_VOID__STRING_STRING_OBJECT_OBJECT,
    + G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
    G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING,
    PURPLE_TYPE_MEDIA_CANDIDATE,
    PURPLE_TYPE_MEDIA_CANDIDATE);
    --- a/libpurple/mediamanager.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/mediamanager.c Fri Jun 16 23:39:19 2017 +0000
    @@ -27,7 +27,6 @@
    #include "mediamanager.h"
    #ifdef USE_GSTREAMER
    -#include "marshallers.h"
    #include "media-gst.h"
    #include <media/backend-fs2.h>
    #endif /* USE_GSTREAMER */
    @@ -172,8 +171,7 @@
    purple_media_manager_signals[INIT_MEDIA] = g_signal_new ("init-media",
    G_TYPE_FROM_CLASS (klass),
    G_SIGNAL_RUN_LAST,
    - 0, NULL, NULL,
    - purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING,
    + 0, NULL, NULL, NULL,
    G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA,
    G_TYPE_POINTER, G_TYPE_STRING);
    @@ -181,16 +179,14 @@
    g_signal_new ("init-private-media",
    G_TYPE_FROM_CLASS (klass),
    G_SIGNAL_RUN_LAST,
    - 0, NULL, NULL,
    - purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING,
    + 0, NULL, NULL, NULL,
    G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA,
    G_TYPE_POINTER, G_TYPE_STRING);
    purple_media_manager_signals[UI_CAPS_CHANGED] = g_signal_new ("ui-caps-changed",
    G_TYPE_FROM_CLASS (klass),
    G_SIGNAL_RUN_LAST,
    - 0, NULL, NULL,
    - purple_smarshal_VOID__FLAGS_FLAGS,
    + 0, NULL, NULL, NULL,
    G_TYPE_NONE, 2, PURPLE_MEDIA_TYPE_CAPS,
    PURPLE_MEDIA_TYPE_CAPS);
    @@ -198,8 +194,7 @@
    g_signal_new("elements-changed",
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
    - 0, NULL, NULL,
    - g_cclosure_marshal_VOID__VOID,
    + 0, NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate));
    --- a/libpurple/protocols/facebook/Makefile.am Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/protocols/facebook/Makefile.am Fri Jun 16 23:39:19 2017 +0000
    @@ -1,12 +1,9 @@
    EXTRA_DIST = \
    - Makefile.mingw \
    - marshaller.list
    + Makefile.mingw
    pkgdir = @PURPLE_PLUGINDIR@
    FACEBOOKSOURCES = \
    - marshal.c \
    - marshal.h \
    api.c \
    api.h \
    data.c \
    @@ -25,17 +22,6 @@
    util.c \
    util.h
    -CLEANFILES = \
    - marshal.c \
    - marshal.h
    -
    -marshal.c: $(srcdir)/marshaller.list marshal.h
    - $(AM_V_GEN)echo "#include \"marshal.h\"" > $@
    - $(AM_V_at)$(GLIB_GENMARSHAL) --prefix=fb_marshal --body $(srcdir)/marshaller.list >> $@
    -
    -marshal.h: $(srcdir)/marshaller.list
    - $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=fb_marshal --header $(srcdir)/marshaller.list > $@
    -
    AM_CFLAGS = $(st)
    libfacebook_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
    --- a/libpurple/protocols/facebook/Makefile.mingw Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/protocols/facebook/Makefile.mingw Fri Jun 16 23:39:19 2017 +0000
    @@ -42,7 +42,6 @@
    ## SOURCES, OBJECTS
    ##
    C_SRC = \
    - marshal.c \
    api.c \
    data.c \
    facebook.c \
    @@ -85,18 +84,11 @@
    $(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
    $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
    -marshal.c: marshaller.list marshal.h
    - @echo "#include \"marshal.h\"" > $@
    - @$(GLIB_GENMARSHAL) --prefix=fb_marshal --body marshaller.list >> $@
    -
    -marshal.h: marshaller.list
    - @$(GLIB_GENMARSHAL) --prefix=fb_marshal --header marshaller.list > $@
    -
    ##
    ## CLEAN RULES
    ##
    clean:
    - rm -f $(OBJECTS) marshal.c marshal.h
    + rm -f $(OBJECTS)
    rm -f $(TARGET).dll
    include $(PIDGIN_COMMON_TARGETS)
    --- a/libpurple/protocols/facebook/api.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/protocols/facebook/api.c Fri Jun 16 23:39:19 2017 +0000
    @@ -28,7 +28,6 @@
    #include "api.h"
    #include "http.h"
    #include "json.h"
    -#include "marshal.h"
    #include "thrift.h"
    #include "util.h"
    @@ -287,8 +286,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    0);
    @@ -303,8 +301,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    0);
    @@ -320,8 +317,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_POINTER);
    @@ -341,8 +337,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER_BOOLEAN,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
    @@ -358,8 +353,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__OBJECT,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_ERROR);
    @@ -374,8 +368,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_POINTER);
    @@ -390,8 +383,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_POINTER);
    @@ -406,8 +398,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_POINTER);
    @@ -423,8 +414,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_POINTER);
    @@ -441,8 +431,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__INT64,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, FB_TYPE_ID);
    @@ -458,8 +447,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_POINTER);
    @@ -474,8 +462,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__POINTER,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_POINTER);
    }
    --- a/libpurple/protocols/facebook/marshaller.list Wed Jun 14 23:13:00 2017 -0500
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,6 +0,0 @@
    -VOID:INT64
    -VOID:OBJECT
    -VOID:POINTER
    -VOID:POINTER,BOOLEAN
    -VOID:STRING,BOXED
    -VOID:VOID
    --- a/libpurple/protocols/facebook/mqtt.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/libpurple/protocols/facebook/mqtt.c Fri Jun 16 23:39:19 2017 +0000
    @@ -31,7 +31,6 @@
    #include "purple-gio.h"
    #include "queuedoutputstream.h"
    -#include "marshal.h"
    #include "mqtt.h"
    #include "util.h"
    @@ -97,8 +96,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    0);
    @@ -114,8 +112,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__OBJECT,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    1, G_TYPE_ERROR);
    @@ -131,8 +128,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    0);
    @@ -148,8 +144,7 @@
    G_TYPE_FROM_CLASS(klass),
    G_SIGNAL_ACTION,
    0,
    - NULL, NULL,
    - fb_marshal_VOID__STRING_BOXED,
    + NULL, NULL, NULL,
    G_TYPE_NONE,
    2, G_TYPE_STRING, G_TYPE_BYTE_ARRAY);
    }
    --- a/pidgin/gtkwebview.c Wed Jun 14 23:13:00 2017 -0500
    +++ b/pidgin/gtkwebview.c Fri Jun 16 23:39:19 2017 +0000
    @@ -24,7 +24,6 @@
    #include "debug.h"
    #include "glibcompat.h"
    #include "image-store.h"
    -#include "marshallers.h"
    #include "pidgin.h"
    #include "pidginstock.h"
    @@ -1344,45 +1343,44 @@
    G_TYPE_FROM_CLASS(gobject_class),
    G_SIGNAL_RUN_FIRST,
    G_STRUCT_OFFSET(PidginWebViewClass, buttons_update),
    - NULL, 0, g_cclosure_marshal_VOID__INT,
    + NULL, 0, NULL,
    G_TYPE_NONE, 1, G_TYPE_INT);
    signals[TOGGLE_FORMAT] = g_signal_new("format-toggled",
    G_TYPE_FROM_CLASS(gobject_class),
    G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
    G_STRUCT_OFFSET(PidginWebViewClass, toggle_format),
    - NULL, 0, g_cclosure_marshal_VOID__INT,
    + NULL, 0, NULL,
    G_TYPE_NONE, 1, G_TYPE_INT);
    signals[CLEAR_FORMAT] = g_signal_new("format-cleared",
    G_TYPE_FROM_CLASS(gobject_class),
    G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
    G_STRUCT_OFFSET(PidginWebViewClass, clear_format),
    - NULL, 0, g_cclosure_marshal_VOID__VOID,
    + NULL, 0, NULL,
    G_TYPE_NONE, 0);
    signals[UPDATE_FORMAT] = g_signal_new("format-updated",
    G_TYPE_FROM_CLASS(gobject_class),
    G_SIGNAL_RUN_FIRST,
    G_STRUCT_OFFSET(PidginWebViewClass, update_format),
    - NULL, 0, g_cclosure_marshal_VOID__VOID,
    + NULL, 0, NULL,
    G_TYPE_NONE, 0);
    signals[CHANGED] = g_signal_new("changed",
    G_TYPE_FROM_CLASS(gobject_class),
    G_SIGNAL_RUN_FIRST,
    G_STRUCT_OFFSET(PidginWebViewClass, changed),
    - NULL, NULL, g_cclosure_marshal_VOID__VOID,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 0);
    signals[HTML_APPENDED] = g_signal_new("html-appended",
    G_TYPE_FROM_CLASS(gobject_class),
    G_SIGNAL_RUN_FIRST,
    G_STRUCT_OFFSET(PidginWebViewClass, html_appended),
    - NULL, NULL,
    - g_cclosure_marshal_VOID__OBJECT,
    + NULL, NULL, NULL,
    G_TYPE_NONE, 1, WEBKIT_TYPE_DOM_RANGE,
    NULL);
    signals[INSERT_IMAGE] = g_signal_new("insert-image",
    G_TYPE_FROM_CLASS(gobject_class), G_SIGNAL_RUN_LAST,
    G_STRUCT_OFFSET(PidginWebViewClass, insert_image),
    - pidgin_webview_insert_image_accu, NULL,
    - purple_smarshal_BOOLEAN__OBJECT, G_TYPE_BOOLEAN, 1,
    + pidgin_webview_insert_image_accu, NULL, NULL,
    + G_TYPE_BOOLEAN, 1,
    PURPLE_TYPE_IMAGE);
    /* Class Methods */