Merge lp:~charlesk/indicator-location/style into lp:indicator-location/16.04

[Charles Kerr]

Style guide code cleanup. No functional changes.

Style guide code cleanup. No functional changes.

 * Copy michi's code-formatting config files, tools and cmake rules from unity-scopes-api
 * Add new test-format.sh script so "make test" fails if new code's style doesn't match
 * Reformat the codebase to fit the style guide

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:168
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/69/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/4/console

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

review: Needs Fixing (continuous-integration)

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

169. By Charles Kerr on 2016-01-22

specify build-dependency's clang-format version

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

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

170. By Charles Kerr on 2016-01-22

typo fix in debian/control

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/8

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/74/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/9/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:169
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/8/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Xavi Garcia (xavi-garcia-mena)]

Very nice branch, thanks for this Charles!.

In scopes-api and other libraries we are following the convention of coding const pointers and references as: Something const * or Something const &.

That's absolutely not a blocker for me... just wondering if we should follow the same convention in other projects or not.

I have no particular preference for any of the options... so approving the MP.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-01-22 20:08:44 +0000
+++ CMakeLists.txt	2016-01-22 20:08:44 +0000
@@ -40,6 +40,39 @@
 include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
 
 ##
+##  Code Style
+##
+
+# Code style fixer from unity-scopes-api.
+#
+# We put the code through astyle first because it makes some fixes that clang-format
+# won't do (such as "char *p" -> "char* p"). But astyle messes up other things
+# (particularly lambdas and assembly-style comments), which clang-format does right.
+# So, we run clang-format after running astyle, which undoes the damage done by astyle
+# without reverting desirable astyle fixes.
+
+find_program(ASTYLE_COMMAND NAMES astyle)
+if (NOT ASTYLE_COMMAND)
+    message(WARNING "Cannot find astyle: formatcode target will not be available")
+else()
+    # astyle 2.03 creates DOS line endings, so we need to fix its output
+    find_program(DOS2UNIX_COMMAND NAMES dos2unix)
+    if (NOT DOS2UNIX_COMMAND)
+        message(WARNING "Cannot find dos2unix: formatcode target will not be available")
+    else()
+        find_program(CLANG_FORMAT_COMMAND NAMES clang-format-3.6 clang-format-3.5)
+        if (NOT CLANG_FORMAT_COMMAND)
+            message(WARNING "Cannot find clang-format >= clang-format-3.5: formatcode target will not be available")
+        endif()
+    endif()
+endif()
+
+if (ASTYLE_COMMAND AND DOS2UNIX_COMMAND AND CLANG_FORMAT_COMMAND)
+    add_custom_target(formatcode
+                      ${PROJECT_SOURCE_DIR}/tools/format-files.sh ${PROJECT_SOURCE_DIR} ${ASTYLE_COMMAND} ${CLANG_FORMAT_COMMAND})
+endif()
+
+##
 ##
 ##
 
@@ -60,6 +93,7 @@
 add_subdirectory (src)
 add_subdirectory (data)
 add_subdirectory (po)
+add_subdirectory (tools)
 if (${enable_tests})
   add_subdirectory (tests)
 endif ()

=== added file '_clang-format'
--- _clang-format	1970-01-01 00:00:00 +0000
+++ _clang-format	2016-01-22 20:08:44 +0000
@@ -0,0 +1,48 @@
+---
+AccessModifierOffset: -4
+AlignEscapedNewlinesLeft: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: true
+BinPackParameters: false
+BreakBeforeBinaryOperators: false
+BreakBeforeBraces: Allman
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: true
+ColumnLimit:     120
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerBinding: true
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: true
+IndentFunctionDeclarationAfterType: true
+IndentWidth:     4
+Language:        Cpp
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 60
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerBindsToType: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+

=== added file 'astyle-config'
--- astyle-config	1970-01-01 00:00:00 +0000
+++ astyle-config	2016-01-22 20:08:44 +0000
@@ -0,0 +1,44 @@
+# Options for formatting code with astyle.
+#
+# This helps to make code match the style guide.
+# 
+# Use like this:
+# 
+#     astyle --options=astyle-config mfile.h myfile.cpp
+# 
+# Occasionally, astyle does something silly (particularly with lambdas), so it's
+# still necessary to scan the changes for things that are wrong.
+# But, for most files, it does a good job.
+# 
+# Please consider using this before checking code in for review. Code reviews shouldn't
+# have to deal with layout issues, they are just a distraction. It's better to be able
+# to focus on semantics in a code review, with style issues out of the way.
+
+--formatted
+--style=allman
+--min-conditional-indent=2
+--indent-switches
+--max-instatement-indent=120
+--pad-header
+--align-pointer=type
+--align-reference=type
+--add-brackets
+--convert-tabs
+--close-templates
+--max-code-length=120
+
+# --pad-oper
+#
+# Commented out for now. It changes
+#
+#     for (int i=0; i<10; ++i)
+# to
+#     for (int i = 0; i < 10; ++i)
+#
+# Unfortunately, it also messes with rvalue references:
+#
+#     ResourcePtr& operator=(ResourcePtr&& r);
+#
+# becomes:
+#
+#     ResourcePtr& operator=(ResourcePtr && r);

=== modified file 'debian/control'
--- debian/control	2015-07-15 18:49:08 +0000
+++ debian/control	2016-01-22 20:08:44 +0000
@@ -13,6 +13,10 @@
                liburl-dispatcher1-dev,
                python,
                libproperties-cpp-dev,
+# for code formatting
+               astyle,
+               clang-format-3.6,
+               dos2unix,
 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 

=== modified file 'src/controller.h'
--- src/controller.h	2016-01-22 20:08:44 +0000
+++ src/controller.h	2016-01-22 20:08:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -17,8 +17,7 @@
  *   Charles Kerr <[e-mail]>
  */
 
-#ifndef __INDICATOR_LOCATION_CONTROLLER_H__
-#define __INDICATOR_LOCATION_CONTROLLER_H__
+#pragma once
 
 #include <core/property.h>
 
@@ -29,13 +28,11 @@
     virtual ~Controller();
 
     /// True iff we've gotten status info from the location service
-    virtual const core::Property<bool>& is_valid() const =0;
-
-    virtual const core::Property<bool>& gps_enabled() const =0;
-    virtual const core::Property<bool>& location_service_enabled() const =0;
-
-    virtual void set_gps_enabled (bool enabled) =0;
-    virtual void set_location_service_enabled (bool enabled) =0;
+    virtual const core::Property<bool>& is_valid() const = 0;
+
+    virtual const core::Property<bool>& gps_enabled() const = 0;
+    virtual const core::Property<bool>& location_service_enabled() const = 0;
+
+    virtual void set_gps_enabled(bool enabled) = 0;
+    virtual void set_location_service_enabled(bool enabled) = 0;
 };
-
-#endif // __INDICATOR_LOCATION_CONTROLLER_H__

=== modified file 'src/dbus-shared.h'
--- src/dbus-shared.h	2014-10-03 16:48:12 +0000
+++ src/dbus-shared.h	2016-01-22 20:08:44 +0000
@@ -1,26 +1,23 @@
 /*
- * Copyright 2014 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/>.
+ * Copyright 2014-2016 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 DBUS_SHARED_H
-#define DBUS_SHARED_H
+#pragma once
 
 #define INDICATOR_BUS_NAME "com.canonical.indicator.location"
 #define INDICATOR_OBJECT_PATH "/com/canonical/indicator/location"
-
-#endif /* DBUS_SHARED_H */

