[Pkg-telepathy-commits] [libnice] 201/265: agent: Use generic marshaller

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository libnice.

commit d82ca9cee6c7cc7fcbc96c2603b891035cf9d62b
Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Mon Mar 31 19:28:24 2014 -0400

    agent: Use generic marshaller
---
 .gitignore                       |  2 --
 agent/Makefile.am                | 15 ---------------
 agent/agent-signals-marshal.list | 12 ------------
 agent/agent.c                    | 15 +++++++--------
 4 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3939076..67ec2d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,8 +65,6 @@ agent/test-fallback
 agent/test-fullmode
 agent/test-restart
 agent/test-thread
-agent/agent-signals-marshal.h
-agent/agent-signals-marshal.c
 
 
 # stun/ stuff
diff --git a/agent/Makefile.am b/agent/Makefile.am
index 0506551..515ef06 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -22,23 +22,8 @@ if WINDOWS
   AM_CFLAGS += -DWINVER=0x0501 # _WIN32_WINNT_WINXP
 endif
 
-dist_noinst_DATA = agent-signals-marshal.list
 noinst_LTLIBRARIES = libagent.la
 
-agent-signals-marshal.h: agent-signals-marshal.list
-	glib-genmarshal --header --prefix=agent_marshal $? > $@
-
-agent-signals-marshal.c: agent-signals-marshal.list
-	echo '#include "agent-signals-marshal.h"' > $@
-	glib-genmarshal --body --prefix=agent_marshal $? | \
-	sed -e 's/^}$$/(void)return_value;(void)invocation_hint;}/' >> $@
-
-BUILT_SOURCES = \
-	agent-signals-marshal.h \
-	agent-signals-marshal.c
-
-CLEANFILES += $(BUILT_SOURCES)
-
 libagent_la_SOURCES = \
 	address.h \
 	address.c \
diff --git a/agent/agent-signals-marshal.list b/agent/agent-signals-marshal.list
deleted file mode 100644
index 56a4568..0000000
--- a/agent/agent-signals-marshal.list
+++ /dev/null
@@ -1,12 +0,0 @@
-# component-status-changed
-VOID:UINT,UINT,UINT
-# new-selected-pair
-VOID:UINT,UINT,STRING,STRING
-# new-candidate
-VOID:UINT,UINT,STRING
-# candidate-gathering-done
-# initial-binding-request-received
-VOID:UINT
-# reliable-transport-writable
-VOID:UINT,UINT
-
diff --git a/agent/agent.c b/agent/agent.c
index 95d3c5f..d994479 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -67,7 +67,6 @@
 #include "discovery.h"
 #include "agent.h"
 #include "agent-priv.h"
-#include "agent-signals-marshal.h"
 #include "iostream.h"
 
 #include "stream.h"
@@ -607,7 +606,7 @@ nice_agent_class_init (NiceAgentClass *klass)
           0,
           NULL,
           NULL,
-          agent_marshal_VOID__UINT_UINT_UINT,
+          NULL,
           G_TYPE_NONE,
           3,
           G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT,
@@ -629,7 +628,7 @@ nice_agent_class_init (NiceAgentClass *klass)
           0,
           NULL,
           NULL,
-          agent_marshal_VOID__UINT,
+          NULL,
           G_TYPE_NONE,
           1,
           G_TYPE_UINT, G_TYPE_INVALID);
@@ -653,7 +652,7 @@ nice_agent_class_init (NiceAgentClass *klass)
           0,
           NULL,
           NULL,
-          agent_marshal_VOID__UINT_UINT_STRING_STRING,
+          NULL,
           G_TYPE_NONE,
           4,
           G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING, G_TYPE_STRING,
@@ -677,7 +676,7 @@ nice_agent_class_init (NiceAgentClass *klass)
           0,
           NULL,
           NULL,
-          agent_marshal_VOID__UINT_UINT_STRING,
+          NULL,
           G_TYPE_NONE,
           3,
           G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
@@ -701,7 +700,7 @@ nice_agent_class_init (NiceAgentClass *klass)
           0,
           NULL,
           NULL,
-          agent_marshal_VOID__UINT_UINT_STRING,
+          NULL,
           G_TYPE_NONE,
           3,
           G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
@@ -723,7 +722,7 @@ nice_agent_class_init (NiceAgentClass *klass)
           0,
           NULL,
           NULL,
-          agent_marshal_VOID__UINT,
+          NULL,
           G_TYPE_NONE,
           1,
           G_TYPE_UINT,
@@ -751,7 +750,7 @@ nice_agent_class_init (NiceAgentClass *klass)
           0,
           NULL,
           NULL,
-          agent_marshal_VOID__UINT_UINT,
+          NULL,
           G_TYPE_NONE,
           2,
           G_TYPE_UINT, G_TYPE_UINT,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/libnice.git