--- a/.hgignore Thu Jun 01 19:59:58 2017 -0500
+++ b/.hgignore Sun Jun 04 22:05:28 2017 -0500
@@ -77,7 +77,6 @@
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
--- a/libpurple/protocols/facebook/Makefile.am Thu Jun 01 19:59:58 2017 -0500
+++ b/libpurple/protocols/facebook/Makefile.am Sun Jun 04 22:05:28 2017 -0500
@@ -1,12 +1,9 @@
pkgdir = @PURPLE_PLUGINDIR@
@@ -25,17 +22,6 @@
-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 > $@
libfacebook_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
--- a/libpurple/protocols/facebook/Makefile.mingw Thu Jun 01 19:59:58 2017 -0500
+++ b/libpurple/protocols/facebook/Makefile.mingw Sun Jun 04 22:05:28 2017 -0500
@@ -42,7 +42,6 @@
@@ -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 > $@
- rm -f $(OBJECTS) marshal.c marshal.h
include $(PIDGIN_COMMON_TARGETS)
--- a/libpurple/protocols/facebook/api.c Thu Jun 01 19:59:58 2017 -0500
+++ b/libpurple/protocols/facebook/api.c Sun Jun 04 22:05:28 2017 -0500
@@ -28,7 +28,6 @@
@@ -287,8 +286,7 @@
G_TYPE_FROM_CLASS(klass),
@@ -303,8 +301,7 @@
G_TYPE_FROM_CLASS(klass),
@@ -320,8 +317,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER,
@@ -341,8 +337,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER_BOOLEAN,
2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
@@ -358,8 +353,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__OBJECT,
@@ -374,8 +368,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER,
@@ -390,8 +383,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER,
@@ -406,8 +398,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER,
@@ -423,8 +414,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER,
@@ -441,8 +431,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__INT64,
@@ -458,8 +447,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER,
@@ -474,8 +462,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__POINTER,
--- a/libpurple/protocols/facebook/marshaller.list Thu Jun 01 19:59:58 2017 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
--- a/libpurple/protocols/facebook/mqtt.c Thu Jun 01 19:59:58 2017 -0500
+++ b/libpurple/protocols/facebook/mqtt.c Sun Jun 04 22:05:28 2017 -0500
@@ -31,7 +31,6 @@
#include "queuedoutputstream.h"
@@ -97,8 +96,7 @@
G_TYPE_FROM_CLASS(klass),
@@ -114,8 +112,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__OBJECT,
@@ -131,8 +128,7 @@
G_TYPE_FROM_CLASS(klass),
@@ -148,8 +144,7 @@
G_TYPE_FROM_CLASS(klass),
- fb_marshal_VOID__STRING_BOXED,
2, G_TYPE_STRING, G_TYPE_BYTE_ARRAY);