=== modified file 'src/location-service-controller.cc'
--- src/location-service-controller.cc	2016-01-22 20:08:44 +0000
+++ src/location-service-controller.cc	2016-01-22 20:08:44 +0000
@@ -1,6 +1,5 @@
-
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -30,21 +29,18 @@
 class LocationServiceController::Impl
 {
 public:
-
     Impl()
     {
-        m_cancellable.reset(g_cancellable_new(), [](GCancellable* c) {
-            g_cancellable_cancel(c);
-            g_object_unref(c);
-        });
+        m_cancellable.reset(g_cancellable_new(), [](GCancellable* c)
+                            {
+                                g_cancellable_cancel(c);
+                                g_object_unref(c);
+                            });
 
-        g_bus_get(G_BUS_TYPE_SYSTEM,
-                  m_cancellable.get(),
-                  on_system_bus_ready,
-                  this);
+        g_bus_get(G_BUS_TYPE_SYSTEM, m_cancellable.get(), on_system_bus_ready, this);
     }
 
-    ~Impl() =default;
+    ~Impl() = default;
 
     const core::Property<bool>& is_valid() const
     {
@@ -72,7 +68,6 @@
     }
 
 private:
-
     /***
     ****  bus bootstrapping & name watching
     ***/
@@ -90,33 +85,30 @@
 
             self->m_system_bus.reset(system_bus, GObjectDeleter());
 
-            auto name_tag = g_bus_watch_name_on_connection(
-                                system_bus,
-                                BUS_NAME,
-                                G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
-                                on_name_appeared,
-                                on_name_vanished,
-                                gself,
-                                nullptr);
+            auto name_tag = g_bus_watch_name_on_connection(system_bus, BUS_NAME, G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
+                                                           on_name_appeared, on_name_vanished, gself, nullptr);
 
             //  manage the name_tag's lifespan
-            self->m_name_tag.reset(new guint{name_tag}, [](guint* tag){
-                g_bus_unwatch_name(*tag);
-                delete tag;
-            });
+            self->m_name_tag.reset(new guint{name_tag}, [](guint* tag)
+                                   {
+                                       g_bus_unwatch_name(*tag);
+                                       delete tag;
+                                   });
         }
         else if (error != nullptr)
         {
             if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+            {
                 g_warning("Couldn't get system bus: %s", error->message);
+            }
             g_error_free(error);
         }
     }
 
-    static void on_name_appeared(GDBusConnection * system_bus,
-                                 const gchar     * /*bus_name*/,
-                                 const gchar     * name_owner,
-                                 gpointer          gself)
+    static void on_name_appeared(GDBusConnection* system_bus,
+                                 const gchar* /*bus_name*/,
+                                 const gchar* name_owner,
+                                 gpointer gself)
     {
         auto self = static_cast<Impl*>(gself);
 
@@ -127,49 +119,33 @@
 
         // subscribe to PropertiesChanged signals from the service
         auto signal_tag = g_dbus_connection_signal_subscribe(
-                              system_bus,
-                              name_owner,
-                              PROP_IFACE_NAME,
-                              "PropertiesChanged",
-                              OBJECT_PATH,
-                              nullptr, // arg0
-                              G_DBUS_SIGNAL_FLAGS_NONE,
-                              on_properties_changed,
-                              gself,
-                              nullptr);
+            system_bus, name_owner, PROP_IFACE_NAME, "PropertiesChanged", OBJECT_PATH,
+            nullptr,  // arg0
+            G_DBUS_SIGNAL_FLAGS_NONE, on_properties_changed, gself, nullptr);
 
         // manage the signal_tag lifespan
         g_object_ref(system_bus);
-        self->m_signal_tag.reset(new guint{signal_tag},
-                                 [system_bus](guint* tag){
-            g_dbus_connection_signal_unsubscribe(system_bus, *tag);
-            g_object_unref(system_bus);
-            delete tag;
-        });
+        self->m_signal_tag.reset(new guint{signal_tag}, [system_bus](guint* tag)
+                                 {
+                                     g_dbus_connection_signal_unsubscribe(system_bus, *tag);
+                                     g_object_unref(system_bus);
+                                     delete tag;
+                                 });
 
         // GetAll is borked so call Get on each property we care about
-        struct {
-            const char * name;
+        struct
+        {
+            const char* name;
             GAsyncReadyCallback callback;
-        } props[] = {
-            { PROP_KEY_LOC_ENABLED, on_loc_enabled_reply },
-            { PROP_KEY_GPS_ENABLED, on_gps_enabled_reply }
-        };
+        } props[] = {{PROP_KEY_LOC_ENABLED, on_loc_enabled_reply}, {PROP_KEY_GPS_ENABLED, on_gps_enabled_reply}};
         for (const auto& prop : props)
