[gupnp-igd] Emit GError in signal as boxed type



commit 43d4082844d964baef4db736ca9ef5afd1d77445
Author: Olivier CrÃte <olivier crete collabora com>
Date:   Fri Jan 4 12:11:07 2013 -0500

    Emit GError in signal as boxed type

 libgupnp-igd/gupnp-simple-igd-marshal.list |    2 +-
 libgupnp-igd/gupnp-simple-igd.c            |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/libgupnp-igd/gupnp-simple-igd-marshal.list b/libgupnp-igd/gupnp-simple-igd-marshal.list
index c109aa6..91c57ad 100644
--- a/libgupnp-igd/gupnp-simple-igd-marshal.list
+++ b/libgupnp-igd/gupnp-simple-igd-marshal.list
@@ -1,2 +1,2 @@
 VOID:STRING,STRING,STRING,UINT,STRING,UINT,STRING
-VOID:POINTER,STRING,UINT,STRING,UINT,STRING
+VOID:BOXED,STRING,UINT,STRING,UINT,STRING
diff --git a/libgupnp-igd/gupnp-simple-igd.c b/libgupnp-igd/gupnp-simple-igd.c
index ff4ece3..050390b 100644
--- a/libgupnp-igd/gupnp-simple-igd.c
+++ b/libgupnp-igd/gupnp-simple-igd.c
@@ -221,8 +221,8 @@ gupnp_simple_igd_class_init (GUPnPSimpleIgdClass *klass)
       0,
       NULL,
       NULL,
-      _gupnp_simple_igd_marshal_VOID__POINTER_STRING_UINT_STRING_UINT_STRING,
-      G_TYPE_NONE, 6, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_UINT,
+      _gupnp_simple_igd_marshal_VOID__BOXED_STRING_UINT_STRING_UINT_STRING,
+      G_TYPE_NONE, 6, G_TYPE_ERROR, G_TYPE_STRING, G_TYPE_UINT,
       G_TYPE_STRING, G_TYPE_UINT, G_TYPE_STRING);
 }
 
@@ -602,7 +602,7 @@ _service_proxy_got_external_ip_address (GUPnPServiceProxy *proxy,
                          "Invalid IP address returned by router"};
 
         g_signal_emit (self, signals[SIGNAL_ERROR_MAPPING_PORT],
-            GUPNP_SIMPLE_IGD_ERROR, &gerror, pm->mapping->protocol,
+            GUPNP_SIMPLE_IGD_ERROR, gerror, pm->mapping->protocol,
             pm->mapping->requested_external_port, pm->mapping->local_ip,
             pm->mapping->local_port, pm->mapping->description);
       }



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