Ticket #49: avahi_dbus.patch

avahi-daemon/dbus-protocol.c

@@ -1107 +1107 @@
         dbus_error_free(&error);
 
     if (server->bus) {
-        dbus_connection_disconnect(server->bus);
+        dbus_connection_close(server->bus);
         dbus_connection_unref(server->bus);
         server->bus = NULL;
     }
@@ -1124 +1124 @@
     assert(server->n_clients == 0);
 
     if (server->bus) {
-        dbus_connection_disconnect(server->bus);
+        dbus_connection_close(server->bus);
         dbus_connection_unref(server->bus);
         server->bus = NULL;
     }
@@ -1159 +1159 @@
 
 fail:
     if (server->bus) {
-        dbus_connection_disconnect(server->bus);
+        dbus_connection_close(server->bus);
         dbus_connection_unref(server->bus);
     }
 

avahi-client/client.c

@@ -67 +67 @@
     switch (client->state) {
         case AVAHI_CLIENT_FAILURE:
             if (client->bus) {
-                dbus_connection_disconnect(client->bus);
+                dbus_connection_close(client->bus);
                 dbus_connection_unref(client->bus);
                 client->bus = NULL;
             }
@@ -598 +598 @@
     if (client->bus)
         /* Disconnect in advance, so that the free() functions won't
          * issue needless server calls */
-        dbus_connection_disconnect(client->bus);
+        dbus_connection_close(client->bus);
     
     while (client->groups)
         avahi_entry_group_free(client->groups);