Fix message-received marshalling

diff --git a/libgssdp/Makefile.am b/libgssdp/Makefile.am
index c250f64..470878a 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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)