-        { 
-            g_dbus_connection_call(
-                system_bus,
-                BUS_NAME,
-                OBJECT_PATH,
-                PROP_IFACE_NAME,
-                "Get",
-                g_variant_new("(ss)", LOC_IFACE_NAME, prop.name), // args
-                G_VARIANT_TYPE("(v)"), // return type
-                G_DBUS_CALL_FLAGS_NONE,
-                -1, // use default timeout
-                self->m_cancellable.get(),
-                prop.callback,
-                gself);
+        {
+            g_dbus_connection_call(system_bus, BUS_NAME, OBJECT_PATH, PROP_IFACE_NAME, "Get",
+                                   g_variant_new("(ss)", LOC_IFACE_NAME, prop.name),  // args
+                                   G_VARIANT_TYPE("(v)"),                             // return type
+                                   G_DBUS_CALL_FLAGS_NONE,
+                                   -1,  // use default timeout
+                                   self->m_cancellable.get(), prop.callback, gself);
         }
 
         g_debug("setting is_valid to true: location-service appeared");
@@ -189,35 +165,35 @@
     ****  org.freedesktop.dbus.properties.PropertiesChanged handling
     ***/
 
-    static void on_properties_changed(GDBusConnection * /*connection*/,
-                                      const gchar     * /*sender_name*/,
-                                      const gchar     * /*object_path*/,
-                                      const gchar     * /*interface_name*/,
-                                      const gchar     * /*signal_name*/,
-                                      GVariant *          parameters,
-                                      gpointer            gself)
+    static void on_properties_changed(GDBusConnection* /*connection*/,
+                                      const gchar* /*sender_name*/,
+                                      const gchar* /*object_path*/,
+                                      const gchar* /*interface_name*/,
+                                      const gchar* /*signal_name*/,
+                                      GVariant* parameters,
+                                      gpointer gself)
     {
         auto self = static_cast<Impl*>(gself);
-        const gchar *interface_name;
-        GVariant *changed_properties;
-        const gchar **invalidated_properties;
+        const gchar* interface_name;
+        GVariant* changed_properties;
+        const gchar** invalidated_properties;
         GVariantIter property_iter;
-        const gchar *key;
+        const gchar* key;
         GVariant* val;
 
-        g_variant_get(parameters,
-                      "(&s@a{sv}^a&s)",
-                      &interface_name,
-                      &changed_properties,
-                      &invalidated_properties);
+        g_variant_get(parameters, "(&s@a{sv}^a&s)", &interface_name, &changed_properties, &invalidated_properties);
 
         g_variant_iter_init(&property_iter, changed_properties);
         while (g_variant_iter_next(&property_iter, "{&sv}", &key, &val))
         {
             if (!g_strcmp0(key, PROP_KEY_LOC_ENABLED))
+            {
                 self->m_loc_enabled.set(g_variant_get_boolean(val));
+            }
             else if (!g_strcmp0(key, PROP_KEY_GPS_ENABLED))
+            {
                 self->m_gps_enabled.set(g_variant_get_boolean(val));
+            }
 
             g_variant_unref(val);
         }
@@ -230,20 +206,19 @@
     ****  org.freedesktop.dbus.properties.Get handling
     ***/
 
-    static std::tuple<bool,bool> get_bool_reply_from_call(GObject      * source,
-                                                          GAsyncResult * res)
+    static std::tuple<bool, bool> get_bool_reply_from_call(GObject* source, GAsyncResult* res)
     {
-        GError * error;
-        GVariant * v;
-        bool success {false};
-        bool result {false};
+        GError* error;
+        GVariant* v;
+        bool success{false};
+        bool result{false};
 
         error = nullptr;
-        GDBusConnection * conn = G_DBUS_CONNECTION(source);
+        GDBusConnection* conn = G_DBUS_CONNECTION(source);
         v = g_dbus_connection_call_finish(conn, res, &error);
         if (v != nullptr)
         {
-            GVariant* inner {};
+            GVariant* inner{};
             g_variant_get(v, "(v)", &inner);
             success = true;
             result = g_variant_get_boolean(inner);
@@ -253,7 +228,9 @@
         else if (error != nullptr)
         {
             if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+            {
                 g_warning("Error calling dbus method: %s", error->message);
+            }
             g_error_free(error);
             success = false;
         }
@@ -261,26 +238,26 @@
         return std::make_tuple(success, result);
     }
 
-    static void on_loc_enabled_reply(GObject      * source_object,
-                                     GAsyncResult * res,
-                                     gpointer       gself)
+    static void on_loc_enabled_reply(GObject* source_object, GAsyncResult* res, gpointer gself)
     {
         bool success, value;
         std::tie(success, value) = get_bool_reply_from_call(source_object, res);
         g_debug("service loc reply: success %d value %d", int(success), int(value));
         if (success)
+        {
             static_cast<Impl*>(gself)->m_loc_enabled.set(value);
+        }
     }
 
-    static void on_gps_enabled_reply(GObject      * source_object,
-                                     GAsyncResult * res,
-                                     gpointer       gself)
+    static void on_gps_enabled_reply(GObject* source_object, GAsyncResult* res, gpointer gself)
     {
         bool success, value;
         std::tie(success, value) = get_bool_reply_from_call(source_object, res);
         g_debug("service gps reply: success %d value %d", int(success), int(value));
         if (success)
+        {
             static_cast<Impl*>(gself)->m_gps_enabled.set(value);
+        }
     }
 
     /***
@@ -291,30 +268,20 @@
     {
         g_return_if_fail(m_system_bus);
 
-        auto args = g_variant_new("(ssv)",
-                                  LOC_IFACE_NAME,
-                                  property_name,
-                                  g_variant_new_boolean(b));
-        g_dbus_connection_call(m_system_bus.get(),
-                               BUS_NAME,
-                               OBJECT_PATH,
-                               PROP_IFACE_NAME,
-                               "Set", // method name,
+        auto args = g_variant_new("(ssv)", LOC_IFACE_NAME, property_name, g_variant_new_boolean(b));
+        g_dbus_connection_call(m_system_bus.get(), BUS_NAME, OBJECT_PATH, PROP_IFACE_NAME,
+                               "Set",  // method name,
                                args,
-                               nullptr, // reply type
+                               nullptr,  // reply type
                                G_DBUS_CALL_FLAGS_NONE,
-                               -1, // timeout msec
-                               m_cancellable.get(),
-                               check_method_call_reply,
-                               this);
+                               -1,  // timeout msec
+                               m_cancellable.get(), check_method_call_reply, this);
     }
 
-    static void check_method_call_reply(GObject      *connection,
-                                        GAsyncResult *res,
-                                        gpointer      /*gself*/)
+    static void check_method_call_reply(GObject* connection, GAsyncResult* res, gpointer /*gself*/)
     {
-        GError * error;
-        GVariant * v;
+        GError* error;
+        GVariant* v;
 
         error = nullptr;
         v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(connection), res, &error);
@@ -328,7 +295,9 @@
         else if (error != nullptr)
         {
             if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+            {
                 g_warning("dbus method returned an error : %s", error->message);
+            }
 
             g_error_free(error);
         }
@@ -338,29 +307,29 @@
     ****
     ***/
 
-    static constexpr const char* BUS_NAME {"com.ubuntu.location.Service"};
-    static constexpr const char* OBJECT_PATH {"/com/ubuntu/location/Service"};
-    static constexpr const char* LOC_IFACE_NAME {"com.ubuntu.location.Service"};
-    static constexpr const char* PROP_IFACE_NAME {"org.freedesktop.DBus.Properties"};
-    static constexpr const char* PROP_KEY_LOC_ENABLED {"IsOnline"};
-    static constexpr const char* PROP_KEY_GPS_ENABLED {"DoesSatelliteBasedPositioning"};
-
-    core::Property<bool> m_gps_enabled {false};
-    core::Property<bool> m_loc_enabled {false};
-    core::Property<bool> m_is_valid {false};
-
-    std::shared_ptr<GCancellable> m_cancellable {};
-    std::shared_ptr<GDBusConnection> m_system_bus {};
-    std::shared_ptr<guint> m_name_tag {};
-    std::shared_ptr<guint> m_signal_tag {};
+    static constexpr const char* BUS_NAME{"com.ubuntu.location.Service"};
+    static constexpr const char* OBJECT_PATH{"/com/ubuntu/location/Service"};
+    static constexpr const char* LOC_IFACE_NAME{"com.ubuntu.location.Service"};
+    static constexpr const char* PROP_IFACE_NAME{"org.freedesktop.DBus.Properties"};
+    static constexpr const char* PROP_KEY_LOC_ENABLED{"IsOnline"};
+    static constexpr const char* PROP_KEY_GPS_ENABLED{"DoesSatelliteBasedPositioning"};
+
+    core::Property<bool> m_gps_enabled{false};
+    core::Property<bool> m_loc_enabled{false};
+    core::Property<bool> m_is_valid{false};
+
+    std::shared_ptr<GCancellable> m_cancellable{};
+    std::shared_ptr<GDBusConnection> m_system_bus{};
+    std::shared_ptr<guint> m_name_tag{};
+    std::shared_ptr<guint> m_signal_tag{};
 };
 
 /***
 ****
 ***/
 
-LocationServiceController::LocationServiceController():
-  impl{new Impl{}}
+LocationServiceController::LocationServiceController()
+    : impl{new Impl{}}
 {
 }
 
@@ -368,33 +337,27 @@
 {
 }
 
-const core::Property<bool>&
-LocationServiceController::is_valid() const
-{
-  return impl->is_valid();
-}
-
-const core::Property<bool>&
-LocationServiceController::gps_enabled() const
-{
-  return impl->gps_enabled();
-}
-
-const core::Property<bool>&
-LocationServiceController::location_service_enabled() const
-{
-  return impl->location_service_enabled();
-}
-
-void
-LocationServiceController::set_gps_enabled(bool enabled)
-{
-  impl->set_gps_enabled(enabled);
-}
-
-void
-LocationServiceController::set_location_service_enabled(bool enabled)
-{
-  impl->set_location_service_enabled(enabled);
-}
-
+const core::Property<bool>& LocationServiceController::is_valid() const
+{
+    return impl->is_valid();
+}
+
+const core::Property<bool>& LocationServiceController::gps_enabled() const
+{
+    return impl->gps_enabled();
+}
+
+const core::Property<bool>& LocationServiceController::location_service_enabled() const
+{
+    return impl->location_service_enabled();
+}
+
+void LocationServiceController::set_gps_enabled(bool enabled)
+{
+    impl->set_gps_enabled(enabled);
+}
+
+void LocationServiceController::set_location_service_enabled(bool enabled)
+{
+    impl->set_location_service_enabled(enabled);
+}

=== modified file 'src/location-service-controller.h'
--- src/location-service-controller.h	2016-01-22 20:08:44 +0000
+++ src/location-service-controller.h	2016-01-22 20:08:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -17,14 +17,13 @@
  *   Charles Kerr <[e-mail]>
  */
 
-#ifndef INDICATOR_LOCATION_CONTROLLER_LOCATION_SERVICE
-#define INDICATOR_LOCATION_CONTROLLER_LOCATION_SERVICE
-
-#include "controller.h" // parent class
-
-#include <memory> // std::unique_ptr
-
-class LocationServiceController: public Controller
+#pragma once
+
+#include "controller.h"  // parent class
+
+#include <memory>  // std::unique_ptr
+
+class LocationServiceController : public Controller
 {
 public:
     LocationServiceController();
@@ -33,17 +32,14 @@
     const core::Property<bool>& is_valid() const override;
     const core::Property<bool>& gps_enabled() const override;
     const core::Property<bool>& location_service_enabled() const override;
-    void set_gps_enabled (bool enabled) override;
-    void set_location_service_enabled (bool enabled) override;
+    void set_gps_enabled(bool enabled) override;
+    void set_location_service_enabled(bool enabled) override;
 
-    LocationServiceController(const LocationServiceController&) =delete;
-    LocationServiceController& operator=(const LocationServiceController&) =delete;
+    LocationServiceController(const LocationServiceController&) = delete;
+    LocationServiceController& operator=(const LocationServiceController&) = delete;
 
 private:
     friend class Impl;
     class Impl;
     std::unique_ptr<Impl> impl;
 };
-
-#endif // INDICATOR_LOCATION_CONTROLLER_LOCATION_SERVICE
-

=== modified file 'src/main.cc'
--- src/main.cc	2016-01-22 20:08:44 +0000
+++ src/main.cc	2016-01-22 20:08:44 +0000
@@ -1,20 +1,20 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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]>
- *
- * 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>
@@ -24,30 +24,28 @@
 #include "location-service-controller.h"
 #include "service.h"
 
-static void
-on_name_lost (Service * service G_GNUC_UNUSED, gpointer loop)
+static void on_name_lost(Service* service G_GNUC_UNUSED, gpointer loop)
 {
-  g_main_loop_quit (static_cast<GMainLoop*>(loop));
+    g_main_loop_quit(static_cast<GMainLoop*>(loop));
 }
 
-int
-main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
+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);
-  auto controller = std::make_shared<LocationServiceController>();
-  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;
+    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);
+    auto controller = std::make_shared<LocationServiceController>();
+    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;
 }

=== modified file 'src/phone.cc'
--- src/phone.cc	2016-01-22 20:08:44 +0000
+++ src/phone.cc	2016-01-22 20:08:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -25,216 +25,187 @@
 #include <ubuntu-app-launch.h>
 
 #include "phone.h"
-#include "utils.h" // GObjectDeleter
+#include "utils.h"  // GObjectDeleter
 
 #define PROFILE_NAME "phone"
 
 #define LOCATION_ACTION_KEY "location-detection-enabled"
 #define GPS_ACTION_KEY "gps-detection-enabled"
 
