[gssdp] Drop custom marshaller



commit 8f26e01329b932502ca00a14f8a95d8d922a43dd
Author: Jens Georg <mail jensge org>
Date:   Mon Oct 10 23:16:58 2016 +0200

    Drop custom marshaller
    
    Signed-off-by: Jens Georg <mail jensge org>

 libgssdp/Makefile.am              |   13 +------------
 libgssdp/gssdp-client.c           |    4 +---
 libgssdp/gssdp-marshal.list       |    3 ---
 libgssdp/gssdp-resource-browser.c |    7 ++-----
 4 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/libgssdp/Makefile.am b/libgssdp/Makefile.am
index b1e4a91..0012ef8 100644
--- a/libgssdp/Makefile.am
+++ b/libgssdp/Makefile.am
@@ -23,18 +23,9 @@ libgssdpinc_HEADERS =        gssdp-client.h           \
                        gssdp.h \
                        gssdp-enums.h
 
-gssdp-marshal.c: gssdp-marshal.list
-       $(AM_V_GEN) \
-       $(GLIB_GENMARSHAL) --prefix=gssdp_marshal $(srcdir)/gssdp-marshal.list --header --body > 
gssdp-marshal.c
-
-gssdp-marshal.h: gssdp-marshal.list
-       $(AM_V_GEN) \
-       $(GLIB_GENMARSHAL) --prefix=gssdp_marshal $(srcdir)/gssdp-marshal.list --header > gssdp-marshal.h
-
 enumheaders = $(srcdir)/gssdp-error.h
 
-BUILT_SOURCES = gssdp-marshal.c \
-       gssdp-marshal.h \
+BUILT_SOURCES = \
        gssdp-enums.c \
        gssdp-enums.h
 
@@ -103,8 +94,6 @@ if TARGET_ANDROID
 libgssdp_1_2_la_LIBADD += -llog
 endif
 
-EXTRA_DIST = gssdp-marshal.list
-
 CLEANFILES = $(BUILT_SOURCES)
 
 -include $(INTROSPECTION_MAKEFILE)
diff --git a/libgssdp/gssdp-client.c b/libgssdp/gssdp-client.c
index 3da6dd0..f2f40ae 100644
--- a/libgssdp/gssdp-client.c
+++ b/libgssdp/gssdp-client.c
@@ -79,7 +79,6 @@ typedef unsigned long in_addr_t;
 #include "gssdp-client-private.h"
 #include "gssdp-error.h"
 #include "gssdp-socket-source.h"
-#include "gssdp-marshal.h"
 #include "gssdp-protocol.h"
 #include "gssdp-socket-functions.h"
 #ifdef HAVE_PKTINFO
@@ -666,8 +665,7 @@ gssdp_client_class_init (GSSDPClientClass *klass)
                               GSSDP_TYPE_CLIENT,
                               G_SIGNAL_RUN_LAST,
                               0,
-                              NULL, NULL,
-                              gssdp_marshal_VOID__STRING_UINT_INT_BOXED,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               4,
                               G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
diff --git a/libgssdp/gssdp-resource-browser.c b/libgssdp/gssdp-resource-browser.c
index c02a4a7..8c59bab 100644
--- a/libgssdp/gssdp-resource-browser.c
+++ b/libgssdp/gssdp-resource-browser.c
@@ -39,7 +39,6 @@
 #include "gssdp-resource-browser.h"
 #include "gssdp-client-private.h"
 #include "gssdp-protocol.h"
-#include "gssdp-marshal.h"
 
 #define RESCAN_TIMEOUT 5 /* 5 seconds */
 #define MAX_DISCOVERY_MESSAGES 3
@@ -357,8 +356,7 @@ gssdp_resource_browser_class_init (GSSDPResourceBrowserClass *klass)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GSSDPResourceBrowserClass,
                                                resource_available),
-                              NULL, NULL,
-                              gssdp_marshal_VOID__STRING_POINTER,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               2,
                               G_TYPE_STRING,
@@ -379,8 +377,7 @@ gssdp_resource_browser_class_init (GSSDPResourceBrowserClass *klass)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (GSSDPResourceBrowserClass,
                                                resource_unavailable),
-                              NULL, NULL,
-                              gssdp_marshal_VOID__STRING,
+                              NULL, NULL, NULL,
                               G_TYPE_NONE,
                               1,
                               G_TYPE_STRING);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]