[libdmapsharing] Fix signal definitions and other things breaking Vala bindings build



commit fb1d9bae3bcb74489fa32fe14ba77829c8ff5043
Author: W. Michael Petullo <mike flyn org>
Date:   Wed Mar 21 00:00:35 2018 -0400

    Fix signal definitions and other things breaking Vala bindings build
    
    Signed-off-by: W. Michael Petullo <mike flyn org>

 libdmapsharing/dmap-mdns-browser-dnssd.c |    2 +-
 libdmapsharing/dmap-mdns-browser-howl.c  |    2 +-
 libdmapsharing/dmap-mdns-browser.h       |    8 ++++----
 tests/dacplisten.c                       |    4 ++--
 tests/vala-dmap-container-db.c           |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/libdmapsharing/dmap-mdns-browser-dnssd.c b/libdmapsharing/dmap-mdns-browser-dnssd.c
index ca2ade2..bef8185 100644
--- a/libdmapsharing/dmap-mdns-browser-dnssd.c
+++ b/libdmapsharing/dmap-mdns-browser-dnssd.c
@@ -500,7 +500,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_added), NULL, NULL,
                              g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE,
-                             1, G_TYPE_POINTER);
+                             1, DMAP_TYPE_MDNS_SERVICE);
 
        dmap_mdns_browser_signals[SERVICE_REMOVED] =
                g_signal_new ("service-removed",
diff --git a/libdmapsharing/dmap-mdns-browser-howl.c b/libdmapsharing/dmap-mdns-browser-howl.c
index 3b36685..6cc59d5 100644
--- a/libdmapsharing/dmap-mdns-browser-howl.c
+++ b/libdmapsharing/dmap-mdns-browser-howl.c
@@ -443,7 +443,7 @@ dmap_mdns_browser_class_init (DmapMdnsBrowserClass * klass)
                              G_STRUCT_OFFSET (DmapMdnsBrowserClass,
                                               service_added), NULL, NULL,
                              g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE,
-                             1, G_TYPE_POINTER);
+                             1, DMAP_TYPE_MDNS_SERVICE);
        signals[SERVICE_REMOVED] =
                g_signal_new ("service-removed",
                              G_TYPE_FROM_CLASS (object_class),
diff --git a/libdmapsharing/dmap-mdns-browser.h b/libdmapsharing/dmap-mdns-browser.h
index 275da02..ee4b415 100644
--- a/libdmapsharing/dmap-mdns-browser.h
+++ b/libdmapsharing/dmap-mdns-browser.h
@@ -94,10 +94,10 @@ typedef struct
 {
        GObjectClass parent_class;
 
-       void (*service_added) (DmapMdnsBrowser * browser,
-                              DmapMdnsService * service);
-       void (*service_removed) (DmapMdnsBrowser * browser,
-                                DmapMdnsService * service);
+       void (*service_added) (DmapMdnsBrowser *browser,
+                              DmapMdnsService *service);
+       void (*service_removed) (DmapMdnsBrowser *browser,
+                                DmapMdnsService *service);
 } DmapMdnsBrowserClass;
 
 #define DMAP_MDNS_BROWSER_ERROR dmap_mdns_browser_error_quark ()
diff --git a/tests/dacplisten.c b/tests/dacplisten.c
index d6cb2c3..72dbfe6 100644
--- a/tests/dacplisten.c
+++ b/tests/dacplisten.c
@@ -112,7 +112,7 @@ struct _DacpListenerPrivate {
 
 
 static gpointer vala_dacp_player_parent_class = NULL;
-static DmapControlPlayerIface * vala_dacp_player_dmap_control_player_parent_iface = NULL;
+static DmapControlPlayerInterface * vala_dacp_player_dmap_control_player_parent_iface = NULL;
 static gpointer dacp_listener_parent_class = NULL;
 
 GType vala_dacp_player_get_type (void) G_GNUC_CONST;
@@ -239,7 +239,7 @@ static void vala_dacp_player_class_init (ValaDacpPlayerClass * klass) {
 }
 
 
-static void vala_dacp_player_dmap_control_player_interface_init (DmapControlPlayerIface * iface) {
+static void vala_dacp_player_dmap_control_player_interface_init (DmapControlPlayerInterface * iface) {
        vala_dacp_player_dmap_control_player_parent_iface = g_type_interface_peek_parent (iface);
        iface->now_playing_record = (DmapAvRecord* (*) (DmapControlPlayer *)) 
vala_dacp_player_real_now_playing_record;
        iface->now_playing_artwork = (const gchar* (*) (DmapControlPlayer *, guint, guint)) 
vala_dacp_player_real_now_playing_artwork;
diff --git a/tests/vala-dmap-container-db.c b/tests/vala-dmap-container-db.c
index 4350ce5..fe2dd3f 100644
--- a/tests/vala-dmap-container-db.c
+++ b/tests/vala-dmap-container-db.c
@@ -61,7 +61,7 @@ struct _ValaDmapContainerDbPrivate {
 
 
 static gpointer vala_dmap_container_db_parent_class = NULL;
-static DmapContainerDbIface * vala_dmap_container_db_dmap_container_db_parent_iface = NULL;
+static DmapContainerDbInterface * vala_dmap_container_db_dmap_container_db_parent_iface = NULL;
 
 GType vala_dmap_container_db_get_type (void) G_GNUC_CONST;
 #define VALA_DMAP_CONTAINER_DB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), 
TYPE_VALA_DMAP_CONTAINER_DB, ValaDmapContainerDbPrivate))
@@ -171,7 +171,7 @@ static void vala_dmap_container_db_class_init (ValaDmapContainerDbClass * klass)
 }
 
 
-static void vala_dmap_container_db_dmap_container_db_interface_init (DmapContainerDbIface * iface) {
+static void vala_dmap_container_db_dmap_container_db_interface_init (DmapContainerDbInterface * iface) {
        vala_dmap_container_db_dmap_container_db_parent_iface = g_type_interface_peek_parent (iface);
        iface->count = (gint64 (*) (DmapContainerDb *)) vala_dmap_container_db_real_count;
        iface->foreach = (void (*) (DmapContainerDb *, DmapIdContainerRecordFunc, void*)) 
vala_dmap_container_db_real_foreach;


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