-Phone :: Phone (const std::shared_ptr<Controller>& controller_,
-                const std::shared_ptr<GSimpleActionGroup>& action_group_):
-  controller (controller_),
-  action_group (action_group_)
+Phone::Phone(const std::shared_ptr<Controller>& controller_, const std::shared_ptr<GSimpleActionGroup>& action_group_)
+    : controller(controller_)
+    , action_group(action_group_)
 {
-  create_menu ();
-
-  auto on_gps = [this](bool enabled){
-    update_gps_enabled_action();
-    update_header();
-  };
-  controller_connections.push_back(
-    controller->gps_enabled().changed().connect(on_gps)
-  );
-
-  auto on_loc = [this](bool enabled){
-    update_detection_enabled_action();
-    update_header();
-  };
-  controller_connections.push_back(
-    controller->location_service_enabled().changed().connect(on_loc)
-  );
-
-  auto on_valid = [this](bool valid){
+    create_menu();
+
+    auto on_gps = [this](bool enabled)
+    {
+        update_gps_enabled_action();
+        update_header();
+    };
+    controller_connections.push_back(controller->gps_enabled().changed().connect(on_gps));
+
+    auto on_loc = [this](bool enabled)
+    {
+        update_detection_enabled_action();
+        update_header();
+    };
+    controller_connections.push_back(controller->location_service_enabled().changed().connect(on_loc));
+
+    auto on_valid = [this](bool valid)
+    {
+        update_actions_enabled();
+    };
+    controller_connections.push_back(controller->is_valid().changed().connect(on_valid));
+
+    /* 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);
+    }
+
     update_actions_enabled();
-  };
-  controller_connections.push_back(
-    controller->is_valid().changed().connect(on_valid)
-  ); 
-
-  /* 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);
-    }
-
-  update_actions_enabled();
-}
-
-Phone :: ~Phone ()
-{
-}
-
-/***
-****
-***/
-
-bool
-Phone :: should_be_visible () const
-{
-  if (!controller->is_valid())
-    return false;
-
-  // as per "Indicators - RTM Usability Fix" document:
-  // visible iff location is enabled
-  return controller->location_service_enabled().get();
-}
-
-GVariant *
-Phone :: action_state_for_root () const
-{
-  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));
-
-  const char * title = _("Location");
-  g_variant_builder_add (&builder, "{sv}", "title", g_variant_new_string (title));
-
-  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);
-  GVariant * serialized_icon = g_icon_serialize (icon);
-  if (serialized_icon != NULL)
-    {
-      g_variant_builder_add (&builder, "{sv}", "icon", serialized_icon);
-      g_variant_unref (serialized_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 ());
-}
-
-void
-Phone::update_header()
-{
-  g_action_group_change_action_state(G_ACTION_GROUP(action_group.get()),
-                                     HEADER_ACTION_KEY,
-                                     action_state_for_root());
-}
-
-void
-Phone :: update_actions_enabled()
-{
-  const auto map = G_ACTION_MAP(action_group.get());
-  const bool is_valid = controller->is_valid().get();
-  std::array<const char*,2> keys = { LOCATION_ACTION_KEY, GPS_ACTION_KEY };
-  for(const auto& key : keys)
-    g_simple_action_set_enabled(G_SIMPLE_ACTION(g_action_map_lookup_action(map, key)), is_valid);
-
-  update_header();
-}
-
-/***
-****
-***/
-
-GVariant *
-Phone :: action_state_for_location_detection ()
-{
-  return g_variant_new_boolean (controller->location_service_enabled().get());
-}
-
-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_signal_connect (action, "activate",
-                    G_CALLBACK(on_detection_location_activated), this);
-
-  return action;
-}
-
-void
-Phone::update_detection_enabled_action()
-{
-  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());
-}
-
-/***
-****
-***/
-
-GVariant *
-Phone :: action_state_for_gps_detection ()
-{
-  return g_variant_new_boolean (controller->gps_enabled().get());
-}
-
-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_signal_connect (action, "activate",
-                    G_CALLBACK(on_detection_gps_activated), this);
-
-  return action;
-}
-
-void
-Phone::update_gps_enabled_action()
-{
-  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());
+}
+
+Phone::~Phone()
+{
+}
+
+/***
+****
+***/
+
+bool Phone::should_be_visible() const
+{
+    if (!controller->is_valid())
+    {
+        return false;
+    }
+
+    // as per "Indicators - RTM Usability Fix" document:
+    // visible iff location is enabled
+    return controller->location_service_enabled().get();
+}
+
+GVariant* Phone::action_state_for_root() const
+{
+    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));
+
+    const char* title = _("Location");
+    g_variant_builder_add(&builder, "{sv}", "title", g_variant_new_string(title));
+
+    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);
+    GVariant* serialized_icon = g_icon_serialize(icon);
+    if (serialized_icon != NULL)
+    {
+        g_variant_builder_add(&builder, "{sv}", "icon", serialized_icon);
+        g_variant_unref(serialized_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());
+}
+
+void Phone::update_header()
+{
+    g_action_group_change_action_state(G_ACTION_GROUP(action_group.get()), HEADER_ACTION_KEY, action_state_for_root());
+}
+
+void Phone::update_actions_enabled()
+{
+    const auto map = G_ACTION_MAP(action_group.get());
+    const bool is_valid = controller->is_valid().get();
+    std::array<const char*, 2> keys = {LOCATION_ACTION_KEY, GPS_ACTION_KEY};
+    for (const auto& key : keys)
+    {
+        g_simple_action_set_enabled(G_SIMPLE_ACTION(g_action_map_lookup_action(map, key)), is_valid);
+    }
+
+    update_header();
+}
+
+/***
+****
+***/
+
+GVariant* Phone::action_state_for_location_detection()
+{
+    return g_variant_new_boolean(controller->location_service_enabled().get());
+}
+
+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_signal_connect(action, "activate", G_CALLBACK(on_detection_location_activated), this);
+
+    return action;
+}
+
+void Phone::update_detection_enabled_action()
+{
+    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());
+}
+
+/***
+****
+***/
+
+GVariant* Phone::action_state_for_gps_detection()
+{
+    return g_variant_new_boolean(controller->gps_enabled().get());
+}
+
+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_signal_connect(action, "activate", G_CALLBACK(on_detection_gps_activated), this);
+
+    return action;
+}
+
+void Phone::update_gps_enabled_action()
+{
+    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());
 }
 
 /***
@@ -245,77 +216,67 @@
 
 namespace
 {
-  void
-  on_uri_dispatched (const gchar * uri,
-                     gboolean      success,
-                     gpointer      user_data   G_GNUC_UNUSED)
-  {
+void on_uri_dispatched(const gchar* uri, gboolean success, 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;
+    {
+        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;
 }
 
 /***
 ****
 ***/
 
-void
-Phone :: create_menu ()
+void Phone::create_menu()
 {
-  GMenuItem * header;
-
-  /* create the submenu */
-  submenu.reset(g_menu_new (), GObjectDeleter());
-
-  /* populate the submenu */
-  rebuild_submenu();
-
-  /* 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.get()));
-
-  /* add the header to a new menu */
-  menu.reset(g_menu_new (), GObjectDeleter());
-  g_menu_append_item (menu.get(), header);
-  g_object_unref (header);
+    GMenuItem* header;
+
+    /* create the submenu */
+    submenu.reset(g_menu_new(), GObjectDeleter());
+
+    /* populate the submenu */
+    rebuild_submenu();
+
+    /* 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.get()));
+
+    /* add the header to a new menu */
+    menu.reset(g_menu_new(), GObjectDeleter());
+    g_menu_append_item(menu.get(), header);
+    g_object_unref(header);
 }
 
