diff options
| author | Jens Georg <jensg@openismus.com> | 2013-10-30 14:59:46 +0100 |
|---|---|---|
| committer | Jens Georg <jensg@openismus.com> | 2013-10-30 15:03:23 +0100 |
| commit | 95c2377cb2e6a657dc3a1ef6de1c230550e96bee (patch) | |
| tree | bbe4f23aeb1df8638340996345ad0efd74c86434 | |
| parent | 7d3df118715a41389268e45d6d0524760ebdeecd (diff) | |
| download | gssdp-95c2377cb2e6a657dc3a1ef6de1c230550e96bee.tar.gz | |
Fix message-received marshalling
| -rw-r--r-- | libgssdp/Makefile.am | 2 | ||||
| -rw-r--r-- | libgssdp/gssdp-client.c | 7 | ||||
| -rw-r--r-- | libgssdp/gssdp-marshal.list | 2 | ||||
| -rw-r--r-- | vala/Makefile.am | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/libgssdp/Makefile.am b/libgssdp/Makefile.am index c250f64..470878a 100644 --- a/libgssdp/Makefile.am +++ b/libgssdp/Makefile.am @@ -76,7 +76,7 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) if HAVE_INTROSPECTION GSSDP-1.0.gir: libgssdp-1.0.la -GSSDP_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 +GSSDP_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Soup-2.4 GSSDP_1_0_gir_CFLAGS = $(INCLUDES) GSSDP_1_0_gir_LIBS = libgssdp-1.0.la GSSDP_1_0_gir_FILES = $(introspection_sources) diff --git a/libgssdp/gssdp-client.c b/libgssdp/gssdp-client.c index 1244e99..c4d745b 100644 --- a/libgssdp/gssdp-client.c +++ b/libgssdp/gssdp-client.c @@ -607,6 +607,11 @@ gssdp_client_class_init (GSSDPClientClass *klass) /** * GSSDPClient::message-received: (skip) + * @client: The #GSSDPClient that received the message. + * @from_ip: The IP address of the source. + * @from_port: The UDP port used by the sender. + * @type: The #_GSSDPMessageType. + * @headers: (type SoupMessageHeaders): Parsed #SoupMessageHeaders from the message. * * Internal signal. * @@ -618,7 +623,7 @@ gssdp_client_class_init (GSSDPClientClass *klass) G_SIGNAL_RUN_LAST, 0, NULL, NULL, - gssdp_marshal_VOID__STRING_UINT_INT_POINTER, + gssdp_marshal_VOID__STRING_UINT_INT_BOXED, G_TYPE_NONE, 4, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE, diff --git a/libgssdp/gssdp-marshal.list b/libgssdp/gssdp-marshal.list index ee6f4a3..c63e2c6 100644 --- a/libgssdp/gssdp-marshal.list +++ b/libgssdp/gssdp-marshal.list @@ -1,3 +1,3 @@ -VOID:STRING,UINT,INT,POINTER +VOID:STRING,UINT,INT,BOXED VOID:STRING,POINTER VOID:STRING diff --git a/vala/Makefile.am b/vala/Makefile.am index 5cc9acf..133e59e 100644 --- a/vala/Makefile.am +++ b/vala/Makefile.am @@ -7,7 +7,7 @@ gssdp-1.0.stamp: $(top_builddir)/libgssdp/GSSDP-1.0.gir \ $(srcdir)/GSSDP-1.0.metadata \ $(srcdir)/gssdp-1.0-custom.vala $(AM_V_GEN)$(VAPIGEN) --metadatadir=$(srcdir) \ - --library=gssdp-1.0 --pkg=gio-2.0 \ + --library=gssdp-1.0 --pkg=gio-2.0 --pkg=libsoup-2.4 \ $(top_builddir)/libgssdp/GSSDP-1.0.gir \ $(srcdir)/gssdp-1.0-custom.vala && \ echo timestmap > $(@F) |