fix avahi_netlink_new to allow multiple netlinks per process

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

diff --git a/avahi-gobject/ga-service-browser.c b/avahi-gobject/ga-service-browser.c
index 2f4295c02424cefc9ead1a1d7923e62cf5d61859..3c3b80e231c4dc5d4e8b45d4455b396826c291e9 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
@@ -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 |
@@ -330,14 +330,14 @@ static void _avahi_service_browser_cb(AvahiServiceBrowser * b, AvahiIfIndex inte
     }
 }
 
-GaServiceBrowser *ga_service_browser_new(gchar * type) {
+GaServiceBrowser *ga_service_browser_new(const gchar * type) {
     return ga_service_browser_new_full(AVAHI_IF_UNSPEC,
                                        AVAHI_PROTO_UNSPEC, type, NULL, 0);
 }
 
 GaServiceBrowser *ga_service_browser_new_full(AvahiIfIndex interface,
                                               AvahiProtocol protocol,
-                                              gchar * type, gchar * domain,
+                                              const gchar * type, gchar * domain,
                                               GaLookupFlags flags) {
     return g_object_new(GA_TYPE_SERVICE_BROWSER,
                         "interface", interface,