-void
-Phone::rebuild_submenu()
+void Phone::rebuild_submenu()
 {
-  g_menu_remove_all(submenu.get());
-
-  GMenuItem * location = g_menu_item_new(_("Location detection"),
-                                         "indicator." LOCATION_ACTION_KEY);
-  g_menu_item_set_attribute(location, "x-canonical-type", "s",
-                            "com.canonical.indicator.switch");
-  g_menu_append_item(submenu.get(), location);
-  g_object_unref(location);
-
-  g_menu_append (submenu.get(), _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::security-privacy");
+    g_menu_remove_all(submenu.get());
+
+    GMenuItem* location = g_menu_item_new(_("Location detection"), "indicator." LOCATION_ACTION_KEY);
+    g_menu_item_set_attribute(location, "x-canonical-type", "s", "com.canonical.indicator.switch");
+    g_menu_append_item(submenu.get(), location);
+    g_object_unref(location);
+
+    g_menu_append(submenu.get(), _("Location settings…"), "indicator." SETTINGS_ACTION_KEY "::security-privacy");
 }

=== modified file 'src/phone.h'
--- src/phone.h	2016-01-22 20:08:44 +0000
+++ src/phone.h	2016-01-22 20:08:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -17,8 +17,7 @@
  *   Charles Kerr <[e-mail]>
  */
 
-#ifndef __INDICATOR_LOCATION_PHONE_H__
-#define __INDICATOR_LOCATION_PHONE_H__
+#pragma once
 
 #include <memory>
 #include <vector>
@@ -30,50 +29,49 @@
 
 class Phone
 {
-  public:
-    Phone (const std::shared_ptr<Controller>& controller,
-           const std::shared_ptr<GSimpleActionGroup>& action_group);
-    virtual ~Phone ();
-    std::shared_ptr<GMenu> get_menu () { return menu; }
+public:
+    Phone(const std::shared_ptr<Controller>& controller, const std::shared_ptr<GSimpleActionGroup>& action_group);
+    virtual ~Phone();
+    std::shared_ptr<GMenu> get_menu()
+    {
+        return menu;
+    }
 
-  protected:
+protected:
     std::shared_ptr<Controller> controller;
     std::vector<core::ScopedConnection> controller_connections;
 
-  private:
+private:
     std::shared_ptr<GMenu> menu;
     std::shared_ptr<GMenu> submenu;
     std::shared_ptr<GSimpleActionGroup> action_group;
 
-  private:
-    void create_menu ();
+private:
+    void create_menu();
     void rebuild_submenu();
 
-  private:
-    bool should_be_visible () const;
-    GVariant * action_state_for_root () const;
-    GSimpleAction * create_root_action ();
+private:
+    bool should_be_visible() const;
+    GVariant* action_state_for_root() const;
+    GSimpleAction* create_root_action();
     void update_header();
     void update_actions_enabled();
 
-  private:
-    GVariant * action_state_for_location_detection ();
-    GSimpleAction * create_detection_enabled_action ();
+private:
+    GVariant* action_state_for_location_detection();
+    GSimpleAction* create_detection_enabled_action();
     void update_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_location_activated(GSimpleAction*, GVariant*, gpointer);
+
+private:
+    GVariant* action_state_for_gps_detection();
+    GSimpleAction* create_gps_enabled_action();
     void update_gps_enabled_action();
-    static void on_detection_gps_activated (GSimpleAction*, GVariant*, gpointer);
-
-  private:
-    GSimpleAction * create_settings_action ();
-
-  private:
-    GSimpleAction * create_licence_action ();
+    static void on_detection_gps_activated(GSimpleAction*, GVariant*, gpointer);
+
+private:
+    GSimpleAction* create_settings_action();
+
+private:
+    GSimpleAction* create_licence_action();
 };
-
-#endif /* __INDICATOR_LOCATION_PHONE_H__ */

=== modified file 'src/service.cc'
--- src/service.cc	2016-01-22 20:08:44 +0000
+++ src/service.cc	2016-01-22 20:08:44 +0000
@@ -1,20 +1,20 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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]>
- *
- * 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>
@@ -27,55 +27,53 @@
 ***
 **/
 
-Service :: Service (const 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,
-                               INDICATOR_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;
+Service::Service(const 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, INDICATOR_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;
     }
 }
 
@@ -83,82 +81,67 @@
 ****  GDBus
 ***/
 
-void
-Service :: on_name_lost (GDBusConnection * conn,
-                         const char      * name,
-                         gpointer          gself)
-{
-  g_debug ("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, conn);
-
-  static_cast<Service*>(gself)->on_name_lost (conn, name);
-}
-void
-Service :: on_name_lost (GDBusConnection * conn,
-                         const char      * name)
-{
-  g_debug ("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, conn);
-
-  if (name_lost_callback != nullptr)
-    (name_lost_callback)(this, name_lost_user_data);
-}
-
-void
-Service :: on_bus_acquired (GDBusConnection * conn,
-                            const char      * name,
-                            gpointer          gself)
-{
-  static_cast<Service*>(gself)->on_bus_acquired (conn, name);
-}
-void
-Service :: on_bus_acquired (GDBusConnection * conn,
-                            const char * name)
-{
-  g_debug ("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, conn);
-
-  this->connection.reset (G_DBUS_CONNECTION (g_object_ref(conn)));
-
-  GError * error = nullptr;
-
-  /* export the action group */
-
-  unsigned int export_id = g_dbus_connection_export_action_group (conn,
-                                                                  INDICATOR_OBJECT_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(), INDICATOR_OBJECT_PATH "/phone" }
-  };
-
-  for (unsigned int i=0, n=G_N_ELEMENTS(menus); i<n; i++)
-    { 
-      export_id = g_dbus_connection_export_menu_model (conn,
-                                                       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);
-        }
-    }
-}
-
+void Service::on_name_lost(GDBusConnection* conn, const char* name, gpointer gself)
+{
+    g_debug("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, conn);
+
+    static_cast<Service*>(gself)->on_name_lost(conn, name);
+}
+void Service::on_name_lost(GDBusConnection* conn, const char* name)
+{
+    g_debug("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, conn);
+
+    if (name_lost_callback != nullptr)
+    {
+        (name_lost_callback)(this, name_lost_user_data);
+    }
+}
+
+void Service::on_bus_acquired(GDBusConnection* conn, const char* name, gpointer gself)
+{
+    static_cast<Service*>(gself)->on_bus_acquired(conn, name);
+}
+void Service::on_bus_acquired(GDBusConnection* conn, const char* name)
+{
+    g_debug("%s::%s: %s %p", G_STRLOC, G_STRFUNC, name, conn);
+
+    this->connection.reset(G_DBUS_CONNECTION(g_object_ref(conn)));
+
+    GError* error = nullptr;
+
+    /* export the action group */
+
+    unsigned int export_id =
+        g_dbus_connection_export_action_group(conn, INDICATOR_OBJECT_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(), INDICATOR_OBJECT_PATH "/phone"}};
+
+    for (unsigned int i = 0, n = G_N_ELEMENTS(menus); i < n; i++)
+    {
+        export_id = g_dbus_connection_export_menu_model(conn, 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);
+        }
+    }
+}

=== modified file 'src/service.h'
--- src/service.h	2016-01-22 20:08:44 +0000
+++ src/service.h	2016-01-22 20:08:44 +0000
@@ -1,64 +1,59 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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]>
- *
- * 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__
+#pragma once
 
 #include <memory>
 #include <set>
 
 #include "controller.h"
 #include "phone.h"
-#include "utils.h" // GObjectDeleter
+#include "utils.h"  // GObjectDeleter
 
 class Service
 {
-  public:
-    explicit Service (const std::shared_ptr<Controller>& controller);
-    virtual ~Service ();
+public:
+    explicit Service(const std::shared_ptr<Controller>& controller);
+    virtual ~Service();
 
-  private:
+private:
     std::shared_ptr<GSimpleActionGroup> action_group;
-    std::unique_ptr<GDBusConnection,GObjectDeleter> connection;
+    std::unique_ptr<GDBusConnection, GObjectDeleter> connection;
     Phone phone_profile;
 
-  public:
+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:
+    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:
+    void* name_lost_user_data;
+
+private:
     unsigned int action_group_export_id;
     std::set<unsigned int> exported_menus;
-    void unexport ();
-
-
-  private: // DBus callbacks
+    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);
+    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__ */
-

