systemd: pull in avahi from dbus activation indirectly to make it possible to deactiv...

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

diff --git a/avahi-gobject/ga-service-browser.c b/avahi-gobject/ga-service-browser.c
index f694ca5fd6468a810357a762bef93892ccb46255..abd03cd2b6829c3474161bf555edf43d3d64aba6 100644 (file)
--- a/avahi-gobject/ga-service-browser.c
+++ b/avahi-gobject/ga-service-browser.c
@@ -1,6 +1,6 @@
 /*
  * ga-service-browser.c - Source for GaServiceBrowser
- * Copyright (C) 2005 Collabora Ltd.
+ * Copyright (C) 2006-2007 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,7 +30,7 @@
 
 #include "ga-service-browser.h"
 #include "signals-marshal.h"
-#include "ga-errors.h"
+#include "ga-error.h"
 #include "ga-enums-enumtypes.h"
 
 G_DEFINE_TYPE(GaServiceBrowser, ga_service_browser, G_TYPE_OBJECT)
@@ -164,7 +164,7 @@ static void ga_service_browser_class_init(GaServiceBrowserClass *
                          G_SIGNAL_RUN_LAST,
                          0,
                          NULL, NULL,
-                         ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT,
+                         _ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT,
                          G_TYPE_NONE, 6,
                          G_TYPE_INT,
                          GA_TYPE_PROTOCOL,
@@ -178,7 +178,7 @@ static void ga_service_browser_class_init(GaServiceBrowserClass *
                          G_SIGNAL_RUN_LAST,
                          0,
                          NULL, NULL,
-                         ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT,
+                         _ga_signals_marshal_VOID__INT_ENUM_STRING_STRING_STRING_UINT,
                          G_TYPE_NONE, 6,
                          G_TYPE_INT,
                          GA_TYPE_PROTOCOL,
@@ -247,7 +247,7 @@ static void ga_service_browser_class_init(GaServiceBrowserClass *
 
     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 |
@@ -320,7 +320,7 @@ static void _avahi_service_browser_cb(AvahiServiceBrowser * b, AvahiIfIndex inte
         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);
@@ -362,7 +362,7 @@ gboolean ga_service_browser_attach(GaServiceBrowser * 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 group failed: %s",
                                  avahi_strerror(aerrno));
         }