Merge lp:~charlesk/indicator-location/gmenuify into lp:indicator-location/13.10

[Charles Kerr]

This implements the frontend of the location indicator.

This implements the frontend of the location indicator.

It contains unit tests that confirm that the service can get up and running on the bus, connect to the backend, and keep the UI and backend in sync with each other.

It has an interface class for two backends -- one for libubuntu-platform-api, and a simple Mock backend for unit tests.

NB: The default backend is currently the Mock backend because libubuntu-platform-api isn't ready yet. (FTBFS blockers: bug #1216473 and bug #1216483; even after those are resolved, the platform-api backend is itself only a stub).

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:54
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/6/rebuild

review: Needs Fixing (continuous-integration)

[lp:~charlesk/indicator-location/gmenuify]

55. By Charles Kerr on 2013-08-26

temporarily remove the ubuntu-platform-api from debian/control. Our hooks for that code is stubbed out right now anyway pending the location service API landing there.

56. By Charles Kerr on 2013-08-26

add missing header files

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/7/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/8/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[lp:~charlesk/indicator-location/gmenuify]

57. By Charles Kerr on 2013-08-26

remove autoreconf from rules since we've gone from autotools -> cmake. Copy the rules from indicator-session

58. By Charles Kerr on 2013-08-26

add python and dh-translations to debian/control

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Jenkins, I can keep this up all day...

[lp:~charlesk/indicator-location/gmenuify]

59. By Charles Kerr on 2013-08-26

fix copy/paste error introduced when copying 'rules' from indicator-session.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:56
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/11/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/12/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:59
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/12/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/13/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Oh, and please put the bug numbers blocking the platform API stuff as a
comment in the code.

[Ted Gould (ted)]

* Need to drop data/indicator-location.desktop

* I don't think that we need to update the icon cache, that's handled by
the dpkg hook as it needs to be refreshed on package install not source
install.

* Need to add phone.cc to po/POTFILES.in

* The build system doesn't seem to be building the internationalization
at all

* Surprised the compiler doesn't hate this, but should probably put a
"static" in the cc file for
on_location_service_controller_status_changed() just to make it clearer

* I think that in controller.cc you need to check to see if
on_gps_enabled_changed or on_location_service_enabled_changed is null as
it's possible a subclass would implment one and not both

* We probably should either use or remove the icons. I don't care which
way we go there :-)

* The accessible string "Location" should be translatable.

* If you're going to use C++ 11 would have liked to see more usage of
lambdas ;-)

* Showing the settings needs to use URL Dispatcher

  review needs-fixing

review: Needs Fixing

[lp:~charlesk/indicator-location/gmenuify]

60. By Charles Kerr on 2013-08-26

remove data/indicator-location.desktop

61. By Charles Kerr on 2013-08-26

after installing icons, don't update the icon cache -- that's handled by the dpkg hook because it needs to be refreshed upon package install, not source install.

62. By Charles Kerr on 2013-08-26

update po/POTFILES.in

63. By Charles Kerr on 2013-08-26

mark the accessible string Loation translatable

64. By Charles Kerr on 2013-08-26

remove icons.

65. By Charles Kerr on 2013-08-26

copy gettext i18n cmake rules from lp:indicator-session

[Charles Kerr (charlesk)]

> * Need to drop data/indicator-location.desktop

Fixed r60

> * I don't think that we need to update the icon cache, that's handled by
> the dpkg hook as it needs to be refreshed on package install not source
> install.

Fixed r61

> * Need to add phone.cc to po/POTFILES.in

Fixed r62

> * The accessible string "Location" should be translatable.

Fixed r63

> * We probably should either use or remove the icons. I don't care which
> way we go there :-)

Removed r64. I was keeping them around in case we get a chance to bring the Desktop indicator-location back, but I guess they'll still be in the old branches when we need them.

> * The build system doesn't seem to be building the internationalization
> at all

Oog, that's ugly. Fixed r65.

> * Surprised the compiler doesn't hate this, but should probably put a
> "static" in the cc file for
> on_location_service_controller_status_changed() just to make it clearer

No, not in C++. That method's been declared static in the class declaration; using it in the .cc file has a meaning more like the one in C.

> * I think that in controller.cc you need to check to see if
> on_gps_enabled_changed or on_location_service_enabled_changed is null as
> it's possible a subclass would implement one and not both

No, not in C++. The compiler wouldn't allow the client to instantiate an object whose class still has pure virtual functions.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/13/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/14/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-location/gmenuify]

66. By Charles Kerr on 2013-08-26

set version number to 13.10.0 in CMakeLists.txt and in debian/changelog

67. By Charles Kerr on 2013-08-26

change version in debian/changelog to 13.10.0-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-saucy-armhf-ci/14/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-location-ci/15/rebuild

review: Approve (continuous-integration)

[lp:~charlesk/indicator-location/gmenuify]

68. By Charles Kerr on 2013-08-26

use url-dispatcher-1 for launching the settings paneL

[Ted Gould (ted)]

review: Approve

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2013-08-26 21:42:23 +0000
@@ -0,0 +1,60 @@
+project (indicator-location)
+cmake_minimum_required (VERSION 2.8.9)
+
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+set (PROJECT_VERSION "13.10.0")
+set (PACKAGE ${CMAKE_PROJECT_NAME})
+set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
+
+option (enable_tests "Build the package's automatic tests." ON)
+option (enable_lcov "Generate lcov code coverage reports." ON)
+
+##
+##  GNU standard paths
+## 
+include (GNUInstallDirs)
+if (EXISTS "/etc/debian_version") # Workaround for libexecdir on debian
+  set (CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBDIR}")
+  set (CMAKE_INSTALL_FULL_LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+endif ()
+set (CMAKE_INSTALL_PKGLIBEXECDIR "${CMAKE_INSTALL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
+set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_PROJECT_NAME}")
+
+##
+##  Check for prerequisites
+##
+
+find_package (PkgConfig REQUIRED)
+
+include (FindPkgConfig)
+pkg_check_modules (SERVICE REQUIRED
+                   url-dispatcher-1
+                   gio-unix-2.0>=2.36
+                   glib-2.0>=2.36)
+                   #ubuntu-platform-api>=1.0.0
+
+##
+##
+##
+
+set (CMAKE_INCLUDE_CURRENT_DIR ON)
+set (CC_WARNING_ARGS " -Wall -Wextra -Wno-missing-field-initializers")
+
+# testing & coverage
+if (${enable_tests})
+  set (GTEST_SOURCE_DIR /usr/src/gtest/src)
+  set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
+  set (GTEST_LIBS -lpthread)
+  enable_testing ()
+  if (${enable_lcov})
+    include(GCov)
+  endif ()
+endif ()
+
+add_subdirectory (src)
+add_subdirectory (data)
+add_subdirectory (po)
+if (${enable_tests})
+  add_subdirectory (tests)
+endif ()

=== added file 'INSTALL'
--- INSTALL	1970-01-01 00:00:00 +0000
+++ INSTALL	2013-08-26 21:42:23 +0000
@@ -0,0 +1,69 @@
+#
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+Compile-time build dependencies
+-------------------------------
+ - gettext (gettext 0.18.1.1-10ubuntu3 or later)
+ - glib (libglib2.0, 2.36 or later)
+ - cmake (cmake, 2.8.9 or later)
+ - gcovr (gcovr, 2.4 or later)
+ - lcov (lcov, 1.9 or later)
+ - google test (libgtest-dev, 1.6.0 or later)
+ - ubuntu-platform-api (libubuntu-platform-api1)
+
+Building the code
+-----------------
+The simplest case is:
+ $ cd indicator-location-X.Y.Z
+ $ mkdir build
+ $ cd build
+ $ cmake ..
+ $ make
+
+Running the tests
+-----------------
+ $ cd indicator-location-X.Y.Z
+ $ mkdir build
+ $ cd build
+ $ cmake ..
+ $ make
+ $ make test
+
+Generating Test Coverage Reports
+--------------------------------
+ $ cd indicator-location-X.Y.Z
+ $ mkdir build-coverage
+ $ cd build-coverage
+ $ cmake -DCMAKE_BUILD_TYPE=coverage ..
+ $ make
+ $ make coverage-html
+
+Installation
+------------
+ $ mkdir build
+ $ cd build
+ $ cmake -DCMAKE_INSTALL_PREFIX=/usr .. # Or wherever...
+ $ make
+ $ make release
+ $ make install
+
+What Gets Installed
+-------------------
+  ${datadir}/dbus-1/indicator-location.service
+  ${datadir}/unity/indicators/com.canonical.indicator.location
+  ${libexecdir}/indicator-location/indicator-location-service
+
+

=== removed file 'Makefile.am'
--- Makefile.am	2012-08-02 11:54:15 +0000
+++ Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-
-SUBDIRS = \
-	src \
-	data \
-	po
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
-
-dist-hook:
-	@if test -d "$(top_srcdir)/.bzr"; \
-		then \
-			echo Creating ChangeLog && \
-				( cd "$(top_srcdir)" && \
-				echo '# Generated by Makefile. Do not edit.'; echo; \
-				$(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
-				&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
-				|| (rm -f ChangeLog.tmp; \
-					echo Failed to generate ChangeLog >&2 ); \
-		else \
-			echo Failed to generate ChangeLog: not a branch >&2; \
-		fi
-		@if test -d "$(top_srcdir)/.bzr"; \
-			then \
-				echo Creating AUTHORS && \
-					( cd "$(top_srcdir)" && \
-					echo '# Generated by Makefile. Do not edit.'; echo; \
-					$(top_srcdir)/missing --run  bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
-					&& mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
-					|| (rm -f AUTHORS.tmp; \
-						echo Failed to generate AUTHORS >&2 ); \
-			else \
-				echo Failed to generate AUTHORS: not a branch >&2; \
-	fi
-
-include $(top_srcdir)/Makefile.am.coverage

=== removed file 'Makefile.am.coverage'
--- Makefile.am.coverage	2012-08-02 11:43:45 +0000
+++ Makefile.am.coverage	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-
-# Coverage targets
-
-.PHONY: clean-gcno clean-gcda \
-	coverage-html generate-coverage-html clean-coverage-html \
-	coverage-gcovr generate-coverage-gcovr clean-coverage-gcovr
-
-clean-local: clean-gcno clean-coverage-html clean-coverage-gcovr
-
-if HAVE_GCOV
-
-clean-gcno:
-	@echo Removing old coverage instrumentation
-	-find -name '*.gcno' -print | xargs -r rm
-
-clean-gcda:
-	@echo Removing old coverage results
-	-find -name '*.gcda' -print | xargs -r rm
-  
-coverage-html: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-html
-  
-generate-coverage-html:
-	@echo Collecting coverage data
-	$(LCOV) --directory $(top_builddir) --capture --output-file coverage.info --no-checksum --compat-libtool
-	LANG=C $(GENHTML) --prefix $(top_builddir) --output-directory coveragereport --title "Code Coverage" --legend --show-details coverage.info
-  
-clean-coverage-html: clean-gcda
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf coverage.info coveragereport
-
-if HAVE_GCOVR
-
-coverage-gcovr: clean-gcda
-	-$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(MAKE) $(AM_MAKEFLAGS) generate-coverage-gcovr
-	
-generate-coverage-gcovr:
-	@echo Generating coverage GCOVR report
-	$(GCOVR) -x -r $(top_builddir) -o $(top_builddir)/coverage.xml
-	
-clean-coverage-gcovr: clean-gcda
-	-rm -rf $(top_builddir)/coverage.xml
-
-endif # HAVE_GCOVR
-
-endif # HAVE_GCOV

=== removed file 'autogen.sh'
--- autogen.sh	2013-06-21 17:43:09 +0000
+++ autogen.sh	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-autoreconf -i -f
-intltoolize

=== added directory 'cmake'
=== added file 'cmake/GCov.cmake'
--- cmake/GCov.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GCov.cmake	2013-08-26 21:42:23 +0000
@@ -0,0 +1,53 @@
+if (CMAKE_BUILD_TYPE MATCHES coverage)
+  set(LCOV_RAW_FILE "lcov-raw.info")
+  set(LCOV_FILE "lcov.info")
+  set(GCOV_FLAGS "${GCOV_FLAGS} --coverage")
+  set(CMAKE_EXE_LINKER_FLAGS    "${CMAKE_EXE_LINKER_FLAGS}    ${GCOV_FLAGS}")
+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${GCOV_FLAGS}")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCOV_FLAGS}")
+  set(GCOV_LIBS ${GCOV_LIBS} gcov)
+
+  find_program(GCOVR_EXECUTABLE gcovr HINTS ${GCOVR_ROOT} "${GCOVR_ROOT}/bin")
+  if (NOT GCOVR_EXECUTABLE)
+    message(STATUS "Gcovr binary was not found, can not generate XML coverage info.")
+  else ()
+    message(STATUS "Gcovr found, can generate XML coverage info.")
+    add_custom_target (coverage-xml
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      COMMAND "${GCOVR_EXECUTABLE}" --exclude="test.*" -x -r "${CMAKE_SOURCE_DIR}" 
+      --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml)
+  endif()
+
+  find_program(LCOV_EXECUTABLE lcov HINTS ${LCOV_ROOT} "${GCOVR_ROOT}/bin")
+  find_program(GENHTML_EXECUTABLE genhtml HINTS ${GENHTML_ROOT})
+  if (NOT LCOV_EXECUTABLE)
+    message(STATUS "Lcov binary was not found, can not generate HTML coverage info.")
+  else ()
+    if(NOT GENHTML_EXECUTABLE)
+      message(STATUS "Genthml binary not found, can not generate HTML coverage info.")
+    else()
+      message(STATUS "Lcov and genhtml found, can generate HTML coverage info.")
+      add_custom_target (coverage-html
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        COMMAND "${CMAKE_CTEST_COMMAND}" --force-new-ctest-process --verbose
+        # generate the raw lcov data
+        COMMAND "${LCOV_EXECUTABLE}" --directory ${CMAKE_BINARY_DIR} --capture -o ${LCOV_RAW_FILE}
+        # FIXME: when ubuntu gets lcov 1.10 we can use --no-external instead of the brittle --remove
+        COMMAND "${LCOV_EXECUTABLE}" --remove ${LCOV_RAW_FILE} "/usr/include/*" | ${CMAKE_SOURCE_DIR}/trim-lcov.py > ${LCOV_FILE}
+        COMMAND LANG=C "${GENHTML_EXECUTABLE}" --prefix ${CMAKE_BINARY_DIR} --output-directory lcov-html --legend --show-details ${LCOV_FILE}
+        COMMAND ${CMAKE_COMMAND} -E echo ""
+        COMMAND ${CMAKE_COMMAND} -E echo "file://${CMAKE_BINARY_DIR}/lcov-html/index.html"
+        COMMAND ${CMAKE_COMMAND} -E echo ""
+        VERBATIM) # VERBATIM is necessary here for the wildcard in --remove... again, when we go to lcov 1.10 we can drop this
+        #)
+    endif()
+  endif()
+endif()
+
+
+	#$(MAKE) $(AM_MAKEFLAGS) check
+	#lcov --directory $(top_builddir) --capture --test-name dconf | $(top_srcdir)/trim-lcov.py > dconf-lcov.info
+	#LANG=C genhtml --prefix $(top_builddir) --output-directory lcov-html --legend --show-details dconf-lcov.info
+	#@echo
+	#@echo "     file://$(abs_top_builddir)/lcov-html/index.html"
+	#@echo

=== added file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Translations.cmake	2013-08-26 21:42:23 +0000
@@ -0,0 +1,41 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            ${CMAKE_INSTALL_LOCALEDIR}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+
+    set(C_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
+        )
+endmacro()

=== removed file 'configure.ac'
--- configure.ac	2012-10-11 18:02:30 +0000
+++ configure.ac	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-
-AC_INIT(indicator-location, 0.0.4)
-
-AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE([])
-
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LIBTOOL
-AM_PROG_CC_C_O
-AM_SILENT_RULES([yes])
-AC_CONFIG_MACRO_DIR([m4])
-
-IT_PROG_INTLTOOL([0.35.0])
-GETTEXT_PACKAGE=indicator-location
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
-AM_GLIB_GNU_GETTEXT
-
-AC_CONFIG_HEADER(config.h)
-AC_CONFIG_FILES([
-    Makefile
-	data/Makefile
-	src/Makefile
-    po/Makefile.in
-])
-
-PKG_CHECK_MODULES(INDICATOR, glib-2.0
-                  geoclue
-                  appindicator3-0.1)
-
-###########################
-# Local Install
-###########################
-
-with_localinstall="no"
-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall],
-                                           [install all files locally (for distcheck)]),
-              with_localinstall=$enableval,
-              with_localinstall=no)
-
-###########################
-# gcov coverage reporting
-###########################
-
-m4_include([m4/gcov.m4])
-AC_TDD_GCOV
-AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
-AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
-AM_CONDITIONAL([HAVE_GCOVR], [test "x$ac_cv_check_gcovr" = xyes])
-AC_SUBST(COVERAGE_CFLAGS)
-AC_SUBST(COVERAGE_LDFLAGS)
-
-AC_SUBST(AM_CFLAGS, "-Wall -Werror")
-
-AC_OUTPUT
-