=== modified file 'src/utils.h'
--- src/utils.h	2014-09-02 17:33:44 +0000
+++ src/utils.h	2016-01-22 20:08:44 +0000
@@ -1,37 +1,48 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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]>
- *
- * 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__
+#pragma once
 
 #include <glib.h>
 #include <gio/gio.h>
 
 struct GObjectDeleter
 {
-  void operator()(GObject            * o) { g_object_unref (o); }
+    void operator()(GObject* o)
+    {
+        g_object_unref(o);
+    }
 
-  void operator()(GMenu              * o) { operator()(G_OBJECT(o)); }
-  void operator()(GDBusProxy         * o) { operator()(G_OBJECT(o)); }
-  void operator()(GDBusConnection    * o) { operator()(G_OBJECT(o)); }
-  void operator()(GSimpleActionGroup * o) { operator()(G_OBJECT(o)); }
+    void operator()(GMenu* o)
+    {
+        operator()(G_OBJECT(o));
+    }
+    void operator()(GDBusProxy* 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__ */
-

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-04-16 01:54:48 +0000
+++ tests/CMakeLists.txt	2016-01-22 20:08:44 +0000
@@ -19,6 +19,9 @@
 set (CMAKE_C_FLAGS   "${CMAKE_C_FLAGS}   -g ${CC_WARNING_ARGS}")
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ${CC_WARNING_ARGS} -std=c++11")
 
+add_test(NAME formatcode 
+         COMMAND "${CMAKE_SOURCE_DIR}/tools/format-test.sh" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/tools/formatcode")
+
 ###
 ###  phone-test
 ###

=== modified file 'tests/controller-mock.h'
--- tests/controller-mock.h	2016-01-22 20:08:44 +0000
+++ tests/controller-mock.h	2016-01-22 20:08:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -21,25 +21,40 @@
 
 #include <src/controller.h>
 
-class MockController: public Controller
+class MockController : public Controller
 {
-  public:
-
-    MockController() =default;
-    virtual ~MockController() =default;
-
-    core::Property<bool>& is_valid() { return m_is_valid; }
-    const core::Property<bool>& is_valid() const override { return m_is_valid; }
-    const core::Property<bool>& gps_enabled() const override { return m_gps_enabled; }
-    const core::Property<bool>& location_service_enabled() const override { return m_location_service_enabled; }
-
-    void set_gps_enabled (bool enabled) override { m_gps_enabled=enabled; }
-    void set_location_service_enabled (bool enabled) override { m_location_service_enabled=enabled; }
-
-  private:
-
-    core::Property<bool> m_is_valid {true};
-    core::Property<bool> m_gps_enabled {false};
-    core::Property<bool> m_location_service_enabled {false};
+public:
+    MockController() = default;
+    virtual ~MockController() = default;
+
+    core::Property<bool>& is_valid()
+    {
+        return m_is_valid;
+    }
+    const core::Property<bool>& is_valid() const override
+    {
+        return m_is_valid;
+    }
+    const core::Property<bool>& gps_enabled() const override
+    {
+        return m_gps_enabled;
+    }
+    const core::Property<bool>& location_service_enabled() const override
+    {
+        return m_location_service_enabled;
+    }
+
+    void set_gps_enabled(bool enabled) override
+    {
+        m_gps_enabled = enabled;
+    }
+    void set_location_service_enabled(bool enabled) override
+    {
+        m_location_service_enabled = enabled;
+    }
+
+private:
+    core::Property<bool> m_is_valid{true};
+    core::Property<bool> m_gps_enabled{false};
+    core::Property<bool> m_location_service_enabled{false};
 };
-

=== modified file 'tests/gtest-dbus-fixture.h'
--- tests/gtest-dbus-fixture.h	2016-01-22 20:08:44 +0000
+++ tests/gtest-dbus-fixture.h	2016-01-22 20:08:44 +0000
@@ -1,22 +1,24 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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]>
- *
- * 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/>.
  */
 
+#pragma once
+
 #include <glib.h>
 #include <gio/gio.h>
 
@@ -28,114 +30,103 @@
 
 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, name);
-      return G_SOURCE_REMOVE;
-    }
-
-    static gboolean
-    wait_msec__timeout(gpointer loop)
-    {
-      g_main_loop_quit(static_cast<GMainLoop*>(loop));
-      return G_SOURCE_CONTINUE;
-    }
-
-  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);
+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, name);
+        return G_SOURCE_REMOVE;
+    }
+
+    static gboolean wait_msec__timeout(gpointer loop)
+    {
+        g_main_loop_quit(static_cast<GMainLoop*>(loop));
+        return G_SOURCE_CONTINUE;
+    }
+
+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);
+        // 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);
     }
 
-  protected:
-
+protected:
     /* convenience func to loop while waiting for a GObject's signal */
-    void wait_for_signal(gpointer o, const gchar * signal, const guint timeout_seconds=5)
+    void wait_for_signal(gpointer o, const gchar* signal, const guint timeout_seconds = 5)
     {
-      // wait for the signal or for timeout, whichever comes first
-      const auto handler_id = g_signal_connect_swapped(o, signal,
-                                                       G_CALLBACK(g_main_loop_quit),
-                                                       loop);
-      const auto timeout_id = g_timeout_add_seconds(timeout_seconds,
-                                                    wait_for_signal__timeout,
-                                                    loop);
-      g_main_loop_run(loop);
-      g_source_remove(timeout_id);
-      g_signal_handler_disconnect(o, handler_id);
+        // wait for the signal or for timeout, whichever comes first
+        const auto handler_id = g_signal_connect_swapped(o, signal, G_CALLBACK(g_main_loop_quit), loop);
+        const auto timeout_id = g_timeout_add_seconds(timeout_seconds, wait_for_signal__timeout, loop);
+        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(guint msec=50)
+    void wait_msec(guint msec = 50)
     {
-      const auto id = g_timeout_add(msec, wait_msec__timeout, loop);
-      g_main_loop_run(loop);
-      g_source_remove(id);
+        const auto id = g_timeout_add(msec, wait_msec__timeout, loop);
+        g_main_loop_run(loop);
+        g_source_remove(id);
     }
 
-    GMainLoop * loop;
-    GTestDBus * test_dbus;
-    GDBusConnection * conn;
+    GMainLoop* loop;
+    GTestDBus* test_dbus;
+    GDBusConnection* conn;
 };

=== modified file 'tests/gtest-dbus-indicator-fixture.h'
--- tests/gtest-dbus-indicator-fixture.h	2016-01-22 20:08:44 +0000
+++ tests/gtest-dbus-indicator-fixture.h	2016-01-22 20:08:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -17,264 +17,280 @@
  *   Charles Kerr <[e-mail]>
  */
 
+#pragma once
+
 #include "src/dbus-shared.h"
 #include "gtest-dbus-fixture.h"
 
-class GTestDBusIndicatorFixture: public GTestDBusFixture
+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);
+    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;
+    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      gany_item_changed)
-    {
-      *static_cast<gboolean*>(gany_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);
-    }
-
-    void wait_for_action_enabled_change (const gchar * action_name)
-    {
-      gchar * signal_name = g_strdup_printf ("action-enabled-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)
+    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 gany_item_changed)
+    {
+        *static_cast<gboolean*>(gany_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);
+    }
+
+    void wait_for_action_enabled_change(const gchar* action_name)
+    {
+        gchar* signal_name = g_strdup_printf("action-enabled-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]);
+        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);
+        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);
     }
 };

=== modified file 'tests/phone-test.cc'
--- tests/phone-test.cc	2016-01-22 20:08:44 +0000
+++ tests/phone-test.cc	2016-01-22 20:08:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 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
@@ -25,10 +25,9 @@
 #include "src/dbus-shared.h"
 #include "src/service.h"
 
