X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fdbus-protocol.c;h=2d1db32902eacdcfd6094b690a87dc67d0206b54;hb=3a1fef3f4a83e7f2d8bcff2f692ff07053001f6d;hp=e8d30ac9eeb42e6f2296930046bdefcb80fac4d6;hpb=652139e9eeb4e2c50b9d1b71de01721a81a239e6;p=catta

diff --git a/avahi-daemon/dbus-protocol.c b/avahi-daemon/dbus-protocol.c
index e8d30ac..2d1db32 100644
--- a/avahi-daemon/dbus-protocol.c
+++ b/avahi-daemon/dbus-protocol.c
@@ -21,10 +21,16 @@
 
 #include <glib.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
     
+#include "dbus-protocol.h"
+
 static DBusConnection *bus = NULL;
 
 static DBusHandlerResult
@@ -47,7 +53,7 @@ do_register (DBusConnection *conn, DBusMessage *message)
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
-    g_message ("Register received from: %s", s);
+    g_message ("Register received from: %s (dbus:% s)", s, dbus_message_get_sender (message));
 
     return DBUS_HANDLER_RESULT_HANDLED;
 }
@@ -66,7 +72,11 @@ signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
                dbus_message_get_member (message));
 
     if (dbus_message_is_signal (message,
+#ifdef DBUS_USE_NEW_API
+			    	DBUS_INTERFACE_LOCAL,
+#else
                                 DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
+#endif
                                 "Disconnected"))
     {
         /* No, we shouldn't quit, but until we get somewhere
@@ -80,8 +90,13 @@ signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
     {
         return do_register (conn, message);
     } else if (dbus_message_is_signal (message,
+#ifdef DBUS_USE_NEW_API
+			    	       DBUS_INTERFACE_DBUS,
+				       "NameAcquired"))
+#else
                                        DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
                                        "ServiceAcquired"))
+#endif
     {
         char *name;
 
@@ -108,7 +123,7 @@ signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
 }
 
 int
-dbus_protocol_setup ()
+dbus_protocol_setup (GMainLoop *loop)
 {
     DBusError error;
 
@@ -121,20 +136,24 @@ 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);
     dbus_connection_set_exit_on_disconnect (bus, FALSE);
 
+#ifdef DBUS_USE_NEW_API
+    dbus_bus_request_name (bus, DBUS_SERVICE_AVAHI, 0, &error);
+#else
     dbus_bus_acquire_service (bus, DBUS_SERVICE_AVAHI, 0, &error);
+#endif
 
     if (dbus_error_is_set (&error))
     {
         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);
@@ -147,8 +166,10 @@ dbus_protocol_setup ()
         g_warning ("dbus_bus_add_match (): %s", error.message);
         dbus_error_free (&error);
 
-        goto finish;
+    	return 1;
     }
+
+    return 0;
 }
 
 void