=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2013-08-26 21:42:23 +0000
@@ -0,0 +1,33 @@
+##
+##  DBus Service File
+##
+
+# where to install
+set (DBUS_SERVICE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/dbus-1/services")
+message (STATUS "${DBUS_SERVICE_DIR} is the DBus Service File install dir")
+
+set (SERVICE_NAME "${CMAKE_PROJECT_NAME}.service")
+set (SERVICE_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_NAME}")
+set (SERVICE_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SERVICE_NAME}.in")
+
+# build it
+set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}")
+configure_file ("${SERVICE_FILE_IN}" "${SERVICE_FILE}")
+
+# install it
+install (FILES "${SERVICE_FILE}"
+         DESTINATION "${DBUS_SERVICE_DIR}")
+
+##
+##  Unity Indicator File
+##
+
+# where to install
+set (UNITY_INDICATOR_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/unity/indicators")
+message (STATUS "${UNITY_INDICATOR_DIR} is the Unity Indicator install dir")
+
+set (UNITY_INDICATOR_NAME "com.canonical.indicator.location")
+set (UNITY_INDICATOR_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${UNITY_INDICATOR_NAME}")
+
+install (FILES "${UNITY_INDICATOR_FILE}"
+         DESTINATION "${UNITY_INDICATOR_DIR}")

=== removed file 'data/Makefile.am'
--- data/Makefile.am	2012-08-02 13:43:13 +0000
+++ data/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-
-iconsdir = $(pkgdatadir)/icons/
-icons_DATA = \
-	indicator-location-neighborhood.svg \
-	indicator-location-region.svg \
-	indicator-location-specific.svg \
-	indicator-location-unknown.svg
-
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA = indicator-location.desktop
-
-EXTRA_DIST = \
-	$(autostart_DATA) \
-	$(icons_DATA)

=== added file 'data/com.canonical.indicator.location'
--- data/com.canonical.indicator.location	1970-01-01 00:00:00 +0000
+++ data/com.canonical.indicator.location	2013-08-26 21:42:23 +0000
@@ -0,0 +1,8 @@
+[Indicator Service]
+Name=indicator-location
+ObjectPath=/com/canonical/indicator/location
+Position=90
+
+[phone]
+ObjectPath=/com/canonical/indicator/location/phone
+

=== removed file 'data/indicator-location-neighborhood.svg'
--- data/indicator-location-neighborhood.svg	2012-08-02 11:12:50 +0000
+++ data/indicator-location-neighborhood.svg	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="indicator-location-region.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="56.0625"
-     inkscape:cx="3.6222677"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dfdbd3;stroke-width:1.83333332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2993"
-       sodipodi:cx="8"
-       sodipodi:cy="7"
-       sodipodi:rx="5"
-       sodipodi:ry="5"
-       d="M 13,7 C 13,9.7614237 10.761424,12 8,12 5.2385763,12 3,9.7614237 3,7 3,4.2385763 5.2385763,2 8,2 c 2.761424,0 5,2.2385763 5,5 z"
-       transform="matrix(1.0909091,0,0,1.0909091,-0.72727275,1036.7257)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1,8 C 3,8 3,8 3,8"
-       id="path3763"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1036.3622)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 8,1037.3622 c 0,2 0,2 0,2"
-       id="path3763-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 13,1044.3622 c 2,0 2,0 2,0"
-       id="path3763-0"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 8,1049.3622 c 0,2 0,2 0,2"
-       id="path3763-7-0"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#dfdbd3;stroke:#dfdbd3;stroke-width:1.31250004999999992;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
-       id="path3040"
-       sodipodi:cx="6.5"
-       sodipodi:cy="6.5"
-       sodipodi:rx="2.5"
-       sodipodi:ry="2.5"
-       d="m 9,6.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
-       transform="matrix(1.1428571,0,0,1.1428571,0.5714284,1036.9337)" />
-  </g>
-</svg>

=== removed file 'data/indicator-location-region.svg'
--- data/indicator-location-region.svg	2012-08-02 11:12:50 +0000
+++ data/indicator-location-region.svg	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="indicator-location-region.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="56.0625"
-     inkscape:cx="6.788377"
-     inkscape:cy="8"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dfdbd3;stroke-width:1.83333332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2993"
-       sodipodi:cx="8"
-       sodipodi:cy="7"
-       sodipodi:rx="5"
-       sodipodi:ry="5"
-       d="M 13,7 C 13,9.7614237 10.761424,12 8,12 5.2385763,12 3,9.7614237 3,7 3,4.2385763 5.2385763,2 8,2 c 2.761424,0 5,2.2385763 5,5 z"
-       transform="matrix(1.0909091,0,0,1.0909091,-0.72727275,1036.7257)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1,8 C 3,8 3,8 3,8"
-       id="path3763"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1036.3622)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 8,1037.3622 c 0,2 0,2 0,2"
-       id="path3763-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 13,1044.3622 c 2,0 2,0 2,0"
-       id="path3763-0"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 8,1049.3622 c 0,2 0,2 0,2"
-       id="path3763-7-0"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

=== removed file 'data/indicator-location-specific.svg'
--- data/indicator-location-specific.svg	2012-08-02 11:12:50 +0000
+++ data/indicator-location-specific.svg	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="indicator-location-specific.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="7.5"
-     inkscape:cy="7.7133869"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dfdbd3;stroke-width:1.83333332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2993"
-       sodipodi:cx="8"
-       sodipodi:cy="7"
-       sodipodi:rx="5"
-       sodipodi:ry="5"
-       d="M 13,7 C 13,9.7614237 10.761424,12 8,12 5.2385763,12 3,9.7614237 3,7 3,4.2385763 5.2385763,2 8,2 c 2.761424,0 5,2.2385763 5,5 z"
-       transform="matrix(1.0909091,0,0,1.0909091,-0.72727275,1036.7257)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1,8 C 3,8 3,8 3,8"
-       id="path3763"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1036.3622)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 8,1037.3622 c 0,2 0,2 0,2"
-       id="path3763-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 13,1044.3622 c 2,0 2,0 2,0"
-       id="path3763-0"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 8,1049.3622 c 0,2 0,2 0,2"
-       id="path3763-7-0"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;stroke:#dfdbd3;stroke-width:0.87500003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
-       id="path3040"
-       sodipodi:cx="6.5"
-       sodipodi:cy="6.5"
-       sodipodi:rx="2.5"
-       sodipodi:ry="2.5"
-       d="m 9,6.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
-       transform="matrix(1.1428571,0,0,1.1428571,0.5714284,1036.9337)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#dfdbd3;fill-opacity:1;stroke:#dfdbd3;stroke-width:1.3125;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3040-3"
-       sodipodi:cx="6.5"
-       sodipodi:cy="6.5"
-       sodipodi:rx="2.5"
-       sodipodi:ry="2.5"
-       d="m 9,6.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
-       transform="matrix(0.47524752,0,0,0.47524752,4.9108911,1041.2731)" />
-  </g>
-</svg>