-class PhoneTest: public GTestDBusIndicatorFixture
+class PhoneTest : public GTestDBusIndicatorFixture
 {
-  protected:
-
+protected:
     bool loc_enabled;
     bool loc_enabled_changed;
     bool gps_enabled;
@@ -38,330 +37,327 @@
     std::shared_ptr<Service> myService;
     std::vector<core::ScopedConnection> myConnections;
 
-  public:
-
-    void clear_callbacks ()
-    {
-      gps_enabled = false;
-      gps_enabled_changed = false;
-      loc_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 ());
-      myService.reset (new Service (myController));
-
-      myConnections.push_back(
-        myController->gps_enabled().changed().connect([this](bool enabled){
-          gps_enabled_changed = true;
-          gps_enabled = enabled;
-        })
-      );
-
-      myConnections.push_back(
-        myController->location_service_enabled().changed().connect([this](bool enabled){
-          loc_enabled_changed = true;
-          loc_enabled = enabled;
-        })
-      );
-    }
-
-    virtual void teardown_service ()
-    {
-      myService.reset ();
-      myConnections.clear ();
-      myController.reset ();
+public:
+    void clear_callbacks()
+    {
+        gps_enabled = false;
+        gps_enabled_changed = false;
+        loc_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());
+        myService.reset(new Service(myController));
+
+        myConnections.push_back(myController->gps_enabled().changed().connect([this](bool enabled)
+                                                                              {
+                                                                                  gps_enabled_changed = true;
+                                                                                  gps_enabled = enabled;
+                                                                              }));
+
+        myConnections.push_back(myController->location_service_enabled().changed().connect([this](bool enabled)
+                                                                                           {
+                                                                                               loc_enabled_changed =
+                                                                                                   true;
+                                                                                               loc_enabled = enabled;
+                                                                                           }));
+    }
+
+    virtual void teardown_service()
+    {
+        myService.reset();
+        myConnections.clear();
+        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_FALSE (action_menuitem_exists ("indicator.gps-detection-enabled"));
-  ASSERT_TRUE (action_menuitem_exists ("indicator.settings"));
-}
-
-TEST_F (PhoneTest, IsValidEnabled)
-{
-  bool is_valid = myController->is_valid().get();
-  auto ag = G_ACTION_GROUP(action_group);
-  constexpr int n_iters = 4;
-  const std::array<const char*,2> action_names = { "gps-detection-enabled",
-                                                   "location-detection-enabled" };
-
-  // test that the loc/gps actions are enabled/disabled based on controller->is_valid()
-  for (int i=0; i<n_iters; ++i)
-  {
-    is_valid = !is_valid;
-    myController->is_valid().set(is_valid);
-    wait_for_action_enabled_change(action_names[0]);
-    for(const auto& action_name : action_names)
-    {
-      EXPECT_EQ(is_valid, g_action_group_get_action_enabled(ag, action_name));
-    }
-  }
-}
-
-TEST_F (PhoneTest, IsValidVisible)
-{
-  // make sure something's enabled so that the indicator should be visible
-  if (!myController->location_service_enabled().get()) {
-    myController->set_location_service_enabled(true);
-    wait_for_action_state_change("location-detection-enabled");
-  }
-
-  // test the header's 'invisible' entry tracks the controller's is_valid() state
-  constexpr int n_iters = 4;
-  const char* header_action_name = INDICATOR_PROFILE "-header";
-  auto ag = G_ACTION_GROUP(action_group);
-  for (int i=0; i<n_iters; ++i)
-  {
-    myController->is_valid().set(!myController->is_valid().get());
-    wait_for_action_state_change(header_action_name);
-
-    auto dict = g_action_group_get_action_state(ag, header_action_name);
+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_FALSE(action_menuitem_exists("indicator.gps-detection-enabled"));
+    ASSERT_TRUE(action_menuitem_exists("indicator.settings"));
+}
+
+TEST_F(PhoneTest, IsValidEnabled)
+{
+    bool is_valid = myController->is_valid().get();
+    auto ag = G_ACTION_GROUP(action_group);
+    constexpr int n_iters = 4;
+    const std::array<const char*, 2> action_names = {"gps-detection-enabled", "location-detection-enabled"};
+
+    // test that the loc/gps actions are enabled/disabled based on controller->is_valid()
+    for (int i = 0; i < n_iters; ++i)
+    {
+        is_valid = !is_valid;
+        myController->is_valid().set(is_valid);
+        wait_for_action_enabled_change(action_names[0]);
+        for (const auto& action_name : action_names)
+        {
+            EXPECT_EQ(is_valid, g_action_group_get_action_enabled(ag, action_name));
+        }
+    }
+}
+
+TEST_F(PhoneTest, IsValidVisible)
+{
+    // make sure something's enabled so that the indicator should be visible
+    if (!myController->location_service_enabled().get())
+    {
+        myController->set_location_service_enabled(true);
+        wait_for_action_state_change("location-detection-enabled");
+    }
+
+    // test the header's 'invisible' entry tracks the controller's is_valid() state
+    constexpr int n_iters = 4;
+    const char* header_action_name = INDICATOR_PROFILE "-header";
+    auto ag = G_ACTION_GROUP(action_group);
+    for (int i = 0; i < n_iters; ++i)
+    {
+        myController->is_valid().set(!myController->is_valid().get());
+        wait_for_action_state_change(header_action_name);
+
+        auto dict = g_action_group_get_action_state(ag, header_action_name);
+        EXPECT_TRUE(dict != nullptr);
+        EXPECT_TRUE(g_variant_is_of_type(dict, G_VARIANT_TYPE_VARDICT));
+        auto v = g_variant_lookup_value(dict, "visible", G_VARIANT_TYPE_BOOLEAN);
+        EXPECT_TRUE(v != nullptr);
+        EXPECT_EQ(myController->is_valid().get(), g_variant_get_boolean(v));
+        g_clear_pointer(&v, g_variant_unref);
+        g_clear_pointer(&dict, g_variant_unref);
+    }
+}
+
+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);
+    }
+}
+
+TEST_F(PhoneTest, Header)
+{
+    wait_msec();
+
+    auto connection = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
+
+    // SETUP: get the action group and wait for it to be populated
+    auto dbus_action_group = g_dbus_action_group_get(connection, INDICATOR_BUS_NAME, INDICATOR_OBJECT_PATH);
+    auto action_group = G_ACTION_GROUP(dbus_action_group);
+    auto names_strv = g_action_group_list_actions(action_group);
+    if (g_strv_length(names_strv) == 0)
+    {
+        g_strfreev(names_strv);
+        wait_for_signal(dbus_action_group, "action-added");
+        names_strv = g_action_group_list_actions(action_group);
+    }
+    g_clear_pointer(&names_strv, g_strfreev);
+
+    // SETUP: get the menu model and wait for it to be activated
+    auto dbus_menu_model =
+        g_dbus_menu_model_get(connection, INDICATOR_BUS_NAME, INDICATOR_OBJECT_PATH "/" INDICATOR_PROFILE);
+    auto menu_model = G_MENU_MODEL(dbus_menu_model);
+    int n = g_menu_model_get_n_items(menu_model);
+    if (!n)
+    {
+        // give the model a moment to populate its info
+        wait_msec(100);
+        n = g_menu_model_get_n_items(menu_model);
+    }
+    EXPECT_TRUE(menu_model != nullptr);
+    EXPECT_NE(0, n);
+
+    // test to confirm that a header menuitem exists
+    gchar* str = nullptr;
+    g_menu_model_get_item_attribute(menu_model, 0, "x-canonical-type", "s", &str);
+    EXPECT_STREQ("com.canonical.indicator.root", str);
+    g_clear_pointer(&str, g_free);
+    g_menu_model_get_item_attribute(menu_model, 0, G_MENU_ATTRIBUTE_ACTION, "s", &str);
+    const auto action_name = INDICATOR_PROFILE "-header";
+    EXPECT_EQ(std::string("indicator.") + action_name, str);
+    g_clear_pointer(&str, g_free);
+
+    // cursory first look at the header
+    auto dict = g_action_group_get_action_state(action_group, action_name);
     EXPECT_TRUE(dict != nullptr);
     EXPECT_TRUE(g_variant_is_of_type(dict, G_VARIANT_TYPE_VARDICT));
-    auto v = g_variant_lookup_value(dict, "visible", G_VARIANT_TYPE_BOOLEAN);
-    EXPECT_TRUE(v != nullptr);
-    EXPECT_EQ(myController->is_valid().get(), g_variant_get_boolean(v));
+    auto v = g_variant_lookup_value(dict, "accessible-desc", G_VARIANT_TYPE_STRING);
+    EXPECT_TRUE(v != nullptr);
+    g_variant_unref(v);
+    v = g_variant_lookup_value(dict, "title", G_VARIANT_TYPE_STRING);
+    EXPECT_TRUE(v != nullptr);
+    g_variant_unref(v);
+    v = g_variant_lookup_value(dict, "visible", G_VARIANT_TYPE_BOOLEAN);
+    EXPECT_TRUE(v != nullptr);
     g_clear_pointer(&v, g_variant_unref);
     g_clear_pointer(&dict, g_variant_unref);
-  }
-}
-
-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);
-    }
-}
-
-TEST_F (PhoneTest, Header)
-{
-  wait_msec();
-
-  auto connection = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
-
-  // SETUP: get the action group and wait for it to be populated
-  auto dbus_action_group = g_dbus_action_group_get(connection, INDICATOR_BUS_NAME, INDICATOR_OBJECT_PATH);
-  auto action_group = G_ACTION_GROUP(dbus_action_group);
-  auto names_strv = g_action_group_list_actions(action_group);
-  if (g_strv_length(names_strv) == 0)
-    {
-      g_strfreev(names_strv);
-      wait_for_signal(dbus_action_group, "action-added");
-      names_strv = g_action_group_list_actions(action_group);
-    }
-  g_clear_pointer(&names_strv, g_strfreev);
-
-  // SETUP: get the menu model and wait for it to be activated
-  auto dbus_menu_model = g_dbus_menu_model_get(connection, INDICATOR_BUS_NAME, INDICATOR_OBJECT_PATH "/" INDICATOR_PROFILE);
-  auto menu_model = G_MENU_MODEL(dbus_menu_model);
-  int n = g_menu_model_get_n_items(menu_model);
-  if (!n)
-    {
-      // give the model a moment to populate its info
-      wait_msec(100);
-      n = g_menu_model_get_n_items(menu_model);
-    }
-  EXPECT_TRUE(menu_model != nullptr);
-  EXPECT_NE(0, n);
-
-  // test to confirm that a header menuitem exists
-  gchar* str = nullptr;
-  g_menu_model_get_item_attribute(menu_model, 0, "x-canonical-type", "s", &str);
-  EXPECT_STREQ("com.canonical.indicator.root", str);
-  g_clear_pointer(&str, g_free);
-  g_menu_model_get_item_attribute(menu_model, 0, G_MENU_ATTRIBUTE_ACTION, "s", &str);
-  const auto action_name = INDICATOR_PROFILE "-header";
-  EXPECT_EQ(std::string("indicator.")+action_name, str);
-  g_clear_pointer(&str, g_free);
-
-  // cursory first look at the header
-  auto dict = g_action_group_get_action_state(action_group, action_name);
-  EXPECT_TRUE(dict != nullptr);
-  EXPECT_TRUE(g_variant_is_of_type(dict, G_VARIANT_TYPE_VARDICT));
-  auto v = g_variant_lookup_value(dict, "accessible-desc", G_VARIANT_TYPE_STRING);
-  EXPECT_TRUE(v != nullptr);
-  g_variant_unref(v);
-  v = g_variant_lookup_value(dict, "title", G_VARIANT_TYPE_STRING);
-  EXPECT_TRUE(v != nullptr);
-  g_variant_unref(v);
-  v = g_variant_lookup_value(dict, "visible", G_VARIANT_TYPE_BOOLEAN);
-  EXPECT_TRUE(v != nullptr);
-  g_clear_pointer(&v, g_variant_unref);
-  g_clear_pointer(&dict, g_variant_unref);
-
-  // test visibility states
-  struct {
-    bool gps_enabled;
-    bool location_service_enabled;
-    bool expected_visible;
-  } visibility_tests[] = {
-    { false, false, false },
-    { true,  false, false },
-    { false, true,  true },
-    { true,  true,  true }
-  };
-  for (const auto& test : visibility_tests)
-    {
-      myController->set_gps_enabled(test.gps_enabled);
-      myController->set_location_service_enabled(test.location_service_enabled);
-      wait_msec();
-
-      // cusory first look at the header
-      dict = g_action_group_get_action_state(action_group, action_name);
-      EXPECT_TRUE(dict != nullptr);
-      EXPECT_TRUE(g_variant_is_of_type(dict, G_VARIANT_TYPE_VARDICT));
-      v = g_variant_lookup_value(dict, "visible", G_VARIANT_TYPE_BOOLEAN);
-      EXPECT_TRUE(v != nullptr);
-      EXPECT_EQ(test.expected_visible, g_variant_get_boolean(v));
-      g_clear_pointer(&v, g_variant_unref);
-      g_clear_pointer(&dict, g_variant_unref);
-    }
-
-  // cleanup
-  g_clear_object(&action_group);
-  g_clear_object(&dbus_menu_model);
-  g_clear_object(&connection);
-}
-
+
+    // test visibility states
+    struct
+    {
+        bool gps_enabled;
+        bool location_service_enabled;
+        bool expected_visible;
+    } visibility_tests[] = {{false, false, false}, {true, false, false}, {false, true, true}, {true, true, true}};
+    for (const auto& test : visibility_tests)
+    {
+        myController->set_gps_enabled(test.gps_enabled);
+        myController->set_location_service_enabled(test.location_service_enabled);
+        wait_msec();
+
+        // cusory first look at the header
+        dict = g_action_group_get_action_state(action_group, action_name);
+        EXPECT_TRUE(dict != nullptr);
+        EXPECT_TRUE(g_variant_is_of_type(dict, G_VARIANT_TYPE_VARDICT));
+        v = g_variant_lookup_value(dict, "visible", G_VARIANT_TYPE_BOOLEAN);
+        EXPECT_TRUE(v != nullptr);
+        EXPECT_EQ(test.expected_visible, g_variant_get_boolean(v));
+        g_clear_pointer(&v, g_variant_unref);
+        g_clear_pointer(&dict, g_variant_unref);
+    }
+
+    // cleanup
+    g_clear_object(&action_group);
+    g_clear_object(&dbus_menu_model);
+    g_clear_object(&connection);
+}

