zeroconf/Avahi: move dbus_shutdown() call to the end of Main()

Calling dbus_shutdown() too early will break the "udisks2" neighbor
plugin.

src/Main.cxx

@@ -101,6 +101,10 @@
 #include <systemd/sd-daemon.h>
 #endif
 
+#ifdef ENABLE_DBUS
+#include <dbus/dbus.h>
+#endif
+
 #include <stdlib.h>
 
 #ifdef HAVE_LOCALE_H
@@ -713,6 +717,12 @@ try {
 	IcuFinish();
 
 	log_deinit();
+
+#ifdef ENABLE_DBUS
+	/* free libdbus memory to make memory leak checkers happy */
+	dbus_shutdown();
+#endif
+
 	return EXIT_SUCCESS;
 } catch (const std::exception &e) {
 	LogError(e);

src/zeroconf/ZeroconfAvahi.cxx

@@ -34,8 +34,6 @@
 #include <avahi-common/malloc.h>
 #include <avahi-common/error.h>
 
-#include <dbus/dbus.h>
-
 static constexpr Domain avahi_domain("avahi");
 
 static char *avahi_name;
@@ -277,6 +275,4 @@ AvahiDeinit()
 
 	avahi_free(avahi_name);
 	avahi_name = nullptr;
-
-	dbus_shutdown();
 }