=== removed file 'data/indicator-location-unknown.svg'
--- data/indicator-location-unknown.svg	2012-08-02 14:08:13 +0000
+++ data/indicator-location-unknown.svg	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="indicator-location-unknown.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="32"
-     inkscape:cx="6.0949687"
-     inkscape:cy="6.8368806"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="1026"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dfdbd3;stroke-width:1.83333332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2993"
-       sodipodi:cx="8"
-       sodipodi:cy="7"
-       sodipodi:rx="5"
-       sodipodi:ry="5"
-       d="M 13,7 C 13,9.7614237 10.761424,12 8,12 5.2385763,12 3,9.7614237 3,7 3,4.2385763 5.2385763,2 8,2 c 2.761424,0 5,2.2385763 5,5 z"
-       transform="matrix(1.0909091,0,0,1.0909091,-0.72727275,1036.7257)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1,8 C 3,8 3,8 3,8"
-       id="path3763"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1036.3622)" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 8,1037.3622 c 0,2 0,2 0,2"
-       id="path3763-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;color:#000000;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 13,1044.3622 c 2,0 2,0 2,0"
-       id="path3763-0"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 8,1049.3622 c 0,2 0,2 0,2"
-       id="path3763-7-0"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path2992"
-       style="font-size:8.69258404px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#dfdbd3;fill-opacity:1;stroke:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       d="m 7.9644153,1041.8324 c -0.3824748,0 -0.7562555,0.099 -1.1213433,0.2955 l -0.2260072,-0.6259 c 0.1970316,-0.1043 0.4172435,-0.1883 0.6606364,-0.252 0.2491863,-0.064 0.5128611,-0.096 0.7910252,-0.096 0.3303162,0 0.599786,0.046 0.8084103,0.1391 0.2144144,0.087 0.3853684,0.2 0.5128624,0.339 0.1274882,0.1391 0.214414,0.2956 0.2607776,0.4694 0.052152,0.1681 0.07823,0.3304 0.078233,0.4868 -3.3e-6,0.1971 -0.037671,0.3738 -0.1130036,0.5303 -0.075339,0.1506 -0.1680596,0.2926 -0.2781627,0.4259 -0.1101088,0.1333 -0.2318049,0.2608 -0.3650885,0.3825 -0.1332887,0.1217 -0.2549847,0.2492 -0.3650885,0.3824 -0.1101081,0.1275 -0.2028289,0.2695 -0.2781627,0.426 -0.075338,0.1507 -0.1130054,0.3216 -0.1130036,0.5128 -1.8e-6,0.029 -1.8e-6,0.061 0,0.096 -1.8e-6,0.035 0.0029,0.067 0.00869,0.096 l -0.6780216,0 c -0.023181,-0.1159 -0.034771,-0.2376 -0.03477,-0.3651 -1.1e-6,-0.1854 0.031872,-0.3535 0.095618,-0.5042 0.06954,-0.1506 0.1564652,-0.2897 0.2607775,-0.4172 0.1043095,-0.1333 0.2144155,-0.255 0.3303182,-0.3651 0.1158993,-0.1159 0.2260052,-0.2318 0.3303182,-0.3477 0.1043088,-0.1159 0.1883371,-0.2376 0.2520849,-0.3651 0.069538,-0.1275 0.1043086,-0.2666 0.1043111,-0.4172 -2.5e-6,-0.2434 -0.078236,-0.4405 -0.2346998,-0.5911 -0.1564686,-0.1565 -0.3853731,-0.2347 -0.6867142,-0.2347 m 0.5476328,5.0156 c -2e-6,0.1565 -0.052157,0.2926 -0.1564665,0.4085 -0.1043128,0.1159 -0.2462915,0.1739 -0.4259366,0.1739 -0.179648,0 -0.3216268,-0.058 -0.4259366,-0.1739 -0.104312,-0.1159 -0.1564674,-0.252 -0.1564665,-0.4085 -9e-7,-0.1565 0.052154,-0.2927 0.1564665,-0.4086 0.1043098,-0.1159 0.2462886,-0.1738 0.4259366,-0.1738 0.1796451,0 0.3216238,0.058 0.4259366,0.1738 0.104309,0.1159 0.1564645,0.2521 0.1564665,0.4086" />
-    <path
-       style="fill:none;stroke:#dfdbd3;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 8,1049.3622 c 0,2 0,2 0,2"
-       id="path3763-7-9"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>

=== removed file 'data/indicator-location.desktop'
--- data/indicator-location.desktop	2012-08-02 13:43:13 +0000
+++ data/indicator-location.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Indicator Location
-Comment=Show the accuracy of your location in the menubar
-Icon=indicator-location-neighborhood
-Exec=indicator-location
-Terminal=false
-Type=Application
-NoDisplay=true
-X-GNOME-Autostart-enabled=true

=== added file 'data/indicator-location.service.in'
--- data/indicator-location.service.in	1970-01-01 00:00:00 +0000
+++ data/indicator-location.service.in	2013-08-26 21:42:23 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.indicator.location
+Exec=@pkglibexecdir@/indicator-location-service

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-19 13:10:54 +0000
+++ debian/changelog	2013-08-26 21:42:23 +0000
@@ -1,3 +1,11 @@
+indicator-location (13.10.0-0ubuntu1) UNRELEASED; urgency=low
+
+  [ Charles Kerr]
+  * Implement the phone's location indicator
+  * Switch build system from autotools to cmake
+
+ -- Charles Kerr <[e-mail]>  Mon, 26 Aug 2013 16:07:44 -0500
+
 indicator-location (0.0.4+13.10.20130719-0ubuntu1) saucy; urgency=low
 
   [ Ken VanDine ]

=== modified file 'debian/control'
--- debian/control	2013-06-26 18:35:13 +0000
+++ debian/control	2013-08-26 21:42:23 +0000
@@ -1,14 +1,16 @@
 Source: indicator-location
 Section: misc
 Priority: optional
-Maintainer: Ted Gould <[e-mail]>
-Build-Depends: debhelper (>= 9),
-               dh-autoreconf,
+Maintainer: Charles Kerr <[e-mail]>
+Build-Depends: cmake,
+               dbus,
+               debhelper (>= 9),
+               dh-translations,
                intltool (>= 0.35.0), 
-               libappindicator3-dev,
-               libgeoclue-dev,
-               libglib2.0-dev (>= 2.29.19),
-               libgtk-3-dev,
+               libglib2.0-dev (>= 2.36),
+               libgtest-dev,
+               liburl-dispatcher1-dev,
+               python,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/indicator-location/
 # If you aren't a member of ~indicator-applet-developers but need to upload 
@@ -20,8 +22,6 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-Recommends: emerillon,
-            geoclue-ubuntu-geoip,
-Description: Indicator to show the state of GeoClue
- An indicator that gives you data about your location
- and if the computer knows it.
+Description: Indicator to show when the system is using your
+ physical location data and allow the user to toggle
+ permissions on its use.

=== modified file 'debian/rules'
--- debian/rules	2013-07-19 06:18:34 +0000
+++ debian/rules	2013-08-26 21:42:23 +0000
@@ -1,10 +1,16 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
-override_dh_autoreconf:
-	NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
-	dh $@ --with autoreconf --fail-missing
+	dh $@ --with translations
+
+override_dh_install:
+	find debian/indicator-location/usr/lib -name *.la -delete
+	find debian/indicator-location/usr/lib -name *.a -delete
+	dh_install --fail-missing
+
+# Hack as it seems it's not possible to easy run that under dbus-test-runner
+override_dh_auto_test:
+	env -u LD_PRELOAD dh_auto_test
+

=== removed directory 'm4'
=== removed file 'm4/gcov.m4'
--- m4/gcov.m4	2012-08-02 11:43:45 +0000
+++ m4/gcov.m4	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-# Checks for existence of coverage tools:
-#  * gcov
-#  * lcov
-#  * genhtml
-#  * gcovr
-# 
-# Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
-AC_DEFUN([AC_TDD_GCOV],
-[
-  AC_ARG_ENABLE(gcov,
-  AS_HELP_STRING([--enable-gcov],
-		 [enable coverage testing with gcov]),
-  [use_gcov=$enableval], [use_gcov=no])
-
-  if test "x$use_gcov" = "xyes"; then
-  # we need gcc:
-  if test "$GCC" != "yes"; then
-    AC_MSG_ERROR([GCC is required for --enable-gcov])
-  fi
-
-  # Check if ccache is being used
-  AC_CHECK_PROG(SHTOOL, shtool, shtool)
-  case `$SHTOOL path $CC` in
-    *ccache*[)] gcc_ccache=yes;;
-    *[)] gcc_ccache=no;;
-  esac
-
-  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
-  fi
-
-  lcov_version_list="1.6 1.7 1.8 1.9"
-  AC_CHECK_PROG(LCOV, lcov, lcov)
-  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-
-  if test "$LCOV"; then
-    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
-      glib_cv_lcov_version=invalid
-      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
-      for lcov_check_version in $lcov_version_list; do
-        if test "$lcov_version" = "$lcov_check_version"; then
-          glib_cv_lcov_version="$lcov_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
-    AC_MSG_ERROR([$lcov_msg])
-  fi
-
-  case $glib_cv_lcov_version in
-    ""|invalid[)]
-      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
-      AC_MSG_ERROR([$lcov_msg])
-      LCOV="exit 0;"
-      ;;
-  esac
-
-  if test -z "$GENHTML"; then
-    AC_MSG_ERROR([Could not find genhtml from the lcov package])
-  fi
-
-  ac_cv_check_gcov=yes
-  ac_cv_check_lcov=yes
-
-  # Remove all optimization flags from CFLAGS
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
-  changequote([,])
-
-  # Add the special gcc flags
-  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
-  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
-  COVERAGE_LDFLAGS="-lgcov"
-
-  # Check availability of gcovr
-  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
-  if test -z "$GCOVR"; then
-    ac_cv_check_gcovr=no
-  else
-    ac_cv_check_gcovr=yes
-  fi
-
-fi
-]) # AC_TDD_GCOV

=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2013-08-26 21:42:23 +0000
@@ -0,0 +1,3 @@
+include (Translations)
+add_translations_directory ("${GETTEXT_PACKAGE}")
+add_translations_catalog ("${GETTEXT_PACKAGE}" ../src/)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-08-02 12:19:46 +0000
+++ po/POTFILES.in	2013-08-26 21:42:23 +0000
@@ -1,1 +1,1 @@
-src/indicator-location.c
+src/phone.cc

=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2013-08-26 21:42:23 +0000
@@ -0,0 +1,45 @@
+
+set_property (DIRECTORY
+              APPEND PROPERTY INCLUDE_DIRECTORIES ${SERVICE_INCLUDE_DIRS})
+
+set_property (DIRECTORY
+              APPEND PROPERTY LINK_DIRECTORIES ${SERVICE_INCLUDE_DIRS})
+
+
+###
+###  The library.
+###  this doesn't get installed anywhere;
+###  it's built apart from main() as a convenience for tests/
+###
+
+set (INDICATOR_LIB "libindicator-location-service")
+
+add_library (${INDICATOR_LIB} STATIC controller.cc phone.cc service.cc)
+
+set_property (TARGET ${INDICATOR_LIB}
+              APPEND PROPERTY LINK_LIBRARIES ${INDICATOR_LIB} ${SERVICE_LIBRARIES} ${GCOV_LIBS})
+
+
+###
+###  The service execuable.
+###
+
+set (INDICATOR_EXEC "indicator-location-service")
+
+add_executable (${INDICATOR_EXEC} main.cc)
+
+set_property (SOURCE main.cc
+              APPEND PROPERTY COMPILE_DEFINITIONS
+              GETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
+              GNOMELOCALEDIR="@CMAKE_INSTALL_FULL_LOCALEDIR@")
+
+target_link_libraries (${INDICATOR_EXEC} libindicator-location-service)
+
+install (TARGETS ${INDICATOR_EXEC}
+         RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_PKGLIBEXECDIR})
+
+
+
+set_property (TARGET ${INDICATOR_LIB} ${INDICATOR_EXEC}
+              APPEND_STRING PROPERTY COMPILE_FLAGS " ${CC_WARNING_ARGS} ${GCOV_FLAGS} --std=c++11")
+

=== removed file 'src/Makefile.am'
--- src/Makefile.am	2013-04-26 22:52:44 +0000
+++ src/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-
-bin_PROGRAMS = \
-	indicator-location
-
-indicator_location_SOURCES = \
-	indicator-location.c
-
-indicator_location_CFLAGS = \
-	$(INDICATOR_CFLAGS) \
-	$(COVERAGE_CFLAGS) \
-	-DICON_DIR="\"$(pkgdatadir)/icons/\""
-
-indicator_location_LDFLAGS = \
-	$(COVERAGE_LDFLAGS)
-
-indicator_location_LDADD = \
-	$(INDICATOR_LIBS)

=== added file 'src/controller-mock.h'
--- src/controller-mock.h	1970-01-01 00:00:00 +0000
+++ src/controller-mock.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#ifndef __INDICATOR_LOCATION_CONTROLLER_MOCK__H__
+#define __INDICATOR_LOCATION_CONTROLLER_MOCK__H__
+
+#include "controller.h"
+
+class MockController: public Controller
+{
+  public:
+
+    MockController (): valid(true), gps(false), loc(false) { }
+    virtual ~MockController() { }
+
+    bool is_valid () const { return valid; }
+    bool is_gps_enabled () const { return gps; }
+    bool is_location_service_enabled () const { return loc; }
+
+    void set_gps_enabled (bool enabled) { notify_gps_enabled (gps=enabled); }
+    void set_location_service_enabled (bool enabled) { notify_location_service_enabled (loc=enabled); }
+
+  private:
+
+    bool valid;
+    bool gps;
+    bool loc;
+};
+
+#endif // __INDICATOR_LOCATION_CONTROLLER_MOCK__H__
+
+