=== added directory 'tools'
=== added file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tools/CMakeLists.txt	2016-01-22 20:08:44 +0000
@@ -0,0 +1,1 @@
+configure_file(formatcode.in formatcode)

=== added file 'tools/format-files.sh'
--- tools/format-files.sh	1970-01-01 00:00:00 +0000
+++ tools/format-files.sh	2016-01-22 20:08:44 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 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/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+
+# Simple script to run the code base through astyle, followed by clang-format (which
+# undoes some damage that's done by astyle, without wiping out astyle edits we want
+# to happen).
+#
+# If either program makes a mess of some file such that it won't compile anymore
+# or otherwise gets adorned with unacceptable edits, add the file to the list
+# of files to filter out (grep -v below).
+
+usage()
+{
+    echo usage: format-files project_dir astyle_cmd clang_format_cmd 2>&1
+    exit 1
+}
+
+[ $# -ne 3 ] && usage
+
+dir="$1"
+astyle="$2"
+format="$3"
+
+files=`find "$dir" -name '*.h' -o -name '*.cpp' -o -name '*.c'  -o -name '*.cc' \
+    | grep -v UnityScopesApi_tp.h`
+
+"$astyle" --options="$dir"/astyle-config -n $files
+[ $? -ne 0 ] && exit $?
+
+# astyle 2.03 writes DOS line endings: https://sourceforge.net/p/astyle/bugs/268/
+dos2unix -q $files
+
+"$format" -i -style=file $files
+exit $?

=== added file 'tools/format-test.sh'
--- tools/format-test.sh	1970-01-01 00:00:00 +0000
+++ tools/format-test.sh	2016-01-22 20:08:44 +0000
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 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/>.
+
+# Tests to see if a file is in the project's format.
+
+usage()
+{
+    echo usage: format-test project_dir formatcode 2>&1
+    exit 1
+}
+
+[ $# -ne 2 ] && usage
+
+dir="$1"
+formatcode="$2"
+
+exitval=0
+for file in $(find "$dir" -name '*.h' -o -name '*.cpp' -o -name '*.c' -o -name '*.cc' -print0 | xargs -0);
+do
+    results=$(cat $file | $formatcode | diff -u $file -)
+    linecount=$(echo "$var" | wc -l)
+    if test $linecount -gt 1
+    then
+        basecmd=$(basename $0)
+        echo "$basecmd FAIL $file"
+        echo "${results}"
+        exitval=1
+    fi
+done
+
+exit $exitval

=== added file 'tools/formatcode.in'
--- tools/formatcode.in	1970-01-01 00:00:00 +0000
+++ tools/formatcode.in	2016-01-22 20:08:44 +0000
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser 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 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/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+
+# Simple script to format files with astyle, followed by clang-format (which
+# undoes some damage that's done by astyle, without wiping out astyle edits we want
+# to happen).
+#
+# usage: formatcode [FILE]...
+#
+# If no arguments are provided, we format stdin and write to stdout.
+
+astyle="@ASTYLE_COMMAND@"
+format="@CLANG_FORMAT_COMMAND@"
+dos2unix="@DOS2UNIX_COMMAND@"
+style="@CMAKE_SOURCE_DIR@/_clang-format"
+
+# Check that the format commands were found.
+[ "$astyle" = "ASTYLE_COMMAND-NOTFOUND" -o \
+  "$dos2unix" = "DOS2UNIX_COMMAND-NOTFOUND" -o \
+  "$format" = "CLANG_FORMAT_COMMAND-NOTFOUND" ] && {
+    echo "formatcode: cmake did not find all formatting tools" >&2
+    exit 1
+}
+
+# If no arguments were provided, read stdin and write stdout.
+# Recent versions of astyle can't read stdin: http://sourceforge.net/p/astyle/bugs/63/
+# astyle 2.03 writes DOS line endings: https://sourceforge.net/p/astyle/bugs/268/
+[ $# -eq 0 ] && {
+    tmpdir=`mktemp -d`
+    tmp=`mktemp -p $tmpdir`
+    cp "$style" $tmpdir
+    cat >$tmp
+    cd $tmpdir
+    "$astyle" -q --options=@CMAKE_SOURCE_DIR@/astyle-config -n $tmp
+    "$dos2unix" -q $tmp
+    "$format" -i -style=file $tmp
+    cat $tmp
+    rm -fr $tmpdir
+    exit $?
+}
+
+# Format files in place.
+"$astyle" --options=@CMAKE_SOURCE_DIR@/astyle-config -n "$@"
+[ $? -ne 0 ] && exit $?
+
+"$dos2unix" -q "$@"
+
+"$format" -i -style=file $files "$@"
+exit $?