Merge lp:~mandel/dbus-cpp/name-acquired into lp:dbus-cpp

[Manuel de la Peña]

Ensure that the signals are correctly emitted for when the services appear and go.

Ensure that the signals are correctly emitted for when the services appear and go.

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:98
http://jenkins.qa.ubuntu.com/job/dbus-cpp-ci/219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dbus-cpp-vivid-i386-ci/7

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

review: Approve (continuous-integration)

[lp:~mandel/dbus-cpp/name-acquired]

99. By Manuel de la Peña on 2015-07-16

No need to add that extra step in the push_boolean method.

100. By Manuel de la Peña on 2015-07-16

Fix tests.

101. By Manuel de la Peña on 2015-07-21

Auto does the right thing and allows to pass the correct value.

=== modified file 'src/core/dbus/message.cpp'
--- src/core/dbus/message.cpp	2014-04-01 09:14:20 +0000
+++ src/core/dbus/message.cpp	2015-07-21 18:32:56 +0000
@@ -298,7 +298,7 @@
 
 void Message::Writer::push_boolean(bool value)
 {
-    dbus_bool_t bool_value = value ? TRUE : FALSE;
+    auto bool_value = value ? TRUE : FALSE;
 
     if (!dbus_message_iter_append_basic(
                 std::addressof(d->iter),
 
=== modified file 'src/core/dbus/service_watcher.cpp'
--- src/core/dbus/service_watcher.cpp	2014-01-30 17:47:19 +0000
+++ src/core/dbus/service_watcher.cpp	2015-07-21 18:32:56 +0000
@@ -48,16 +48,18 @@
         const std::string& old_owner(std::get<1>(args));
         const std::string& new_owner(std::get<2>(args));
 
+
+        if (old_owner.empty() && !new_owner.empty())
+        {
+            service_registered();
+        }
+
+        if (!old_owner.empty() && new_owner.empty())
+        {
+            service_unregistered();
+        }
+
         owner_changed(old_owner, new_owner);
-
-        if (new_owner.empty())
-        {
-            service_unregistered();
-        }
-        else
-        {
-            service_registered();
-        }
     }
 
     core::Signal<std::string, std::string> owner_changed;