[gupnp: 17/18] Remove custom marshallers
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gupnp: 17/18] Remove custom marshallers
- Date: Sat, 15 Oct 2016 19:41:54 +0000 (UTC)
commit e659ec3d8f4b6c0df4b239cb0ce803de926b442f
Author: Jens Georg <mail jensge org>
Date: Sat Oct 15 21:14:07 2016 +0200
Remove custom marshallers
Signed-off-by: Jens Georg <mail jensge org>
configure.ac | 4 ----
libgupnp/Makefile.am | 9 ---------
libgupnp/gupnp-connman-manager.c | 1 -
libgupnp/gupnp-context-manager.c | 7 ++-----
libgupnp/gupnp-context.c | 1 -
libgupnp/gupnp-control-point.c | 8 ++++----
libgupnp/gupnp-network-manager.c | 1 -
libgupnp/gupnp-service.c | 7 +++----
8 files changed, 9 insertions(+), 29 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 178f19b..53bec2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,10 +126,6 @@ AS_IF([test "x$with_context_manager" = "xlinux"],
AM_CONDITIONAL(USE_NETLINK, test "x$USE_NETLINK" = "xyes")
AC_SUBST(USE_NETLINK)
-# glib-genmarshal
-GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
-AC_SUBST(GLIB_GENMARSHAL)
-
GOBJECT_INTROSPECTION_CHECK([0.6.4])
# vapigen
diff --git a/libgupnp/Makefile.am b/libgupnp/Makefile.am
index d95f271..b8f7bff 100644
--- a/libgupnp/Makefile.am
+++ b/libgupnp/Makefile.am
@@ -89,15 +89,6 @@ introspection_sources = $(libgupnpinc_HEADERS) \
gupnp-white-list.c \
gupnp-types.c
-
-gupnp-marshal.c: gupnp-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=gupnp_marshal $(srcdir)/gupnp-marshal.list --header --body >
gupnp-marshal.c
-
-gupnp-marshal.h: gupnp-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=gupnp_marshal $(srcdir)/gupnp-marshal.list --header >
gupnp-marshal.h
-
-BUILT_SOURCES = gupnp-marshal.c gupnp-marshal.h
-
libgupnp_1_2_la_LDFLAGS = -version-info $(LTVERSION) $(WIN32_LDFLAGS) $(WARN_LDFLAGS)
libgupnp_1_2_la_SOURCES = $(introspection_sources) \
diff --git a/libgupnp/gupnp-connman-manager.c b/libgupnp/gupnp-connman-manager.c
index fc682ba..6a48beb 100644
--- a/libgupnp/gupnp-connman-manager.c
+++ b/libgupnp/gupnp-connman-manager.c
@@ -31,7 +31,6 @@
#include "gupnp-connman-manager.h"
#include "gupnp-context.h"
-#include "gupnp-marshal.h"
#define SERVICE_CREATION_TIMEOUT 1000
diff --git a/libgupnp/gupnp-context-manager.c b/libgupnp/gupnp-context-manager.c
index 2ac4388..00f97a4 100644
--- a/libgupnp/gupnp-context-manager.c
+++ b/libgupnp/gupnp-context-manager.c
@@ -44,7 +44,6 @@
#include <glib/gstdio.h>
#include "gupnp.h"
-#include "gupnp-marshal.h"
#ifdef HAVE_IFADDRS_H
#include "gupnp-unix-context-manager.h"
@@ -436,8 +435,7 @@ gupnp_context_manager_class_init (GUPnPContextManagerClass *klass)
GUPNP_TYPE_CONTEXT_MANAGER,
G_SIGNAL_RUN_FIRST,
G_CALLBACK (on_context_available),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GUPNP_TYPE_CONTEXT);
@@ -456,8 +454,7 @@ gupnp_context_manager_class_init (GUPnPContextManagerClass *klass)
GUPNP_TYPE_CONTEXT_MANAGER,
G_SIGNAL_RUN_FIRST,
G_CALLBACK (on_context_unavailable),
- NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL, NULL, NULL,
G_TYPE_NONE,
1,
GUPNP_TYPE_CONTEXT);
diff --git a/libgupnp/gupnp-context.c b/libgupnp/gupnp-context.c
index 2cf764d..6296684 100644
--- a/libgupnp/gupnp-context.c
+++ b/libgupnp/gupnp-context.c
@@ -56,7 +56,6 @@
#include "gupnp-context.h"
#include "gupnp-context-private.h"
#include "gupnp-error.h"
-#include "gupnp-marshal.h"
#include "gena-protocol.h"
#include "http-headers.h"
#include "gupnp-device.h"
diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c
index 81db087..ea40ad6 100644
--- a/libgupnp/gupnp-control-point.c
+++ b/libgupnp/gupnp-control-point.c
@@ -1036,7 +1036,7 @@ gupnp_control_point_class_init (GUPnPControlPointClass *klass)
device_proxy_available),
NULL,
NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
GUPNP_TYPE_DEVICE_PROXY);
@@ -1057,7 +1057,7 @@ gupnp_control_point_class_init (GUPnPControlPointClass *klass)
device_proxy_unavailable),
NULL,
NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
GUPNP_TYPE_DEVICE_PROXY);
@@ -1078,7 +1078,7 @@ gupnp_control_point_class_init (GUPnPControlPointClass *klass)
service_proxy_available),
NULL,
NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
GUPNP_TYPE_SERVICE_PROXY);
@@ -1099,7 +1099,7 @@ gupnp_control_point_class_init (GUPnPControlPointClass *klass)
service_proxy_unavailable),
NULL,
NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
GUPNP_TYPE_SERVICE_PROXY);
diff --git a/libgupnp/gupnp-network-manager.c b/libgupnp/gupnp-network-manager.c
index 6e01e96..b63d030 100644
--- a/libgupnp/gupnp-network-manager.c
+++ b/libgupnp/gupnp-network-manager.c
@@ -36,7 +36,6 @@
#include "gupnp-network-manager.h"
#include "gupnp-context.h"
-#include "gupnp-marshal.h"
#define DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH \
(dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH))
diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c
index 825a66b..7ac81b0 100644
--- a/libgupnp/gupnp-service.c
+++ b/libgupnp/gupnp-service.c
@@ -35,7 +35,6 @@
#include "gupnp-service.h"
#include "gupnp-root-device.h"
#include "gupnp-context-private.h"
-#include "gupnp-marshal.h"
#include "gupnp-error.h"
#include "gupnp-acl.h"
#include "gupnp-uuid.h"
@@ -1722,7 +1721,7 @@ gupnp_service_class_init (GUPnPServiceClass *klass)
action_invoked),
NULL,
NULL,
- g_cclosure_marshal_VOID__BOXED,
+ NULL,
G_TYPE_NONE,
1,
GUPNP_TYPE_SERVICE_ACTION);
@@ -1744,7 +1743,7 @@ gupnp_service_class_init (GUPnPServiceClass *klass)
query_variable),
NULL,
NULL,
- gupnp_marshal_VOID__STRING_POINTER,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_STRING,
@@ -1767,7 +1766,7 @@ gupnp_service_class_init (GUPnPServiceClass *klass)
notify_failed),
NULL,
NULL,
- gupnp_marshal_VOID__POINTER_POINTER,
+ NULL,
G_TYPE_NONE,
2,
G_TYPE_POINTER,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