=== added file 'src/controller-ualc.cc'
--- src/controller-ualc.cc	1970-01-01 00:00:00 +0000
+++ src/controller-ualc.cc	2013-08-26 21:42:23 +0000
@@ -0,0 +1,106 @@
+
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#include <iostream>
+
+#include "controller-ualc.h"
+
+UbuntuAppLocController :: UbuntuAppLocController ():
+  ualc (ua_location_service_create_controller ())
+{
+  if (ualc)
+    {
+      ua_location_service_controller_set_status_changed_handler (
+        ualc,
+        on_location_service_controller_status_changed,
+        this);
+    }
+}
+
+UbuntuAppLocController :: ~UbuntuAppLocController ()
+{
+  if (ualc)
+    ua_location_service_controller_unref (ualc);
+}
+
+void
+UbuntuAppLocController :: on_location_service_controller_status_changed (
+                                                UALocationServiceStatusFlags f,
+                                                void * vself)
+{
+  auto self = static_cast<UbuntuAppLocController*>(vself);
+
+  if (f & (UA_LOCATION_SERVICE_ENABLED | UA_LOCATION_SERVICE_DISABLED))
+    self->notify_gps_enabled (self->is_location_service_enabled ());
+
+  if (f & (UA_LOCATION_SERVICE_GPS_ENABLED | UA_LOCATION_SERVICE_GPS_DISABLED))
+    self->notify_gps_enabled (self->is_gps_enabled());
+}
+
+/***
+****
+***/
+
+bool
+UbuntuAppLocController :: is_gps_enabled () const
+{
+  UALocationServiceStatusFlags flags = 0;
+
+  return (ualc != nullptr)
+      && (!ua_location_service_controller_query_status (ualc, &flags))
+      && (flags & UA_LOCATION_SERVICE_GPS_ENABLED);
+}
+
+void
+UbuntuAppLocController :: set_gps_enabled (bool enabled)
+{
+  UStatus status = enabled
+    ? ua_location_service_controller_enable_gps (ualc)
+    : ua_location_service_controller_disable_gps (ualc);
+
+  if (status != U_STATUS_SUCCESS)
+    std::cerr << "Error turning GPS " << (enabled?"on":"off") << std::endl;
+}
+
+/***
+****
+***/
+
+bool
+UbuntuAppLocController :: is_location_service_enabled () const
+{
+  UALocationServiceStatusFlags flags = 0;
+
+  return (ualc != nullptr)
+      && (!ua_location_service_controller_query_status (ualc, &flags))
+      && (flags & UA_LOCATION_SERVICE_ENABLED);
+}
+
+void
+UbuntuAppLocController :: set_location_service_enabled (bool enabled)
+{
+  UStatus status = enabled
+    ? ua_location_service_controller_enable_service (ualc)
+    : ua_location_service_controller_disable_service (ualc);
+
+  if (status != U_STATUS_SUCCESS)
+    std::cerr << "Error turning Location Service " << (enabled?"on":"off")
+              << std::endl;
+}

=== added file 'src/controller-ualc.h'
--- src/controller-ualc.h	1970-01-01 00:00:00 +0000
+++ src/controller-ualc.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#ifndef __INDICATOR_LOCATION_CONTROLLER_UALC__H__
+#define __INDICATOR_LOCATION_CONTROLLER_UALC__H__
+
+#include <ubuntu/status.h>
+#include <ubuntu/application/location/controller.h>
+#include <ubuntu/application/location/service.h>
+
+#include "controller.h"
+
+class UbuntuAppLocController: public Controller
+{
+  public:
+
+    UbuntuAppLocController ();
+    virtual ~UbuntuAppLocController();
+
+    bool is_valid () const { return ualc != nullptr; }
+    bool is_gps_enabled () const;
+    bool is_location_service_enabled () const;
+
+    void set_gps_enabled (bool enabled);
+    void set_location_service_enabled (bool enabled);
+
+  private:
+
+    UbuntuApplicationLocationServiceController * ualc;
+
+    static void on_location_service_controller_status_changed (
+                              UALocationServiceStatusFlags, void *);
+};
+
+#endif // __INDICATOR_LOCATION_CONTROLLER_UALC__H__
+
+

=== added file 'src/controller.cc'
--- src/controller.cc	1970-01-01 00:00:00 +0000
+++ src/controller.cc	2013-08-26 21:42:23 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#include "controller.h"
+
+void
+Controller :: add_listener (ControllerListener * l)
+{
+  listeners.insert (l);
+}
+
+void
+Controller :: remove_listener (ControllerListener * l)
+{
+  listeners.erase (l);
+}
+
+void
+Controller :: notify_gps_enabled (bool enabled)
+{
+  for (auto it : listeners)
+    it->on_gps_enabled_changed (enabled);
+}
+
+void
+Controller :: notify_location_service_enabled (bool enabled)
+{
+  for (auto it : listeners)
+    it->on_location_service_enabled_changed (enabled);
+}

=== added file 'src/controller.h'
--- src/controller.h	1970-01-01 00:00:00 +0000
+++ src/controller.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#ifndef __INDICATOR_LOCATION_CONTROLLER_H__
+#define __INDICATOR_LOCATION_CONTROLLER_H__
+
+#include <set>
+
+class ControllerListener
+{
+  public:
+    ControllerListener() {}
+    virtual ~ControllerListener() {}
+
+  public:
+    virtual void on_gps_enabled_changed (bool is_enabled) = 0;
+    virtual void on_location_service_enabled_changed (bool is_enabled) = 0;
+};
+
+class Controller
+{
+  public:
+
+    Controller () {}
+    virtual ~Controller() {}
+
+    void add_listener (ControllerListener *);
+    void remove_listener (ControllerListener *);
+
+    virtual bool is_valid () const = 0;
+    virtual bool is_gps_enabled () const = 0;
+    virtual bool is_location_service_enabled () const = 0;
+
+    virtual void set_gps_enabled (bool enabled) = 0;
+    virtual void set_location_service_enabled (bool enabled) = 0;
+
+  private:
+
+    std::set<ControllerListener*> listeners;
+
+  protected:
+
+    void notify_gps_enabled (bool);
+    void notify_location_service_enabled (bool);
+};
+
+#endif // __INDICATOR_LOCATION_CONTROLLER_H__

