Merge lp:~charlesk/indicator-location/use-ubuntu-location-api into lp:indicator-location/13.10

[Charles Kerr]

ubuntu's location API's got the FTBFS resolved, so let's use it as the backend.

This commit changes which controller instance we pass to the service. Before it was a MockController; now it's an UbuntuAppLocController

[Ted Gould (ted)]

Glad that we can switch over. Already reviewed that code with the original merge.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-26 21:38:43 +0000
+++ CMakeLists.txt	2013-08-29 17:55:15 +0000
@@ -29,10 +29,10 @@
 
 include (FindPkgConfig)
 pkg_check_modules (SERVICE REQUIRED
+                   ubuntu-platform-api>=1.0.0
                    url-dispatcher-1
                    gio-unix-2.0>=2.36
                    glib-2.0>=2.36)
-                   #ubuntu-platform-api>=1.0.0
 
 ##
 ##

=== modified file 'debian/control'
--- debian/control	2013-08-26 21:38:43 +0000
+++ debian/control	2013-08-29 17:55:15 +0000
@@ -10,6 +10,7 @@
                libglib2.0-dev (>= 2.36),
                libgtest-dev,
                liburl-dispatcher1-dev,
+               libplatform-api1-dev,
                python,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/indicator-location/

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-08-25 20:31:26 +0000
+++ src/CMakeLists.txt	2013-08-29 17:55:15 +0000
@@ -26,7 +26,7 @@
 
 set (INDICATOR_EXEC "indicator-location-service")
 
-add_executable (${INDICATOR_EXEC} main.cc)
+add_executable (${INDICATOR_EXEC} main.cc controller-ualc.cc)
 
 set_property (SOURCE main.cc
               APPEND PROPERTY COMPILE_DEFINITIONS

=== modified file 'src/controller-ualc.cc'
--- src/controller-ualc.cc	2013-08-25 21:44:50 +0000
+++ src/controller-ualc.cc	2013-08-29 17:55:15 +0000
@@ -25,7 +25,7 @@
 UbuntuAppLocController :: UbuntuAppLocController ():
   ualc (ua_location_service_create_controller ())
 {
-  if (ualc)
+  if (ualc != nullptr)
     {
       ua_location_service_controller_set_status_changed_handler (
         ualc,
@@ -36,7 +36,7 @@
 
 UbuntuAppLocController :: ~UbuntuAppLocController ()
 {
-  if (ualc)
+  if (ualc != nullptr)
     ua_location_service_controller_unref (ualc);
 }
 

=== modified file 'src/main.cc'
--- src/main.cc	2013-08-25 21:44:50 +0000
+++ src/main.cc	2013-08-29 17:55:15 +0000
@@ -21,8 +21,7 @@
 #include <glib/gi18n.h>
 #include <glib.h>
 
-//#include "controller-ualc.h"
-#include "controller-mock.h"
+#include "controller-ualc.h"
 #include "service.h"
 
 static void
@@ -43,7 +42,7 @@
  
   /* set up the service */
   loop = g_main_loop_new (nullptr, false);
-  std::shared_ptr<Controller> controller (new MockController());//UbuntuAppLocController ());
+  std::shared_ptr<Controller> controller (new UbuntuAppLocController ());
   Service service (controller);
   service.set_name_lost_callback (on_name_lost, loop);
   g_main_loop_run (loop);