***/
#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>
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;
}
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
{
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;
}
int
-dbus_protocol_setup ()
+dbus_protocol_setup (GMainLoop *loop)
{
DBusError error;
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);
g_warning ("dbus_bus_add_match (): %s", error.message);
dbus_error_free (&error);
- goto finish;
+ return 1;
}
+
+ return 0;
}
void