Merge lp:~thomas-voss/platform-api/fix-1478845-take-2 into lp:platform-api

[Thomas Voß]

Make sure that const references are returned instead of temporary objects.
Bump build dep version for location-service to 3.
Fix LP:#1478845.

Make sure that const references are returned instead of temporary objects.
Bump build dep version for location-service to 3.
Fix LP:#1478845.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:313
http://jenkins.qa.ubuntu.com/job/platform-api-ci/435/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/48/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/platform-api-ci/435/rebuild

review: Needs Fixing (continuous-integration)

[kevin gunn (kgunn72)]

via testing this definitely fixes the bug 1481279
it was 100% reliable bug corrected with this change

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-27 18:07:53 +0000
+++ debian/changelog	2015-08-05 08:17:59 +0000
@@ -1,3 +1,9 @@
+platform-api (3.0.0+15.10.20150730-0ubuntu2) wily; urgency=medium
+
+  * Fix LP:#1478845.
+
+ -- Thomas Voß <[e-mail]>  Wed, 29 Jul 2015 09:02:19 +0200
+
 platform-api (3.0.0+15.10.20150727-0ubuntu1) wily; urgency=medium
 
   * New rebuild forced.

=== modified file 'debian/control'
--- debian/control	2015-07-15 19:23:50 +0000
+++ debian/control	2015-08-05 08:17:59 +0000
@@ -14,7 +14,7 @@
                liburl-dispatcher1-dev,
                libdbus-1-dev,
                libdbus-cpp-dev (>= 4.0.0),
-               libubuntu-location-service-dev (>= 1.0.0),
+               libubuntu-location-service-dev (>= 3.0.0),
                libgtest-dev,
                libprocess-cpp-dev (>= 0.0.1+14.04.20131212),
                libproperties-cpp-dev,

=== modified file 'src/ubuntu/application/common/application/location/position_update.cpp'
--- src/ubuntu/application/common/application/location/position_update.cpp	2014-06-23 11:17:42 +0000
+++ src/ubuntu/application/common/application/location/position_update.cpp	2015-08-05 08:17:59 +0000
@@ -65,7 +65,7 @@
 ua_location_position_update_has_altitude(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.altitude;
+    return update->update.value.altitude ? true : false;
 }
 
 double
@@ -79,7 +79,7 @@
 ua_location_position_update_has_horizontal_accuracy(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.accuracy.horizontal;
+    return update->update.value.accuracy.horizontal ? true : false;
 }
 
 double
@@ -93,7 +93,7 @@
 ua_location_position_update_has_vertical_accuracy(
     UALocationPositionUpdate *update)
 {
-    return update->update.value.accuracy.vertical;
+    return update->update.value.accuracy.vertical ? true : false;
 }
 
 double

=== modified file 'src/ubuntu/application/common/application/sensors/usensord_service.h'
--- src/ubuntu/application/common/application/sensors/usensord_service.h	2014-02-11 16:00:43 +0000
+++ src/ubuntu/application/common/application/sensors/usensord_service.h	2015-08-05 08:17:59 +0000
@@ -29,7 +29,7 @@
 
 struct USensorD
 {
-    static std::string& name()
+    static const std::string& name()
     {
         static std::string s = "com.canonical.usensord";
         return s;
@@ -37,7 +37,7 @@
 
     struct Haptic
     {
-        static std::string name()
+        static const std::string& name()
         {
             static std::string s = "com.canonical.usensord.haptic";
             return s;
@@ -45,7 +45,7 @@
     
         struct Vibrate
         {
-            static std::string name()
+            static const std::string& name()
             {
                 static std::string s = "Vibrate";
                 return s;
@@ -60,7 +60,7 @@
     
         struct VibratePattern
         {
-            static std::string name()
+            static const std::string& name()
             {
                 static std::string s = "VibratePattern";
                 return s;