fix avahi_netlink_new to allow multiple netlinks per process

[catta] / avahi-gobject / ga-record-browser.c

diff --git a/avahi-gobject/ga-record-browser.c b/avahi-gobject/ga-record-browser.c
index f6747cdb183078da0ad8a75be42c557d6566c948..f3105061db0905a52b4addf6bc52fdf79159aa83 100644 (file)
--- a/avahi-gobject/ga-record-browser.c
+++ b/avahi-gobject/ga-record-browser.c
@@ -27,7 +27,7 @@
 
 #include "ga-record-browser.h"
 #include "signals-marshal.h"
-#include "ga-errors.h"
+#include "ga-error.h"
 #include "ga-enums-enumtypes.h"
 
 G_DEFINE_TYPE(GaRecordBrowser, ga_record_browser, G_TYPE_OBJECT)
@@ -162,7 +162,7 @@ static void ga_record_browser_class_init(GaRecordBrowserClass * ga_record_browse
                          G_SIGNAL_RUN_LAST,
                          0,
                          NULL, NULL,
-                         ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT,
+                         _ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT,
                          G_TYPE_NONE, 8,
                          G_TYPE_INT,
                          GA_TYPE_PROTOCOL,
@@ -178,7 +178,7 @@ static void ga_record_browser_class_init(GaRecordBrowserClass * ga_record_browse
                          G_SIGNAL_RUN_LAST,
                          0,
                          NULL, NULL,
-                         ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT,
+                         _ga_signals_marshal_VOID__INT_ENUM_STRING_UINT_UINT_POINTER_INT_INT,
                          G_TYPE_NONE, 8,
                          G_TYPE_INT,
                          GA_TYPE_PROTOCOL,
@@ -257,7 +257,7 @@ static void ga_record_browser_class_init(GaRecordBrowserClass * ga_record_browse
 
     param_spec = g_param_spec_enum("flags", "Lookup flags for the browser",
                                    "Browser lookup flags",
-                                   GA_TYPE_PROTOCOL,
+                                   GA_TYPE_LOOKUP_FLAGS,
                                    GA_LOOKUP_NO_FLAGS,
                                    G_PARAM_READWRITE |
                                    G_PARAM_STATIC_NAME |
@@ -344,7 +344,7 @@ static void _avahi_record_browser_cb(AVAHI_GCC_UNUSED AvahiRecordBrowser * r, Av
         case AVAHI_BROWSER_FAILURE:{
                 GError *error;
                 int aerrno = avahi_client_errno(priv->client->avahi_client);
-                error = g_error_new(GA_ERRORS, aerrno,
+                error = g_error_new(GA_ERROR, aerrno,
                                     "Browsing failed: %s",
                                     avahi_strerror(aerrno));
                 g_signal_emit(self, signals[FAILURE], 0, error);
@@ -371,7 +371,7 @@ gboolean ga_record_browser_attach(GaRecordBrowser * browser,
     if (priv->browser == NULL) {
         if (error != NULL) {
             int aerrno = avahi_client_errno(client->avahi_client);
-            *error = g_error_new(GA_ERRORS, aerrno,
+            *error = g_error_new(GA_ERROR, aerrno,
                                  "Attaching record browser failed: %s",
                                  avahi_strerror(aerrno));
         }