* more dbus build fixes

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@121 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index aede620a235e811d70a50e8dba6edd19c92fa39d..501706136d98338bd0bd8495de995ae3ef072840 100644 (file)
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -109,7 +109,7 @@ signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
 }
 
 int
-dbus_protocol_setup ()
+dbus_protocol_setup (GMainLoop *loop)
 {
     DBusError error;
 
@@ -122,7 +122,7 @@ dbus_protocol_setup ()
         g_warning ("dbus_bus_get(): %s", error.message);
         dbus_error_free (&error);
 
-        goto finish;
+       return 1;
     }
 
     dbus_connection_setup_with_g_main (bus, NULL);
@@ -135,7 +135,7 @@ dbus_protocol_setup ()
         g_warning ("dbus_error_is_set (): %s", error.message);
         dbus_error_free (&error);
 
-        goto finish;
+       return 1;
     }
 
     dbus_connection_add_filter (bus, signal_filter, loop, NULL);
@@ -148,8 +148,10 @@ dbus_protocol_setup ()
         g_warning ("dbus_bus_add_match (): %s", error.message);
         dbus_error_free (&error);
 
-        goto finish;
+       return 1;
     }
+
+    return 0;
 }
 
 void

diff --git a/avahi-daemon/dbus-protocol.h b/avahi-daemon/dbus-protocol.h
index 8ed583f7ddab6108922a06473b690b8827f2e509..b2eca718352bbdadbd25f8ac06313c9614f9121b 100644 (file)
--- a/avahi-daemon/dbus-protocol.h
+++ b/avahi-daemon/dbus-protocol.h
@@ -24,7 +24,9 @@
 
 #define DBUS_SERVICE_AVAHI "org.freedesktop.Avahi"
 
-int dbus_protocol_setup ();
-int dbus_protocol_shutdown ();
+#include <glib.h>
+
+int dbus_protocol_setup (GMainLoop *loop);
+void dbus_protocol_shutdown ();
 
 #endif

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 3ac3a63988bf17cf6a648b0e96b6b3e14924d7ee..4a8d44dd1d1cdd11f0c2b641a57596fd555e3eea 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -62,7 +62,7 @@ int main(int argc, char *argv[]) {
         goto finish;
 
 #ifdef ENABLE_DBUS
-    if (dbus_protocol_setup () < 0)
+    if (dbus_protocol_setup (loop) < 0)
         goto finish;
 #endif