avahi-dbus.patch

   1 diff -ur avahi-0.6.15/avahi-daemon/dbus-protocol.c avahi-0.6.15-dbus/avahi-daemon/dbus-protocol.c
   2 --- avahi-0.6.15/avahi-daemon/dbus-protocol.c   2006-11-06 02:03:21.000000000 +0100
   3 +++ avahi-0.6.15-dbus/avahi-daemon/dbus-protocol.c      2006-11-16 17:25:41.000000000 +0100
   4 @@ -1067,10 +1067,10 @@
   5      if (dbus_bus_request_name(
   6              server->bus,
   7              AVAHI_DBUS_NAME,
   8 -#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
   9 -            DBUS_NAME_FLAG_DO_NOT_QUEUE,
  10 -#else
  11 +#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR < 60)
  12              DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,
  13 +#else
  14 +            DBUS_NAME_FLAG_DO_NOT_QUEUE,
  15  #endif
  16              &error) != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
  17          if (dbus_error_is_set(&error)) {
  18 @@ -1106,11 +1106,6 @@
  19          dbus_error_free(&error);
  20
  21      if (server->bus) {
  22 -#ifdef HAVE_DBUS_CONNECTION_CLOSE
  23 -        dbus_connection_close(server->bus);
  24 -#else
  25 -        dbus_connection_disconnect(server->bus);
  26 -#endif
  27          dbus_connection_unref(server->bus);
  28          server->bus = NULL;
  29      }
  30 @@ -1127,11 +1122,6 @@
  31      assert(server->n_clients == 0);
  32
  33      if (server->bus) {
  34 -#ifdef HAVE_DBUS_CONNECTION_CLOSE
  35 -        dbus_connection_close(server->bus);
  36 -#else
  37 -        dbus_connection_disconnect(server->bus);
  38 -#endif
  39          dbus_connection_unref(server->bus);
  40          server->bus = NULL;
  41      }
  42 @@ -1166,11 +1156,6 @@
  43
  44  fail:
  45      if (server->bus) {
  46 -#ifdef HAVE_DBUS_CONNECTION_CLOSE
  47 -        dbus_connection_close(server->bus);
  48 -#else
  49 -        dbus_connection_disconnect(server->bus);
  50 -#endif
  51          dbus_connection_unref(server->bus);
  52      }
  53