=== removed file 'src/indicator-location.c'
--- src/indicator-location.c	2013-06-26 18:35:13 +0000
+++ src/indicator-location.c	1970-01-01 00:00:00 +0000
@@ -1,587 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Ted Gould <[e-mail]>
- */
-
-#include <glib/gi18n.h>
-
-#include <libappindicator/app-indicator.h>
-
-#include <geoclue/geoclue-master.h>
-#include <geoclue/geoclue-master-client.h>
-
-/* Base variables */
-AppIndicator * indicator = NULL;
-GMainLoop * mainloop = NULL;
-
-/* Menu items */
-GtkMenuItem * accuracy_item = NULL;
-GtkMenuItem * details_item = NULL;
-
-gboolean has_location_details = FALSE;
-GtkMenuItem * lat_item = NULL;
-GtkMenuItem * lon_item = NULL;
-GtkMenuItem * alt_item = NULL;
-
-GtkMenuItem * detail_sep_item = NULL;
-
-gboolean has_address_details = FALSE;
-GtkMenuItem * ccode_item = NULL;
-GtkMenuItem * country_item = NULL;
-GtkMenuItem * region_item = NULL;
-GtkMenuItem * locality_item = NULL;
-GtkMenuItem * area_item = NULL;
-GtkMenuItem * postcode_item = NULL;
-GtkMenuItem * street_item = NULL;
-GtkMenuItem * timezone_item = NULL;
-
-/* Geoclue trackers */
-static GeoclueMasterClient * geo_master = NULL;
-static GeoclueAddress * geo_address = NULL;
-static GeocluePosition * geo_position = NULL;
-
-/* Prototypes */
-static void geo_client_invalid (GeoclueMasterClient * client, gpointer user_data);
-static void geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * path, GError * error, gpointer user_data);
-
-
-/* Update accuracy */
-static void
-update_accuracy (GeoclueAccuracyLevel level)
-{
-	const char * icon = NULL;
-	const char * icon_desc = NULL;
-	const char * item_text = NULL;
-	gboolean details_sensitive = TRUE;
-	
-	switch (level) {
-	case GEOCLUE_ACCURACY_LEVEL_NONE:
-		icon = "indicator-location-unknown";
-		icon_desc = _("Location accuracy unknown");
-		item_text = _("Accuracy:\xE2\x80\x82Unknown");
-		details_sensitive = FALSE;
-		break;
-	case GEOCLUE_ACCURACY_LEVEL_COUNTRY:
-	case GEOCLUE_ACCURACY_LEVEL_REGION:
-	case GEOCLUE_ACCURACY_LEVEL_LOCALITY:
-		icon = "indicator-location-region";
-		icon_desc = _("Location regional accuracy");
-		item_text = _("Accuracy:\xE2\x80\x82Regional");
-		details_sensitive = TRUE;
-		break;
-	case GEOCLUE_ACCURACY_LEVEL_POSTALCODE:
-	case GEOCLUE_ACCURACY_LEVEL_STREET:
-		icon = "indicator-location-neighborhood";
-		icon_desc = _("Location neighborhood accuracy");
-		item_text = _("Accuracy:\xE2\x80\x82Neighborhood");
-		details_sensitive = TRUE;
-		break;
-	case GEOCLUE_ACCURACY_LEVEL_DETAILED:
-		icon = "indicator-location-specific";
-		icon_desc = _("Location specific accuracy");
-		item_text = _("Accuracy:\xE2\x80\x82" "Detailed");
-		details_sensitive = TRUE;
-		break;
-	default:
-		g_assert_not_reached();
-	}
-
-	if (indicator != NULL) {
-		app_indicator_set_icon_full(indicator, icon, icon_desc);
-	}
-
-	if (accuracy_item != NULL) {
-		gtk_menu_item_set_label(accuracy_item, item_text);
-	}
-
-	if (details_item != NULL) {
-		gtk_widget_set_sensitive(GTK_WIDGET(details_item), details_sensitive);
-	}
-
-	return;
-}
-
-struct {
-	const gchar * hash_value;
-	const gchar * item_label;
-	GtkMenuItem ** item;
-} address_detail_table[] = {
-	{GEOCLUE_ADDRESS_KEY_COUNTRYCODE,  N_("Country Code:\xE2\x80\x82%s"),  &ccode_item},
-	{GEOCLUE_ADDRESS_KEY_COUNTRY,      N_("Country:\xE2\x80\x82%s"),       &country_item},
-	{GEOCLUE_ADDRESS_KEY_REGION,       N_("Region:\xE2\x80\x82%s"),        &region_item},
-	{GEOCLUE_ADDRESS_KEY_LOCALITY,     N_("Locality:\xE2\x80\x82%s"),      &locality_item},
-	{GEOCLUE_ADDRESS_KEY_AREA,         N_("Area:\xE2\x80\x82%s"),          &area_item},
-	{GEOCLUE_ADDRESS_KEY_POSTALCODE,   N_("Zip Code:\xE2\x80\x82%s"),      &postcode_item},
-	{GEOCLUE_ADDRESS_KEY_STREET,       N_("Street:\xE2\x80\x82%s"),        &street_item},
-	{"timezone",                       N_("Timezone:\xE2\x80\x82%s"),      &timezone_item},
-	{NULL, NULL, NULL}
-};
-
-void
-update_address_details (GHashTable * details)
-{
-	int i;
-	has_address_details = FALSE;
-
-	for (i = 0; address_detail_table[i].hash_value != NULL; i++) {
-		const gchar * hashval = NULL;
-		if (g_hash_table_contains(details, address_detail_table[i].hash_value)) {
-			hashval = g_hash_table_lookup(details, address_detail_table[i].hash_value);
-			
-			if (hashval[0] == '\0') {
-				hashval = NULL;
-			}
-		}
-
-		if (hashval != NULL) {
-			gchar * string = g_strdup_printf(_(address_detail_table[i].item_label), hashval);
-			gtk_menu_item_set_label(*address_detail_table[i].item, string);
-			g_free(string);
-
-			gtk_widget_show(GTK_WIDGET(*address_detail_table[i].item));
-
-			has_address_details = TRUE;
-		} else {
-			gtk_widget_hide(GTK_WIDGET(*address_detail_table[i].item));
-		}
-	}
-
-	if (has_location_details && has_address_details) {
-		gtk_widget_show(GTK_WIDGET(detail_sep_item));
-	} else {
-		gtk_widget_hide(GTK_WIDGET(detail_sep_item));
-	}
-
-	return;
-}
-
-/* Callback from getting the address */
-static void
-geo_address_cb (GeoclueAddress * address, int timestamp, GHashTable * addy_data, GeoclueAccuracy * accuracy, GError * error, gpointer user_data)
-{
-	if (error != NULL) {
-		g_warning("Unable to get Geoclue address: %s", error->message);
-		g_clear_error (&error);
-		return;
-	}
-
-	GeoclueAccuracyLevel level = GEOCLUE_ACCURACY_LEVEL_NONE;
-	geoclue_accuracy_get_details(accuracy, &level, NULL, NULL);
-	update_accuracy(level);
-
-	update_address_details(addy_data);
-
-	return;
-}
-
-/* Callback from getting the position */
-static void
-geo_position_cb (GeocluePosition * position, GeocluePositionFields field, int timestamp, double lat, double lon, double alt, GeoclueAccuracy * accuracy, GError * error, gpointer user_data)
-{
-	if (error != NULL) {
-		g_warning("Unable to get Geoclue position: %s", error->message);
-		g_clear_error (&error);
-		return;
-	}
-
-	has_location_details = FALSE;
-
-	if (field & GEOCLUE_POSITION_FIELDS_LATITUDE && lat != 0.0) {
-		gchar * label = g_strdup_printf(_("Latitude:\xE2\x80\x82%f"), lat);
-		gtk_menu_item_set_label(lat_item, label);
-		g_free(label);
-
-		gtk_widget_show(GTK_WIDGET(lat_item));
-		has_location_details = TRUE;
-	} else {
-		gtk_widget_hide(GTK_WIDGET(lat_item));
-	}
-
-	if (field & GEOCLUE_POSITION_FIELDS_LONGITUDE && lon != 0.0) {
-		gchar * label = g_strdup_printf(_("Longitude:\xE2\x80\x82%f"), lon);
-		gtk_menu_item_set_label(lon_item, label);
-		g_free(label);
-
-		gtk_widget_show(GTK_WIDGET(lon_item));
-		has_location_details = TRUE;
-	} else {
-		gtk_widget_hide(GTK_WIDGET(lon_item));
-	}
-
-	if (field & GEOCLUE_POSITION_FIELDS_ALTITUDE && alt != 0.0) {
-		gchar * label = g_strdup_printf(_("Altitude:\xE2\x80\x82%f"), alt);
-		gtk_menu_item_set_label(alt_item, label);
-		g_free(label);
-
-		gtk_widget_show(GTK_WIDGET(alt_item));
-		has_location_details = TRUE;
-	} else {
-		gtk_widget_hide(GTK_WIDGET(alt_item));
-	}
-
-	if (has_location_details && has_address_details) {
-		gtk_widget_show(GTK_WIDGET(detail_sep_item));
-	} else {
-		gtk_widget_hide(GTK_WIDGET(detail_sep_item));
-	}
-
-	return;
-}
-
-/* Clean up the reference we kept to the address and make sure to
-   drop the signals incase someone else has one. */
-static void
-geo_address_clean (void)
-{
-	if (geo_address == NULL) {
-		return;
-	}
-
-	g_signal_handlers_disconnect_by_func(G_OBJECT(geo_address), geo_address_cb, NULL);
-	g_object_unref(G_OBJECT(geo_address));
-
-	geo_address = NULL;
-
-	return;
-}
-
-/* Clean up the reference we kept to the position and make sure to
-   drop the signals incase someone else has one. */
-static void
-geo_position_clean (void)
-{
-	if (geo_position == NULL) {
-		return;
-	}
-
-	g_signal_handlers_disconnect_by_func(G_OBJECT(geo_position), geo_position_cb, NULL);
-	g_clear_object(&geo_position);
-
-	return;
-}
-
-
-/* Clean up and remove all signal handlers from the client as we
-   unreference it as well. */
-static void
-geo_client_clean (void)
-{
-	if (geo_master == NULL) {
-		return;
-	}
-
-	g_signal_handlers_disconnect_by_func(G_OBJECT(geo_master), geo_client_invalid, NULL);
-	g_object_unref(G_OBJECT(geo_master));
-
-	geo_master = NULL;
-
-	return;
-}
-
-/* Callback from async creation of a position */
-static void
-geo_create_position (GeoclueMasterClient * master, GeocluePosition * position, GError * error, gpointer user_data)
-{
-	if (error != NULL) {
-		g_warning("Unable to create GeoClue position: %s", error->message);
-		g_clear_error (&error);
-		return;
-	}
-
-	/* We shouldn't have created a new position if we already had one
-	   so this is a warning.  But, it really is only a mem-leak so we
-	   don't need to error out. */
-	g_warn_if_fail(geo_position == NULL);
-	geo_position_clean();
-
-	g_debug("Created Geoclue Position");
-	geo_position = position;
-	g_object_ref(G_OBJECT(geo_position));
-
-	geoclue_position_get_position_async(geo_position, geo_position_cb, NULL);
-
-	g_signal_connect(G_OBJECT(position), "position-changed", G_CALLBACK(geo_position_cb), NULL);
-
-	return;
-}
-
-/* Callback from creating the address */
-static void
-geo_create_address (GeoclueMasterClient * master, GeoclueAddress * address, GError * error, gpointer user_data)
-{
-	if (error != NULL) {
-		g_warning("Unable to create GeoClue address: %s", error->message);
-		g_clear_error (&error);
-		return;
-	}
-
-	/* We shouldn't have created a new address if we already had one
-	   so this is a warning.  But, it really is only a mem-leak so we
-	   don't need to error out. */
-	g_warn_if_fail(geo_address == NULL);
-	geo_address_clean();
-
-	g_debug("Created Geoclue Address");
-	geo_address = address;
-	g_object_ref(G_OBJECT(geo_address));
-
-	geoclue_address_get_address_async(geo_address, geo_address_cb, NULL);
-
-	g_signal_connect(G_OBJECT(address), "address-changed", G_CALLBACK(geo_address_cb), NULL);
-
-	return;
-}
-
-/* Callback from setting requirements */
-static void
-geo_req_set (GeoclueMasterClient * master, GError * error, gpointer user_data)
-{
-	if (error != NULL) {
-		g_warning("Unable to set Geoclue requirements: %s", error->message);
-		g_clear_error (&error);
-	}
-	return;
-}
-
-/* Client is killing itself rather oddly */
-static void
-geo_client_invalid (GeoclueMasterClient * client, gpointer user_data)
-{
-	g_warning("Master client invalid, rebuilding.");
-
-	/* Client changes we can assume the address is now invalid so we
-	   need to unreference the one we had. */
-	geo_address_clean();
-	geo_position_clean();
-
-	/* And our master client is invalid */
-	geo_client_clean();
-
-	GeoclueMaster * master = geoclue_master_get_default();
-	geoclue_master_create_client_async(master, geo_create_client, NULL);
-
-	update_accuracy(GEOCLUE_ACCURACY_LEVEL_NONE);
-
-	return;
-}
-
-/* Callback from creating the client */
-static void
-geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * path, GError * error, gpointer user_data)
-{
-	g_debug("Created Geoclue client at: %s", path);
-
-	geo_master = client;
-
-	if (error != NULL) {
-		g_warning("Unable to get a GeoClue client!  '%s'  Geolocation based timezone support will not be available.", error->message);
-		g_clear_error (&error);
-		return;
-	}
-
-	if (geo_master == NULL) {
-		g_warning(_("Unable to get a GeoClue client!  Geolocation based timezone support will not be available."));
-		return;
-	}
-
-	g_object_ref(G_OBJECT(geo_master));
-
-	/* New client, make sure we don't have an address hanging on */
-	geo_address_clean();
-	geo_position_clean();
-
-	geoclue_master_client_set_requirements_async(geo_master,
-	                                             GEOCLUE_ACCURACY_LEVEL_REGION,
-	                                             0,
-	                                             FALSE,
-	                                             GEOCLUE_RESOURCE_ALL,
-	                                             geo_req_set,
-	                                             NULL);
-
-	geoclue_master_client_create_address_async(geo_master, geo_create_address, NULL);
-	geoclue_master_client_create_position_async(geo_master, geo_create_position, NULL);
-
-	g_signal_connect(G_OBJECT(client), "invalidated", G_CALLBACK(geo_client_invalid), NULL);
-
-	return;
-}
-
-void
-open_maps (void)
-{
-	g_spawn_command_line_async("emerillon", NULL);
-	return;
-}
-
-void
-open_debuglocation (void)
-{
-	g_spawn_command_line_async("geoclue-test-gui", NULL);
-	return;
-}
-
-GtkWidget *
-build_details_items (void)
-{
-	GtkWidget * menu = gtk_menu_new();
-
-	lat_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(lat_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(lat_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(lat_item));
-
-	lon_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(lon_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(lon_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(lon_item));
-
-	alt_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(alt_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(alt_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(alt_item));
-
-	detail_sep_item = GTK_MENU_ITEM(gtk_separator_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(detail_sep_item));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(detail_sep_item));
-
-	ccode_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(ccode_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(ccode_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(ccode_item));
-
-	country_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(country_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(country_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(country_item));
-
-	region_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(region_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(region_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(region_item));
-
-	locality_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(locality_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(locality_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(locality_item));
-
-	area_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(area_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(area_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(area_item));
-
-	postcode_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(postcode_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(postcode_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(postcode_item));
-
-	street_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(street_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(street_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(street_item));
-
-	timezone_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_hide(GTK_WIDGET(timezone_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(timezone_item), FALSE);
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(timezone_item));
-
-	return menu;
-}
-
-void
-build_indicator (void)
-{
-	indicator = app_indicator_new_with_path("indicator-location", "indicator-location-unknown", APP_INDICATOR_CATEGORY_SYSTEM_SERVICES, ICON_DIR);
-	app_indicator_set_title(indicator, _("Location"));
-	app_indicator_set_status(indicator, APP_INDICATOR_STATUS_ACTIVE);
-
-	GtkMenu * menu = GTK_MENU(gtk_menu_new());
-
-	accuracy_item = GTK_MENU_ITEM(gtk_menu_item_new());
-	gtk_widget_show(GTK_WIDGET(accuracy_item));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(accuracy_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(accuracy_item), FALSE);
-
-	details_item = GTK_MENU_ITEM(gtk_menu_item_new_with_label(_("Details")));
-	gtk_widget_show(GTK_WIDGET(details_item));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(details_item));
-	gtk_widget_set_sensitive(GTK_WIDGET(details_item), FALSE);
-
-	gtk_menu_item_set_submenu(details_item, build_details_items());
-
-	gchar * maps_in_path = g_find_program_in_path("emerillon");
-	if (maps_in_path != NULL) {
-		g_free(maps_in_path);
-		maps_in_path = NULL;
-
-		GtkWidget * sep = gtk_separator_menu_item_new();
-		gtk_widget_show(sep);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(sep));
-
-		GtkWidget * maps = gtk_menu_item_new_with_label(_("Open Map…"));
-		gtk_widget_show(maps);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(maps));
-		g_signal_connect(G_OBJECT(maps), "activate", G_CALLBACK(open_maps), NULL);
-	}
-
-	gchar * geoclue_in_path = g_find_program_in_path("geoclue-test-gui");
-	if (geoclue_in_path != NULL) {
-		g_free(geoclue_in_path);
-		geoclue_in_path = NULL;
-
-		GtkWidget * sep = gtk_separator_menu_item_new();
-		gtk_widget_show(sep);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(sep));
-
-		GtkWidget * debugloc = gtk_menu_item_new_with_label(_("Debug Location…"));
-		gtk_widget_show(debugloc);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), GTK_WIDGET(debugloc));
-		g_signal_connect(G_OBJECT(debugloc), "activate", G_CALLBACK(open_debuglocation), NULL);
-	}
-
-	gtk_widget_show(GTK_WIDGET(menu));
-
-	app_indicator_set_menu(indicator, menu);
-
-	update_accuracy(GEOCLUE_ACCURACY_LEVEL_NONE);
-
-	return;
-}
-
-int
-main (int argc, char * argv[])
-{
-	gtk_init(&argc, &argv);
-
-	/* Setup geoclue */
-	GeoclueMaster * master = geoclue_master_get_default();
-	geoclue_master_create_client_async(master, geo_create_client, NULL);
-
-	build_indicator();
-
-	/* Mainloop */
-	mainloop = g_main_loop_new(NULL, FALSE);
-	g_main_loop_run(mainloop);
-
-	/* clean up */
-	g_main_loop_unref(mainloop);
-	mainloop = NULL;
-
-	geo_address_clean();
-	geo_position_clean();
-	geo_client_clean();
-
-	return 0;
-}

=== added file 'src/main.cc'
--- src/main.cc	1970-01-01 00:00:00 +0000
+++ src/main.cc	2013-08-26 21:42:23 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <locale.h>
+#include <glib/gi18n.h>
+#include <glib.h>
+
+//#include "controller-ualc.h"
+#include "controller-mock.h"
+#include "service.h"
+
+static void
+on_name_lost (Service * service G_GNUC_UNUSED, gpointer loop)
+{
+  g_main_loop_quit (static_cast<GMainLoop*>(loop));
+}
+
+int
+main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
+{
+  GMainLoop * loop;
+
+  /* boilerplate i18n */
+  setlocale (LC_ALL, "");
+  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+  textdomain (GETTEXT_PACKAGE);
+ 
+  /* set up the service */
+  loop = g_main_loop_new (nullptr, false);
+  std::shared_ptr<Controller> controller (new MockController());//UbuntuAppLocController ());
+  Service service (controller);
+  service.set_name_lost_callback (on_name_lost, loop);
+  g_main_loop_run (loop);
+
+  /* cleanup */
+  g_main_loop_unref (loop);
+  return 0;
+}

=== added file 'src/phone.cc'
--- src/phone.cc	1970-01-01 00:00:00 +0000
+++ src/phone.cc	2013-08-26 21:42:23 +0000
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#include <array>
+
+#include <glib/gi18n.h>
+
+#include <url-dispatcher.h>
+
+#include "phone.h"
+#include "utils.h" // GObjectDeleter
+
+#define PROFILE_NAME "phone"
+
+Phone :: Phone (std::shared_ptr<Controller> controller_,
+                std::shared_ptr<GSimpleActionGroup> action_group_):
+  controller (controller_),
+  menu (create_menu ()),
+  action_group (action_group_)
+{
+  controller->add_listener (this);
+
+  /* create the actions & add them to the group */
+  std::array<GSimpleAction*, 4> actions = { create_root_action(),
+                                            create_detection_enabled_action(),
+                                            create_gps_enabled_action(),
+                                            create_settings_action() };
+  for (auto a : actions)
+    {
+      g_action_map_add_action (G_ACTION_MAP(action_group.get()), G_ACTION(a));
+      g_object_unref (a);
+    }
+}
+
+Phone :: ~Phone ()
+{
+  controller->remove_listener (this);
+}
+
+/***
+****
+***/
+
+bool
+Phone :: should_be_visible ()
+{
+  // NB: this is a placeholder for now.
+  // The spec requires that the location indicator be visible iff
+  // an application has accessed location info recently,
+  // but there's not a platform API to support that yet.
+
+  return true;
+}
+
+GVariant *
+Phone :: action_state_for_root ()
+{
+  GVariantBuilder builder;
+  g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+
+  const char * a11y = _("Location");
+  g_variant_builder_add (&builder, "{sv}", "accessible-desc", g_variant_new_string (a11y));
+
+  gboolean visible = should_be_visible ();
+  g_variant_builder_add (&builder, "{sv}", "visible", g_variant_new_boolean (visible));
+
+  const char * icon_name = "gps";
+  GIcon * icon = g_themed_icon_new_with_default_fallbacks (icon_name);
+  g_variant_builder_add (&builder, "{sv}", "icon", g_icon_serialize (icon));
+  g_object_unref (icon);
+
+  return g_variant_builder_end (&builder);
+}
+
+#define HEADER_ACTION_KEY PROFILE_NAME"-header"
+
+GSimpleAction *
+Phone :: create_root_action ()
+{
+  return g_simple_action_new_stateful (HEADER_ACTION_KEY,
+                                       nullptr,
+                                       action_state_for_root ());
+}
+
+/***
+****
+***/
+
+#define LOCATION_ACTION_KEY "location-detection-enabled"
+
+GVariant *
+Phone :: action_state_for_location_detection ()
+{
+  return g_variant_new_boolean (controller->is_location_service_enabled());
+}
+
+void
+Phone :: on_location_service_enabled_changed (bool is_enabled G_GNUC_UNUSED)
+{
+  GAction * action = g_action_map_lookup_action (G_ACTION_MAP(action_group.get()), LOCATION_ACTION_KEY);
+  g_simple_action_set_state (G_SIMPLE_ACTION(action), action_state_for_location_detection());
+}
+
+void
+Phone :: on_detection_location_activated (GSimpleAction * action,
+                                          GVariant      * parameter G_GNUC_UNUSED,
+                                          gpointer        gself)
+{
+  GVariant * state = g_action_get_state (G_ACTION (action));
+  static_cast<Phone*>(gself)->controller->set_location_service_enabled (!g_variant_get_boolean (state));
+  g_variant_unref (state);
+}
+
+GSimpleAction *
+Phone :: create_detection_enabled_action ()
+{
+  GSimpleAction * action;
+
+  action = g_simple_action_new_stateful (LOCATION_ACTION_KEY,
+                                         nullptr,
+                                         action_state_for_location_detection());
+
+  g_simple_action_set_enabled (action, controller->is_valid());
+
+  g_signal_connect (action, "activate",
+                    G_CALLBACK(on_detection_location_activated), this);
+
+  return action;
+}
+
+/***
+****
+***/
+
+#define GPS_ACTION_KEY "gps-detection-enabled"
+
+GVariant *
+Phone :: action_state_for_gps_detection ()
+{
+  return g_variant_new_boolean (controller->is_gps_enabled());
+}
+
+void
+Phone :: on_gps_enabled_changed (bool is_enabled G_GNUC_UNUSED)
+{
+  GAction * action = g_action_map_lookup_action (G_ACTION_MAP(action_group.get()), GPS_ACTION_KEY);
+  g_simple_action_set_state (G_SIMPLE_ACTION(action), action_state_for_gps_detection());
+}
+
+void
+Phone :: on_detection_gps_activated (GSimpleAction * action,
+                                     GVariant      * parameter   G_GNUC_UNUSED,
+                                     gpointer        gself)
+{
+  GVariant * state = g_action_get_state (G_ACTION (action));
+  static_cast<Phone*>(gself)->controller->set_gps_enabled (!g_variant_get_boolean (state));
+  g_variant_unref (state);
+}
+
+GSimpleAction *
+Phone :: create_gps_enabled_action ()
+{
+  GSimpleAction * action;
+
+  action = g_simple_action_new_stateful (GPS_ACTION_KEY,
+                                         nullptr,
+                                         action_state_for_gps_detection());
+
+  g_simple_action_set_enabled (action, controller->is_valid());
+
+  g_signal_connect (action, "activate",
+                    G_CALLBACK(on_detection_gps_activated), this);
+
+  return action;
+}
+
+
+/***
+****
+***/
+
+#define SETTINGS_ACTION_KEY "settings"
+
+namespace
+{
+  void
+  on_uri_dispatched (const gchar * uri,
+                     gboolean      success     G_GNUC_UNUSED,
+                     gpointer      user_data   G_GNUC_UNUSED)
+  {
+    if (!success)
+      g_warning ("Unable to activate '%s'", uri);
+  }
+
+  void
+  on_settings_activated (GSimpleAction * simple      G_GNUC_UNUSED,
+                         GVariant      * parameter,
+                         gpointer        user_data   G_GNUC_UNUSED)
+  {
+    const char * key = g_variant_get_string (parameter, nullptr);
+    gchar * uri = g_strdup_printf ("settings://system/%s", key);
+    url_dispatch_send (uri, on_uri_dispatched, nullptr);
+    g_free (uri);
+  }
+}
+
+GSimpleAction *
+Phone :: create_settings_action ()
+{
+  GSimpleAction * action;
+
+  action = g_simple_action_new (SETTINGS_ACTION_KEY, G_VARIANT_TYPE_STRING);
+
+  g_signal_connect (action, "activate",
+                    G_CALLBACK(on_settings_activated), nullptr);
+
+  return action;
+}
+
+/***
+****
+***/
+
+std::shared_ptr <GMenu>
+Phone :: create_menu ()
+{
+  GMenu * menu;
+  GMenu * submenu;
+  GMenuItem * header;
+
+  /* create the submenu */
+  submenu = g_menu_new ();
+  g_menu_append (submenu, _("Location detection"), "indicator." LOCATION_ACTION_KEY);
+  g_menu_append (submenu, _("GPS"), "indicator." GPS_ACTION_KEY);
+  g_menu_append (submenu, _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::location");
+
+  /* add the submenu to a new header */
+  header = g_menu_item_new (nullptr, "indicator." HEADER_ACTION_KEY);
+  g_menu_item_set_attribute (header, "x-canonical-type", "s", "com.canonical.indicator.root");
+  g_menu_item_set_submenu (header, G_MENU_MODEL (submenu));
+  g_object_unref (submenu);
+
+  /* add the header to a new menu */
+  menu = g_menu_new ();
+  g_menu_append_item (menu, header);
+  g_object_unref (header);
+
+  return std::shared_ptr<GMenu>(menu, GObjectDeleter());
+}

=== added file 'src/phone.h'
--- src/phone.h	1970-01-01 00:00:00 +0000
+++ src/phone.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#ifndef __INDICATOR_LOCATION_PHONE_H__
+#define __INDICATOR_LOCATION_PHONE_H__
+
+#include <memory>
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "controller.h"
+
+class Phone: public ControllerListener
+{
+  public:
+    Phone (std::shared_ptr<Controller> controller,
+           std::shared_ptr<GSimpleActionGroup> action_group);
+    virtual ~Phone ();
+    std::shared_ptr<GMenu> get_menu () { return menu; }
+
+  protected:
+    std::shared_ptr<Controller> controller;
+    virtual void on_gps_enabled_changed (bool is_enabled);
+    virtual void on_location_service_enabled_changed (bool is_enabled);
+
+  private:
+    std::shared_ptr<GMenu> menu;
+    std::shared_ptr<GSimpleActionGroup> action_group;
+
+  private:
+    std::shared_ptr<GMenu> create_menu ();
+
+  private:
+    bool should_be_visible ();
+    GVariant * action_state_for_root ();
+    GSimpleAction * create_root_action ();
+
+  private:
+    GVariant * action_state_for_location_detection ();
+    GSimpleAction * create_detection_enabled_action ();
+    static void on_detection_location_activated (GSimpleAction*, GVariant*, gpointer);
+
+  private:
+    GVariant * action_state_for_gps_detection ();
+    GSimpleAction * create_gps_enabled_action ();
+    static void on_detection_gps_activated (GSimpleAction*, GVariant*, gpointer);
+
+  private:
+    GSimpleAction * create_settings_action ();
+};
+
+#endif /* __INDICATOR_LOCATION_PHONE_H__ */

=== added file 'src/service.cc'
--- src/service.cc	1970-01-01 00:00:00 +0000
+++ src/service.cc	2013-08-26 21:42:23 +0000
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+
+#include "service.h"
+
+#define BUS_NAME "com.canonical.indicator.location"
+#define BUS_PATH "/com/canonical/indicator/location"
+
+/**
+***
+**/
+
+Service :: Service (std::shared_ptr<Controller> controller):
+  action_group (g_simple_action_group_new(), GObjectDeleter()),
+  phone_profile (controller, action_group),
+  name_lost_callback (nullptr),
+  name_lost_user_data (0),
+  action_group_export_id (0),
+  bus_own_id (0)
+{
+  bus_own_id = g_bus_own_name (G_BUS_TYPE_SESSION,
+                               BUS_NAME,
+                               G_BUS_NAME_OWNER_FLAGS_NONE,
+                               on_bus_acquired,
+                               nullptr,
+                               on_name_lost,
+                               this,
+                               nullptr);
+}
+
+Service :: ~Service ()
+{
+  if (connection)
+    unexport ();
+
+  if (bus_own_id != 0)
+    g_bus_unown_name (bus_own_id);
+}
+
+void
+Service :: set_name_lost_callback (name_lost_callback_func callback, void* user_data)
+{
+  name_lost_callback = callback;
+  name_lost_user_data = user_data;
+}
+
+void
+Service :: unexport ()
+{
+  g_return_if_fail (connection);
+
+  // unexport the menu(s)
+  for (auto& id : exported_menus)
+    g_dbus_connection_unexport_menu_model (connection.get(), id);
+  exported_menus.clear ();
+
+  // unexport the action group
+  if (action_group_export_id != 0)
+    {
+      g_dbus_connection_unexport_action_group (connection.get(), action_group_export_id);
+      action_group_export_id = 0;
+    }
+}
+
+/***
+****  GDBus
+***/
+
+void
+Service :: on_name_lost (GDBusConnection * connection,
+                         const char      * name,
+                         gpointer          gself)
+{
+  g_debug ("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, connection);
+
+  static_cast<Service*>(gself)->on_name_lost (connection, name);
+}
+void
+Service :: on_name_lost (GDBusConnection * connection,
+                         const char      * name)
+{
+  g_debug ("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, connection);
+
+  if (name_lost_callback != nullptr)
+    (name_lost_callback)(this, name_lost_user_data);
+}
+
+void
+Service :: on_bus_acquired (GDBusConnection * connection,
+                            const char      * name,
+                            gpointer          gself)
+{
+  static_cast<Service*>(gself)->on_bus_acquired (connection, name);
+}
+void
+Service :: on_bus_acquired (GDBusConnection * connection,
+                            const char * name)
+{
+  g_debug ("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, connection);
+
+  this->connection.reset (G_DBUS_CONNECTION (g_object_ref(connection)));
+
+  GError * error = nullptr;
+
+  /* export the action group */
+
+  unsigned int export_id = g_dbus_connection_export_action_group (connection,
+                                                                  BUS_PATH,
+                                                                  G_ACTION_GROUP (action_group.get()),
+                                                                  &error);
+  if (error != nullptr)
+    {
+      g_warning ("Unable to export action group: %s", error->message);
+      g_clear_error (&error);
+    }
+  else
+    {
+      action_group_export_id = export_id;
+    }
+
+  /* export the menu(s) */
+
+  struct {
+    std::shared_ptr<GMenu> menu;
+    const char * path;
+  } menus[] = {
+    { phone_profile.get_menu(), BUS_PATH "/phone" }
+  };
+
+  for (unsigned int i=0, n=G_N_ELEMENTS(menus); i<n; i++)
+    { 
+      export_id = g_dbus_connection_export_menu_model (connection,
+                                                       menus[i].path,
+                                                       G_MENU_MODEL (menus[i].menu.get()),
+                                                       &error);
+      if (error != nullptr)
+        {
+          g_warning ("Unable to export phone menu: %s", error->message);
+          g_clear_error (&error);
+        }
+      else
+        {
+          exported_menus.insert (export_id);
+        }
+    }
+}
+

=== added file 'src/service.h'
--- src/service.h	1970-01-01 00:00:00 +0000
+++ src/service.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __INDICATOR_LOCATION_SERVICE_H__
+#define __INDICATOR_LOCATION_SERVICE_H__
+
+#include <memory>
+#include <set>
+
+#include "controller.h"
+#include "phone.h"
+#include "utils.h" // GObjectDeleter
+
+class Service
+{
+  public:
+    Service (std::shared_ptr<Controller> controller);
+    virtual ~Service ();
+
+  private:
+    std::shared_ptr<GSimpleActionGroup> action_group;
+    std::unique_ptr<GDBusConnection,GObjectDeleter> connection;
+    Phone phone_profile;
+
+  public:
+    typedef void (*name_lost_callback_func)(Service*, void* user_data);
+    void set_name_lost_callback (name_lost_callback_func callback, void* user_data);
+  private:
+    name_lost_callback_func name_lost_callback;
+    void * name_lost_user_data;
+
+
+  private:
+    unsigned int action_group_export_id;
+    std::set<unsigned int> exported_menus;
+    void unexport ();
+
+
+  private: // DBus callbacks
+    unsigned int bus_own_id;
+    void on_name_lost (GDBusConnection*, const char*);
+    void on_bus_acquired (GDBusConnection*, const char*);
+    static void on_name_lost (GDBusConnection*, const char*, gpointer);
+    static void on_bus_acquired (GDBusConnection*, const char*, gpointer);
+};
+
+#endif /* __INDICATOR_LOCATION_SERVICE_H__ */
+

=== added file 'src/utils.h'
--- src/utils.h	1970-01-01 00:00:00 +0000
+++ src/utils.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __INDICATOR_LOCATION_UTILS_H__
+#define __INDICATOR_LOCATION_UTILS_H__
+
+#include <glib.h>
+#include <gio/gio.h>
+
+struct GObjectDeleter
+{
+  void operator()(GObject            * o) { g_object_unref (o); }
+
+  void operator()(GMenu              * o) { operator()(G_OBJECT(o)); }
+  void operator()(GDBusConnection    * o) { operator()(G_OBJECT(o)); }
+  void operator()(GSimpleActionGroup * o) { operator()(G_OBJECT(o)); }
+};
+
+#endif /* __INDICATOR_LOCATION_UTILS_H__ */
+

=== added directory 'tests'
=== added file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/CMakeLists.txt	2013-08-26 21:42:23 +0000
@@ -0,0 +1,32 @@
+###
+###  Google Test Framework
+###
+
+add_library (gtest STATIC 
+             ${GTEST_SOURCE_DIR}/gtest-all.cc 
+             ${GTEST_SOURCE_DIR}/gtest_main.cc)
+
+###
+###  phone-test
+###
+
+set (PHONE_TEST "phone-test")
+add_executable (${PHONE_TEST} phone-test.cc)
+add_test (${PHONE_TEST} ${PHONE_TEST})
+
+
+###
+###  globals
+###
+
+set (ALL_TESTS ${PHONE_TEST})
+
+set_property (TARGET ${ALL_TESTS}
+              APPEND_STRING PROPERTY COMPILE_FLAGS "${CC_WARNING_ARGS} -g --std=c++11")
+
+set_property (TARGET ${ALL_TESTS}
+              APPEND PROPERTY LINK_LIBRARIES libindicator-location-service gtest ${GTEST_LIBS} ${GCOV_LIBS})
+
+set_property (TARGET ${ALL_TESTS} gtest
+              APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR} ${SERVICE_INCLUDE_DIRS} ${GTEST_INCLUDE_DIR})
+

=== added file 'tests/gtest-dbus-fixture.h'
--- tests/gtest-dbus-fixture.h	1970-01-01 00:00:00 +0000
+++ tests/gtest-dbus-fixture.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include <gtest/gtest.h>
+
+/***
+****
+***/
+
+class GTestDBusFixture : public ::testing::Test
+{
+  private:
+
+    static void
+    on_bus_opened (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gself)
+    {
+      GTestDBusFixture * self = static_cast<GTestDBusFixture*>(gself);
+
+      GError * err = nullptr;
+      self->conn = g_bus_get_finish (res, &err);
+      g_assert_no_error (err);
+
+      g_main_loop_quit (self->loop);
+    }
+
+    static void
+    on_bus_closed (GObject * o G_GNUC_UNUSED, GAsyncResult * res, gpointer gself)
+    {
+      GTestDBusFixture * self = static_cast<GTestDBusFixture*>(gself);
+
+      GError * err = nullptr;
+      g_dbus_connection_close_finish (self->conn, res, &err);
+      g_assert_no_error (err);
+
+      g_main_loop_quit (self->loop);
+    }
+
+    static gboolean
+    wait_for_signal__timeout (gpointer name)
+    {
+      g_error ("%s: timed out waiting for signal '%s'", G_STRLOC, (char*)name);
+      return G_SOURCE_REMOVE;
+    }
+
+  protected:
+
+    virtual void SetUp ()
+    {
+      conn = nullptr;
+      test_dbus = nullptr;
+      loop = nullptr;
+
+      //g_setenv ("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, TRUE);
+      //g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
+      //g_debug ("SCHEMA_DIR is %s", SCHEMA_DIR);
+
+      // pull up a test dbus
+      loop = g_main_loop_new (nullptr, FALSE);
+      test_dbus = g_test_dbus_new (G_TEST_DBUS_NONE);
+      //g_test_dbus_add_service_dir (test_dbus, INDICATOR_SERVICE_DIR);
+      //g_debug ("INDICATOR_SERVICE_DIR is %s", INDICATOR_SERVICE_DIR);
+      g_test_dbus_up (test_dbus);
+      const char * address;
+      address = g_test_dbus_get_bus_address (test_dbus);
+      g_setenv ("DBUS_SYSTEM_BUS_ADDRESS", address, TRUE);
+      g_debug ("test_dbus's address is %s", address);
+
+      // wait for the GDBusConnection before returning
+      g_bus_get (G_BUS_TYPE_SYSTEM, nullptr, on_bus_opened, this);
+      g_main_loop_run (loop);
+    }
+
+    virtual void TearDown()
+    {
+      // close the bus connection
+      g_dbus_connection_close (conn, nullptr, on_bus_closed, this);
+      g_main_loop_run (loop);
+      g_clear_object (&conn);
+
+      // tear down the test dbus
+      g_test_dbus_down (test_dbus);
+      g_clear_object (&test_dbus);
+
+      g_clear_pointer (&loop, g_main_loop_unref);
+    }
+
+    /* convenience func to loop while waiting for a GObject's signal */
+    void wait_for_signal (gpointer o, const gchar * signal)
+    {
+      const int timeout_seconds = 5; // arbitrary
+
+      // wait for the signal or for timeout, whichever comes first
+      guint handler_id = g_signal_connect_swapped (o, signal,
+                                                   G_CALLBACK(g_main_loop_quit),
+                                                   loop);
+      gulong timeout_id = g_timeout_add_seconds (timeout_seconds,
+                                                 wait_for_signal__timeout,
+                                                 const_cast<gchar*>(signal));
+      g_main_loop_run (loop);
+      g_source_remove (timeout_id);
+      g_signal_handler_disconnect (o, handler_id);
+    }
+
+    /* convenience func to loop for N msec */
+    void wait_msec (int msec)
+    {
+      guint id = g_timeout_add (msec, (GSourceFunc)g_main_loop_quit, loop);
+      g_main_loop_run (loop);
+      g_source_remove (id);
+    }
+
+    GMainLoop * loop;
+    GTestDBus * test_dbus;
+    GDBusConnection * conn;
+};

=== added file 'tests/gtest-dbus-indicator-fixture.h'
--- tests/gtest-dbus-indicator-fixture.h	1970-01-01 00:00:00 +0000
+++ tests/gtest-dbus-indicator-fixture.h	2013-08-26 21:42:23 +0000
@@ -0,0 +1,273 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+
+#include "gtest-dbus-fixture.h"
+
+class GTestDBusIndicatorFixture: public GTestDBusFixture
+{
+    typedef GTestDBusFixture super;
+
+    enum { TIME_LIMIT_SEC = 10 };
+
+  private:
+
+    static void on_name_appeared (GDBusConnection * connection   G_GNUC_UNUSED,
+                                  const gchar     * name         G_GNUC_UNUSED,
+                                  const gchar     * name_owner   G_GNUC_UNUSED,
+                                  gpointer          gself)
+    {
+      g_main_loop_quit (static_cast<GTestDBusIndicatorFixture*>(gself)->loop);
+    }
+
+    GSList * menu_references;
+
+    gboolean any_item_changed;
+
+    static void on_items_changed (GMenuModel  * model      G_GNUC_UNUSED,
+                                  gint          position   G_GNUC_UNUSED,
+                                  gint          removed    G_GNUC_UNUSED,
+                                  gint          added      G_GNUC_UNUSED,
+                                  gpointer      any_item_changed)
+    {
+      *((gboolean*)any_item_changed) = true;
+    }
+
+  protected:
+
+    void activate_subtree (GMenuModel * model)
+    {
+      // query the GDBusMenuModel for information to activate it
+      int n = g_menu_model_get_n_items (model);
+      if (!n)
+        {
+          // give the model a moment to populate its info
+          wait_msec (100);
+          n = g_menu_model_get_n_items (model);
+        }
+
+      // keep a ref so that it stays activated
+      menu_references = g_slist_prepend (menu_references, g_object_ref(model));
+
+      g_signal_connect (model, "items-changed", G_CALLBACK(on_items_changed), &any_item_changed);
+
+      // recurse
+      for (int i=0; i<n; ++i)
+        {
+          GMenuModel * link;
+          GMenuLinkIter * iter = g_menu_model_iterate_item_links (model, i);
+          while (g_menu_link_iter_get_next (iter, nullptr, &link))
+            {
+              activate_subtree (link);
+              g_object_unref (link);
+            }
+          g_clear_object (&iter);
+        }
+    }
+
+    void sync_menu (void)
+    {
+      g_slist_free_full (menu_references, (GDestroyNotify)g_object_unref);
+      menu_references = nullptr;
+      activate_subtree (G_MENU_MODEL (menu_model));
+    }
+
+    GDBusMenuModel * menu_model;
+    GDBusActionGroup * action_group;
+    GTimer * timer;
+
+    virtual void setup_service () = 0;
+    virtual void teardown_service () = 0;
+
+    virtual void SetUp ()
+    {
+      super :: SetUp ();
+
+      menu_references = nullptr;
+      any_item_changed = FALSE;
+
+      timer = g_timer_new ();
+
+      // Start an IndicatorSessionService and wait for it to appear on the bus.
+      setup_service ();
+      const guint watch_id = g_bus_watch_name_on_connection (conn,
+                                                             INDICATOR_BUS_NAME,
+                                                             G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                                             on_name_appeared, // quits the loop
+                                                             nullptr, this, nullptr);
+      const guint timer_id = g_timeout_add_seconds (TIME_LIMIT_SEC, (GSourceFunc)g_main_loop_quit, loop);
+      g_main_loop_run (loop);
+      g_source_remove (timer_id);
+      g_bus_unwatch_name (watch_id);
+      ASSERT_FALSE (times_up());
+
+      // get the actions & menus that the service exported.
+      action_group = g_dbus_action_group_get (conn,
+                                              INDICATOR_BUS_NAME,
+                                              INDICATOR_OBJECT_PATH);
+      menu_model = g_dbus_menu_model_get (conn,
+                                          INDICATOR_BUS_NAME,
+                                          INDICATOR_OBJECT_PATH "/" INDICATOR_PROFILE);
+      // the actions are added asynchronously, so wait for the actions
+      if (!g_action_group_has_action (G_ACTION_GROUP(action_group), INDICATOR_PROFILE "-header"))
+        wait_for_signal (action_group, "action-added");
+      // activate all the groups in the menu so it'll be ready when we need it
+      g_signal_connect (menu_model, "items-changed", G_CALLBACK(on_items_changed), &any_item_changed);
+      sync_menu ();
+    }
+
+    virtual void TearDown ()
+    {
+      g_clear_pointer (&timer, g_timer_destroy);
+
+      g_slist_free_full (menu_references, (GDestroyNotify)g_object_unref);
+      menu_references = nullptr;
+      g_clear_object (&menu_model);
+
+      g_clear_object (&action_group);
+      teardown_service ();
+      wait_msec (100);
+
+      super :: TearDown ();
+    }
+
+  private:
+
+    bool times_up () const
+    {
+      return g_timer_elapsed (timer, nullptr) >= TIME_LIMIT_SEC;
+    }
+
+  protected:
+
+    void wait_for_has_action (const char * name)
+    {
+      while (!g_action_group_has_action (G_ACTION_GROUP(action_group), name) && !times_up())
+        wait_msec (50);
+
+      ASSERT_FALSE (times_up());
+      ASSERT_TRUE (g_action_group_has_action (G_ACTION_GROUP(action_group), name));
+    }
+
+    void wait_for_menu_resync (void)
+    {
+      any_item_changed = false;
+      while (!times_up() && !any_item_changed)
+        wait_msec (50);
+      g_warn_if_fail (any_item_changed);
+      sync_menu ();
+    }
+
+    void wait_for_action_state_change (const gchar * action_name)
+    {
+      gchar * signal_name = g_strdup_printf ("action-state-changed::%s", action_name);
+      wait_for_signal (action_group, signal_name);
+      g_free (signal_name);
+    }
+
+  protected:
+
+    bool find_menu_item_for_action (const char * action_key, GMenuModel ** setme, int * item_index)
+    {
+      bool success = false;
+
+      for (GSList * l=menu_references; !success && (l!=nullptr); l=l->next)
+        {
+          GMenuModel * mm = G_MENU_MODEL (l->data);
+          const int n = g_menu_model_get_n_items (mm);
+
+          for (int i=0; !success && i<n; ++i)
+            {
+              char * action = nullptr;
+              if (!g_menu_model_get_item_attribute (mm, i, G_MENU_ATTRIBUTE_ACTION, "s", &action))
+                continue;
+
+              if ((success = !g_strcmp0 (action, action_key)))
+                {
+                  if (setme != nullptr)
+                    *setme = G_MENU_MODEL (g_object_ref (G_OBJECT(mm)));
+
+                  if (item_index != nullptr)
+                    *item_index = i;
+                }
+
+              g_free (action);
+            }
+        }
+
+      return success;
+    }
+
+    bool action_exists (const char * action_name)
+    {
+#if 0
+      gchar ** actions = g_action_group_list_actions (G_ACTION_GROUP (action_group));
+      for (int i=0; actions && actions[i]; i++)
+        g_message ("[%d][%s]", i, actions[i]);
+#endif
+
+      return g_action_group_has_action (G_ACTION_GROUP(action_group), action_name);
+    }
+
+    bool action_menuitem_exists (const char * action_name)
+    {
+      bool found;
+      GMenuModel * model = nullptr;
+      int pos = -1;
+
+      if ((found = find_menu_item_for_action (action_name, &model, &pos)))
+        g_object_unref (G_OBJECT(model));
+
+      return found;
+    }
+
+    void check_header (const char * expected_label, const char * expected_icon, const char * expected_a11y)
+    {
+       GVariant * variant;
+       const gchar * label = nullptr;
+       const gchar * icon = nullptr;
+       const gchar * a11y = nullptr;
+       gboolean visible;
+
+      variant = g_action_group_get_action_state (G_ACTION_GROUP(action_group), "_header");
+      g_variant_get (variant, "(&s&s&sb)", &label, &icon, &a11y, &visible);
+
+      if (expected_label != nullptr)
+        ASSERT_STREQ (expected_label, label);
+
+      if (expected_icon != nullptr)
+        ASSERT_STREQ (expected_icon, icon);
+
+      if (expected_a11y != nullptr)
+        ASSERT_STREQ (expected_a11y, a11y);
+
+      // the session menu is always visible...
+      ASSERT_TRUE (visible);
+
+      g_variant_unref (variant);
+    }
+
+    void check_label (const char * expected_label, GMenuModel * model, int pos)
+    {
+      char * label = nullptr;
+      ASSERT_TRUE (g_menu_model_get_item_attribute (model, pos, G_MENU_ATTRIBUTE_LABEL, "s", &label));
+      ASSERT_STREQ (expected_label, label);
+      g_free (label);
+    }
+};

=== added file 'tests/phone-test.cc'
--- tests/phone-test.cc	1970-01-01 00:00:00 +0000
+++ tests/phone-test.cc	2013-08-26 21:42:23 +0000
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#define INDICATOR_BUS_NAME    "com.canonical.indicator.location"
+#define INDICATOR_OBJECT_PATH "/com/canonical/indicator/location"
+#define INDICATOR_PROFILE     "phone"
+#include "gtest-dbus-indicator-fixture.h"
+
+#include "src/controller-mock.h"
+#include "src/service.h"
+
+class PhoneTest: public GTestDBusIndicatorFixture,
+                 public ControllerListener
+{
+  protected:
+
+    bool loc_enabled;
+    bool loc_enabled_changed;
+    bool gps_enabled;
+    bool gps_enabled_changed;
+
+    std::shared_ptr<MockController> myController;
+    std::shared_ptr<Service> myService;
+
+  public:
+
+    void clear_callbacks ()
+    {
+      gps_enabled = false;
+      gps_enabled_changed = false;
+      gps_enabled = false;
+      loc_enabled_changed = false;
+    }
+
+    virtual void on_gps_enabled_changed (bool is_enabled)
+    {
+      gps_enabled_changed = true;
+      gps_enabled = is_enabled;
+    }
+
+    virtual void on_location_service_enabled_changed (bool is_enabled)
+    {
+      loc_enabled_changed = true;
+      loc_enabled = is_enabled;
+    }
+
+  protected:
+
+    virtual void SetUp ()
+    {
+      GTestDBusIndicatorFixture :: SetUp ();
+
+      clear_callbacks ();
+    }
+
+    virtual void setup_service ()
+    {
+      myController.reset (new MockController ());
+      myController->add_listener (this);
+      myService.reset (new Service (myController));
+    }
+
+    virtual void teardown_service ()
+    {
+      myService.reset ();
+      myController->remove_listener (this);
+      myController.reset ();
+    }
+};
+
+TEST_F (PhoneTest, ActionsExit)
+{
+  ASSERT_TRUE (action_exists ("gps-detection-enabled"));
+  ASSERT_TRUE (action_exists ("location-detection-enabled"));
+  ASSERT_TRUE (action_exists ("phone-header"));
+  ASSERT_TRUE (action_exists ("settings"));
+}
+
+TEST_F (PhoneTest, MenuitemsExist)
+{
+  ASSERT_TRUE (action_menuitem_exists ("indicator.location-detection-enabled"));
+  ASSERT_TRUE (action_menuitem_exists ("indicator.gps-detection-enabled"));
+  ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
+}
+
+TEST_F (PhoneTest, PlatformTogglesGPS)
+{
+  bool enabled;
+  const char * const key = "gps-detection-enabled";
+  GActionGroup * ag = G_ACTION_GROUP (action_group);
+  GVariant * v;
+
+  // check that the current state is the default value of 'false'
+  v = g_action_group_get_action_state (ag, key);
+  ASSERT_TRUE (v != nullptr);
+  enabled = g_variant_get_boolean (v);
+  g_variant_unref (v);
+  ASSERT_FALSE (enabled);
+
+  // confirm that toggling the mock controller's GPS is reflected in the action state
+  for (int i=0; i<4; i++)
+    {
+      enabled = !enabled;
+
+      myController->set_gps_enabled (enabled);
+      wait_for_action_state_change (key);
+      v = g_action_group_get_action_state (ag, key);
+      ASSERT_TRUE (v != nullptr);
+      ASSERT_EQ (enabled, g_variant_get_boolean (v));
+      g_variant_unref (v);
+    }
+}
+
+TEST_F (PhoneTest, UserTogglesGPS)
+{
+  bool enabled;
+  const char * const key = "gps-detection-enabled";
+  GActionGroup * ag = G_ACTION_GROUP (action_group);
+  GVariant * v;
+
+  // check that the current state is the default value of 'false'
+  v = g_action_group_get_action_state (ag, key);
+  ASSERT_TRUE (v != nullptr);
+  enabled = g_variant_get_boolean (v);
+  g_variant_unref (v);
+  ASSERT_FALSE (enabled);
+
+  // confirm that toggling menu updates the controller
+  for (int i=0; i<4; i++)
+    {
+      clear_callbacks ();
+
+      g_action_group_activate_action (ag, key, nullptr);
+      while (!gps_enabled_changed)
+        wait_msec (50);
+
+      ASSERT_TRUE (gps_enabled_changed);
+      enabled = !enabled;
+      ASSERT_EQ (enabled, gps_enabled);
+    }
+}
+
+TEST_F (PhoneTest, PlatformTogglesLocation)
+{
+  bool enabled;
+  const char * const key = "location-detection-enabled";
+  GActionGroup * ag = G_ACTION_GROUP (action_group);
+  GVariant * v;
+
+  // check that the current state is the default value of 'false'
+  v = g_action_group_get_action_state (ag, key);
+  ASSERT_TRUE (v != nullptr);
+  enabled = g_variant_get_boolean (v);
+  g_variant_unref (v);
+  ASSERT_FALSE (enabled);
+
+  // confirm that toggling the mock controller's GPS is reflected in the action state
+  for (int i=0; i<4; i++)
+    {
+      enabled = !enabled;
+
+      myController->set_location_service_enabled (enabled);
+      wait_for_action_state_change (key);
+      v = g_action_group_get_action_state (ag, key);
+      ASSERT_TRUE (v != nullptr);
+      ASSERT_EQ (enabled, g_variant_get_boolean (v));
+      g_variant_unref (v);
+    }
+}
+
+TEST_F (PhoneTest, UserTogglesLocation)
+{
+  bool enabled;
+  const char * const key = "location-detection-enabled";
+  GActionGroup * ag = G_ACTION_GROUP (action_group);
+  GVariant * v;
+
+  // check that the current state is the default value of 'false'
+  v = g_action_group_get_action_state (ag, key);
+  ASSERT_TRUE (v != nullptr);
+  enabled = g_variant_get_boolean (v);
+  g_variant_unref (v);
+  ASSERT_FALSE (enabled);
+
+  // confirm that toggling menu updates the controller
+  for (int i=0; i<4; i++)
+    {
+      clear_callbacks ();
+
+      g_action_group_activate_action (ag, key, nullptr);
+      while (!loc_enabled_changed)
+        wait_msec (50);
+
+      ASSERT_TRUE (loc_enabled_changed);
+      enabled = !enabled;
+      ASSERT_EQ (enabled, loc_enabled);
+    }
+}

=== added file 'trim-lcov.py'
--- trim-lcov.py	1970-01-01 00:00:00 +0000
+++ trim-lcov.py	2013-08-26 21:42:23 +0000
@@ -0,0 +1,53 @@
+#!/usr/bin/python
+
+# This script removes branch and/or line coverage data for lines that
+# contain a particular substring.
+#
+# In the interest of "fairness" it removes all branch or coverage data
+# when a match is found -- not just negative data.  It is therefore
+# likely that running this script will actually reduce the total number
+# of lines and branches that are marked as covered (in absolute terms).
+#
+# This script intentionally avoids checking for errors.  Any exceptions
+# will trigger make to fail.
+#
+# Author: Ryan Lortie <[e-mail]>
+
+import sys
+
+line_suppress = ['g_assert_not_reached']
+branch_suppress = ['g_assert', 'g_return_if_fail', 'g_clear_object', 'g_clear_pointer', 'g_return_val_if_fail', 'G_DEFINE_TYPE']
+
+def check_suppress(suppressions, source, data):
+    line, _, rest = data.partition(',')
+    line = int(line) - 1
+
+    assert line < len(source)
+
+    for suppression in suppressions:
+        if suppression in source[line]:
+            return True
+
+    return False
+
+source = []
+for line in sys.stdin:
+    line = line[:-1]
+
+    keyword, _, rest = line.partition(':')
+
+    # Source file
+    if keyword == 'SF':
+        source = file(rest).readlines()
+
+    # Branch coverage data
+    elif keyword == 'BRDA':
+        if check_suppress(branch_suppress, source, rest):
+            continue
+
+    # Line coverage data
+    elif keyword == 'DA':
+        if check_suppress(line_suppress, source, rest):
+            continue
+
+    print line