Merge lp:~thomas-voss/dbus-cpp/fix-1526877 into lp:dbus-cpp/15.04

[Thomas Voß]

Only run dbus_shutdown if explicitly requested by env var.

Only run dbus_shutdown if explicitly requested by env var.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/232/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-i386-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dbus-cpp-ci/232/rebuild

review: Needs Fixing (continuous-integration)

[James Henstridge (jamesh)]

Looks good!

review: Approve

=== modified file 'src/core/dbus/bus.cpp'
--- src/core/dbus/bus.cpp	2014-11-27 16:38:44 +0000
+++ src/core/dbus/bus.cpp	2016-01-12 16:15:46 +0000
@@ -24,6 +24,8 @@
 #include <core/dbus/traits/timeout.h>
 #include <core/dbus/traits/watch.h>
 
+#include <core/posix/this_process.h>
+
 #include "message_p.h"
 #include "message_factory_impl.h"
 #include "pending_call_impl.h"
@@ -76,8 +78,18 @@
 
 void init_libdbus_thread_support_and_install_shutdown_handler()
 {
+    static const bool install_dbus_shutdown_handler
+    {
+        not core::posix::this_process::env::get("DBUS_CPP_INSTALL_DBUS_SHUTDOWN_HANDLER").empty()
+    };
+
     static std::once_flag once;
-    std::call_once(once, []() { dbus_threads_init_default(); std::atexit(dbus_shutdown); });
+    std::call_once(once, []()
+    {
+        dbus_threads_init_default();
+        if (install_dbus_shutdown_handler)
+            std::atexit(dbus_shutdown);
+    });
 }
 }