Merge lp:~bregma/ubuntu-app-launch/app-object into lp:ubuntu-app-launch/16.04

[Stephen M. Webb]

fix build deps

test merge for Libertine demo

[lp:~bregma/ubuntu-app-launch/app-object]

229. By Ted Gould on 2016-02-08

Removing signals from the API for this MR

230. By Ted Gould on 2016-02-08

Revert back to 'C' versions of these tools

231. By Ted Gould on 2016-02-08

Fix symbols

232. By Ted Gould on 2016-02-08

Switch to a different arbitrary style

233. By Ted Gould on 2016-02-08

Switch from symbols to shlibs

234. By Ted Gould on 2016-02-09

Namespace bike shedding

235. By Ted Gould on 2016-02-09

Remove as member functions

236. By Ted Gould on 2016-02-09

Adding the class keyword to enums

237. By Ted Gould on 2016-02-09

Optimize constructors

238. By Ted Gould on 2016-02-09

Explicit constructor

239. By Ted Gould on 2016-02-09

Check to ensure cpath isn't null

240. By Ted Gould on 2016-02-09

Make URL vectors const references

241. By Ted Gould on 2016-02-09

Make the constructor fail if there is no keyfile instead of waiting when we get info()

242. By Ted Gould on 2016-02-09

Passing the manifests by const reference

243. By Ted Gould on 2016-02-09

Adding a format target

244. By Ted Gould on 2016-02-09

Exception on manifest failures and ensure that we have it early

245. By Ted Gould on 2016-02-10

Stop incrementing ref counts to make the code faster

246. By Ted Gould on 2016-02-10

Check for keyfile in constructor

247. By Ted Gould on 2016-02-10

Check for keyfile in constructor

248. By Ted Gould on 2016-02-10

Move prototype

249. By Ted Gould on 2016-02-10

Making voids implicit instead of explicit

250. By Ted Gould on 2016-02-10

Move from one implementation only location to another implementation only location

251. By Ted Gould on 2016-02-10

Constexpr

252. By Ted Gould on 2016-02-10

Adding extra commas

253. By Ted Gould on 2016-02-10

Less splash, more namespacing

254. By Ted Gould on 2016-02-10

Change to supportsUbuntuLifecycle

255. By Stephen M. Webb on 2016-02-17

added missing build-dep on libproperties-cpp-dev

256. By Stephen M. Webb on 2016-02-17

use -std=gnu99 instead of c99 to fix FTBFS on some architectures

257. By Stephen M. Webb on 2016-02-17

Fixed a coupla FTBFS and bumped version for Silo 58 testing.

258. By Stephen M. Webb on 2016-02-18

Disabled a bunch of chronically-failing tests.

259. By Stephen M. Webb on 2016-03-04

merge latest ted upstream branch

Unmerged revisions

259. By Stephen M. Webb on 2016-03-04

merge latest ted upstream branch

258. By Stephen M. Webb on 2016-02-18

Disabled a bunch of chronically-failing tests.

257. By Stephen M. Webb on 2016-02-17

Fixed a coupla FTBFS and bumped version for Silo 58 testing.

256. By Stephen M. Webb on 2016-02-17

use -std=gnu99 instead of c99 to fix FTBFS on some architectures

255. By Stephen M. Webb on 2016-02-17

added missing build-dep on libproperties-cpp-dev

=== modified file '.bzrignore'
--- .bzrignore	2014-06-14 16:32:00 +0000
+++ .bzrignore	2016-03-04 11:34:19 +0000
@@ -5,3 +5,9 @@
 cmake_install.cmake
 *-trace.[ch]
 cgroup-reap-all
+libubuntu-app-launch/UbuntuAppLaunch-2.gir
+libubuntu-app-launch/UbuntuAppLaunch-2.typelib
+libubuntu-app-launch/libubuntu-app-launch.so.2*
+libubuntu-app-launch/proxy-socket-demangler.c
+libubuntu-app-launch/proxy-socket-demangler.h
+libubuntu-app-launch/ubuntu-app-launch-2.pc

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-11 02:45:49 +0000
+++ CMakeLists.txt	2016-03-04 11:34:19 +0000
@@ -37,7 +37,8 @@
 set(ubuntu_app_launch_arch "${UBUNTU_APP_LAUNCH_ARCH}")
 
 # Deprecated needed for g_atexit() in libual
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-error=unused-function -Wno-error=deprecated-declarations -std=c99")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-error=unused-function -Wno-error=deprecated-declarations -std=gnu99")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++11 -pthread")
 
 enable_testing()
 
@@ -77,6 +78,9 @@
 pkg_check_modules(MIR mirclient)
 include_directories(${MIR_INCLUDE_DIRS})
 
+pkg_check_modules(LIBERTINE libertine)
+include_directories(${LIBERTINE_INCLUDE_DIRS})
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")

=== added file '_clang-format'
--- _clang-format	1970-01-01 00:00:00 +0000
+++ _clang-format	2016-03-04 11:34:19 +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
+...
+

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-17 21:38:34 +0000
+++ debian/changelog	2016-03-04 11:34:19 +0000
@@ -1,3 +1,16 @@
+ubuntu-app-launch (0.9~smw2) UNRELEASED; urgency=medium
+
+  [ Ted Gould ]
+  * Add new C++ API that has a retained object for maintaining
+    connections through multiple calls. Also provides for getting
+    consistent application metadata.
+
+  [ Stephen M. Webb ]
+  * Fixed a coupla FTBFS and bumped version for Silo 58 testing.
+  * Disabled a bunch of chronically-failing tests.
+
+ -- Ted Gould <[e-mail]>  Tue, 26 Jan 2016 15:22:06 -0600
+
 ubuntu-app-launch (0.5+15.10.20150817-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'debian/control'
--- debian/control	2015-07-31 00:15:57 +0000
+++ debian/control	2016-03-04 11:34:19 +0000
@@ -15,10 +15,12 @@
                libglib2.0-dev,
                libgtest-dev,
                libjson-glib-dev,
+               liblibertine-dev,
                liblttng-ust-dev,
                libmirclient-dev (>= 0.5),
                libnih-dbus-dev,
                libnih-dev,
+               libproperties-cpp-dev,
                libupstart-dev,
                libzeitgeist-2.0-dev,
                gobject-introspection,

=== added file 'debian/libubuntu-app-launch2.shlibs'
--- debian/libubuntu-app-launch2.shlibs	1970-01-01 00:00:00 +0000
+++ debian/libubuntu-app-launch2.shlibs	2016-03-04 11:34:19 +0000
@@ -0,0 +1,1 @@
+libubuntu-app-launch 2 libubuntu-app-launch2 (>= 0.9)

=== removed file 'debian/libubuntu-app-launch2.symbols'
--- debian/libubuntu-app-launch2.symbols	2015-08-17 21:38:34 +0000
+++ debian/libubuntu-app-launch2.symbols	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-libubuntu-app-launch.so.2 libubuntu-app-launch2 #MINVER#
- ubuntu_app_launch_app_id_parse@Base 0.4
- ubuntu_app_launch_application_info@Base 0.5+15.10.20150817
- ubuntu_app_launch_application_log_path@Base 0.4
- ubuntu_app_launch_get_primary_pid@Base 0.4
- ubuntu_app_launch_helper_set_exec@Base 0.5+15.10.20150604
- ubuntu_app_launch_list_helper_instances@Base 0.4
- ubuntu_app_launch_list_helpers@Base 0.4
- ubuntu_app_launch_list_running_apps@Base 0.4
- ubuntu_app_launch_observer_add_app_failed@Base 0.4
- ubuntu_app_launch_observer_add_app_focus@Base 0.4
- ubuntu_app_launch_observer_add_app_paused@Base 0.4+15.04.20150305.1
- ubuntu_app_launch_observer_add_app_resume@Base 0.4
- ubuntu_app_launch_observer_add_app_resumed@Base 0.4+15.04.20150305.1
- ubuntu_app_launch_observer_add_app_started@Base 0.4
- ubuntu_app_launch_observer_add_app_starting@Base 0.4
- ubuntu_app_launch_observer_add_app_stop@Base 0.4
- ubuntu_app_launch_observer_add_helper_started@Base 0.4
- ubuntu_app_launch_observer_add_helper_stop@Base 0.4
- ubuntu_app_launch_observer_delete_app_failed@Base 0.4
- ubuntu_app_launch_observer_delete_app_focus@Base 0.4
- ubuntu_app_launch_observer_delete_app_paused@Base 0.4+15.04.20150305.1
- ubuntu_app_launch_observer_delete_app_resume@Base 0.4
- ubuntu_app_launch_observer_delete_app_resumed@Base 0.4+15.04.20150305.1
- ubuntu_app_launch_observer_delete_app_started@Base 0.4
- ubuntu_app_launch_observer_delete_app_starting@Base 0.4
- ubuntu_app_launch_observer_delete_app_stop@Base 0.4
- ubuntu_app_launch_observer_delete_helper_started@Base 0.4
- ubuntu_app_launch_observer_delete_helper_stop@Base 0.4
- ubuntu_app_launch_pause_application@Base 0.4+14.10.20140915.3
- ubuntu_app_launch_pid_in_app_id@Base 0.4
- ubuntu_app_launch_resume_application@Base 0.4+14.10.20140915.3
- ubuntu_app_launch_start_application@Base 0.4
- ubuntu_app_launch_start_application_test@Base 0.4
- ubuntu_app_launch_start_helper@Base 0.4
- ubuntu_app_launch_start_multiple_helper@Base 0.4
- ubuntu_app_launch_start_session_helper@Base 0.5+15.10.20150604
- ubuntu_app_launch_stop_application@Base 0.4
- ubuntu_app_launch_stop_helper@Base 0.4
- ubuntu_app_launch_stop_multiple_helper@Base 0.4
- ubuntu_app_launch_triplet_to_app_id@Base 0.4

=== modified file 'debian/rules'
--- debian/rules	2014-11-21 16:43:12 +0000
+++ debian/rules	2016-03-04 11:34:19 +0000
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# Error on symbol errors
-export DPKG_GENSYMBOLS_CHECK_LEVEL=4
-
 # Get full logs in tests
 export G_MESSAGES_DEBUG=all
 

=== modified file 'helpers-shared.c'
--- helpers-shared.c	2015-07-15 02:32:54 +0000
+++ helpers-shared.c	2016-03-04 11:34:19 +0000
@@ -145,6 +145,8 @@
 	cgroup_manager_connection_core_cb(g_dbus_connection_new_for_address_finish, res, (cgm_connection_t *)data);
 }
 
+G_DEFINE_QUARK(CGMANAGER_CONTEXT, cgmanager_context);
+
 /* Get the connection to the cgroup manager */
 GDBusConnection *
 cgroup_manager_connection (void)
@@ -191,7 +193,9 @@
 	g_main_context_pop_thread_default(context);
 
 	if (!use_session_bus && connection.con != NULL) {
-		g_object_set_data(G_OBJECT(connection.con), "cgmanager-context", context);
+		g_object_set_qdata(G_OBJECT(connection.con),
+		                   cgmanager_context_quark(),
+		                   context);
 	} else {
 		g_main_context_unref(context);
 	}
@@ -213,7 +217,7 @@
 	if (cgmanager == NULL)
 		return;
 
-	GMainContext * creationcontext = g_object_get_data(G_OBJECT(cgmanager), "cgmanager-context");
+	GMainContext * creationcontext = g_object_get_qdata(G_OBJECT(cgmanager), cgmanager_context_quark());
 	if (creationcontext == NULL) {
 		g_object_unref(cgmanager);
 		return;
@@ -228,6 +232,11 @@
 	}
 
 	g_object_unref(cgmanager);
+
+	while (g_main_context_pending(creationcontext)) {
+		g_main_context_iteration(creationcontext, TRUE /* may block */);
+	}
+
 	g_main_context_unref(creationcontext);
 }
 

=== modified file 'libubuntu-app-launch/CMakeLists.txt'
--- libubuntu-app-launch/CMakeLists.txt	2015-08-11 19:11:15 +0000
+++ libubuntu-app-launch/CMakeLists.txt	2016-03-04 11:34:19 +0000
@@ -17,6 +17,7 @@
 add_lttng_gen_tp(NAME ubuntu-app-launch-trace)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 add_definitions ( -DOOM_HELPER="${pkglibexecdir}/oom-adjust-setuid-helper" -DDEMANGLER_PATH="${pkglibexecdir}/socket-demangler" )
 add_definitions ( -DLIBERTINE_LAUNCH="${CMAKE_INSTALL_FULL_BINDIR}/libertine-launch" )
 
@@ -24,6 +25,28 @@
 ubuntu-app-launch.h
 )
 
+set(LAUNCHER_CPP_HEADERS
+appid.h
+application.h
+helper.h
+registry.h
+type-tagger.h
+)
+
+set(LAUNCHER_CPP_SOURCES
+application.cpp
+helper.cpp
+registry.cpp
+registry-impl.cpp
+application-impl-base.cpp
+application-impl-click.cpp
+application-impl-legacy.cpp
+application-impl-libertine.cpp
+application-info-desktop.cpp
+helper-impl-click.cpp
+glib-thread.cpp
+)
+
 set(LAUNCHER_SOURCES
 ubuntu-app-launch.c
 second-exec-core.c
@@ -31,6 +54,11 @@
 desktop-exec.c
 ubuntu-app-launch-trace.c
 app-info.c
+${LAUNCHER_CPP_SOURCES}
+)
+
+add_custom_target(format
+	COMMAND clang-format -i -style=file ${LAUNCHER_CPP_HEADERS} ${LAUNCHER_CPP_SOURCES}
 )
 
 set(LAUNCHER_GEN_SOURCES
@@ -59,6 +87,7 @@
 	${CLICK_LIBRARIES}
 	${ZEITGEIST_LIBRARIES}
 	${MIR_LIBRARIES}
+	${LIBERTINE_LIBRARIES}
 	helpers
 	-Wl,--no-undefined
 )
@@ -69,6 +98,11 @@
 )
 
 install(
+	FILES ${LAUNCHER_CPP_HEADERS}
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libubuntu-app-launch-${API_VERSION}/ubuntu-app-launch"
+)
+
+install(
 	TARGETS ubuntu-launcher
 	LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )

=== added file 'libubuntu-app-launch/appid.h'
--- libubuntu-app-launch/appid.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/appid.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <string>
+
+#include "type-tagger.h"
+
+#pragma once
+#pragma GCC visibility push(default)
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+struct AppID
+{
+    struct PackageTag;
+    struct AppNameTag;
+    struct VersionTag;
+
+    typedef TypeTagger<PackageTag, std::string> Package;
+    typedef TypeTagger<AppNameTag, std::string> AppName;
+    typedef TypeTagger<VersionTag, std::string> Version;
+
+    Package package;
+    AppName appname;
+    Version version;
+
+    operator std::string() const;
+
+    AppID();
+    AppID(Package pkg, AppName app, Version ver);
+    bool empty() const;
+
+    static AppID parse(const std::string& appid);
+
+    enum class ApplicationWildcard
+    {
+        FIRST_LISTED,
+        LAST_LISTED,
+        ONLY_LISTED,
+    };
+    enum class VersionWildcard
+    {
+        CURRENT_USER_VERSION,
+    };
+
+    static AppID discover(const std::string& package,
+                          ApplicationWildcard appwildcard = ApplicationWildcard::FIRST_LISTED,
+                          VersionWildcard versionwildcard = VersionWildcard::CURRENT_USER_VERSION);
+    static AppID discover(const std::string& package,
+                          const std::string& appname,
+                          VersionWildcard versionwildcard = VersionWildcard::CURRENT_USER_VERSION);
+    static AppID discover(const std::string& package, const std::string& appname, const std::string& version);
+
+    static AppID find(const std::string& sappid);
+    static bool valid(const std::string& sappid);
+};
+
+bool operator==(const AppID& a, const AppID& b);
+bool operator!=(const AppID& a, const AppID& b);
+
+};  // namespace app_launch
+};  // namespace ubuntu
+
+#pragma GCC visibility pop

=== added file 'libubuntu-app-launch/application-impl-base.cpp'
--- libubuntu-app-launch/application-impl-base.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-base.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application-impl-base.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+Base::Base(const std::shared_ptr<Registry>& registry)
+    : _registry(registry)
+{
+}
+
+bool Base::hasInstances()
+{
+    std::string sappid = appId();
+    return ubuntu_app_launch_get_primary_pid(sappid.c_str()) != 0;
+}
+
+class BaseInstance : public Application::Instance
+{
+public:
+    explicit BaseInstance(const std::string& appId);
+
+    /* Query lifecycle */
+    bool isRunning() override
+    {
+        return ubuntu_app_launch_get_primary_pid(_appId.c_str()) != 0;
+    }
+    pid_t primaryPid() override
+    {
+        return ubuntu_app_launch_get_primary_pid(_appId.c_str());
+    }
+    bool hasPid(pid_t pid) override
+    {
+        return ubuntu_app_launch_pid_in_app_id(pid, _appId.c_str()) == TRUE;
+    }
+    std::string logPath() override
+    {
+        auto cpath = ubuntu_app_launch_application_log_path(_appId.c_str());
+        if (cpath != nullptr)
+        {
+            std::string retval(cpath);
+            g_free(cpath);
+            return retval;
+        }
+        else
+        {
+            return {};
+        }
+    }
+    std::vector<pid_t> pids() override
+    {
+        std::vector<pid_t> vector;
+        GList* list = ubuntu_app_launch_get_pids(_appId.c_str());
+
+        for (GList* pntr = list; pntr != nullptr; pntr = g_list_next(pntr))
+        {
+            vector.push_back(static_cast<pid_t>(GPOINTER_TO_INT(list->data)));
+        }
+
+        g_list_free(list);
+
+        return vector;
+    }
+
+    /* Manage lifecycle */
+    void pause() override
+    {
+        ubuntu_app_launch_pause_application(_appId.c_str());
+    }
+    void resume() override
+    {
+        ubuntu_app_launch_resume_application(_appId.c_str());
+    }
+    void stop() override
+    {
+        ubuntu_app_launch_stop_application(_appId.c_str());
+    }
+
+private:
+    std::string _appId;
+};
+
+BaseInstance::BaseInstance(const std::string& appId)
+    : _appId(appId)
+{
+}
+
+std::vector<std::shared_ptr<Application::Instance>> Base::instances()
+{
+    std::vector<std::shared_ptr<Instance>> vect;
+    vect.emplace_back(std::make_shared<BaseInstance>(appId()));
+    return vect;
+}
+
+std::shared_ptr<gchar*> urlsToStrv(std::vector<Application::URL> urls)
+{
+    auto array = g_array_new(TRUE, FALSE, sizeof(gchar*));
+
+    for (auto url : urls)
+    {
+        auto str = g_strdup(url.value().c_str());
+        g_array_append_val(array, str);
+    }
+
+    return std::shared_ptr<gchar*>((gchar**)g_array_free(array, FALSE), g_strfreev);
+}
+
+std::shared_ptr<Application::Instance> Base::launch(const std::vector<Application::URL>& urls)
+{
+    std::string appIdStr = appId();
+    std::shared_ptr<gchar*> urlstrv;
+
+    if (urls.size() > 0)
+    {
+        urlstrv = urlsToStrv(urls);
+    }
+
+    ubuntu_app_launch_start_application(appIdStr.c_str(), urlstrv.get());
+
+    return std::make_shared<BaseInstance>(appIdStr);
+}
+
+std::shared_ptr<Application::Instance> Base::launchTest(const std::vector<Application::URL>& urls)
+{
+    std::string appIdStr = appId();
+    std::shared_ptr<gchar*> urlstrv;
+
+    if (urls.size() > 0)
+    {
+        urlstrv = urlsToStrv(urls);
+    }
+
+    ubuntu_app_launch_start_application_test(appIdStr.c_str(), urlstrv.get());
+
+    return std::make_shared<BaseInstance>(appIdStr);
+}
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-impl-base.h'
--- libubuntu-app-launch/application-impl-base.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-base.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application.h"
+
+extern "C" {
+#include "ubuntu-app-launch.h"
+}
+
+#pragma once
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+class Base : public ubuntu::app_launch::Application
+{
+public:
+    Base(const std::shared_ptr<Registry> &registry);
+
+    bool hasInstances() override;
+    std::vector<std::shared_ptr<Instance>> instances() override;
+
+    std::shared_ptr<Instance> launch(const std::vector<Application::URL> &urls = {}) override;
+    std::shared_ptr<Instance> launchTest(const std::vector<Application::URL> &urls = {}) override;
+
+protected:
+    std::shared_ptr<Registry> _registry;
+};
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-impl-click.cpp'
--- libubuntu-app-launch/application-impl-click.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-click.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,157 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application-impl-click.h"
+#include "application-info-desktop.h"
+#include "registry-impl.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+AppID::Version manifestVersion(const std::shared_ptr<JsonObject>& manifest);
+std::list<AppID::AppName> manifestApps(const std::shared_ptr<JsonObject>& manifest);
+std::shared_ptr<GKeyFile> manifestAppDesktop(const std::shared_ptr<JsonObject>& manifest,
+                                             const std::string& app,
+                                             const std::string& clickDir);
+
+Click::Click(const AppID& appid, const std::shared_ptr<Registry>& registry)
+    : Click(appid, registry->impl->getClickManifest(appid.package), registry)
+{
+}
+
+Click::Click(const AppID& appid, const std::shared_ptr<JsonObject>& manifest, const std::shared_ptr<Registry>& registry)
+    : Base(registry)
+    , _appid(appid)
+    , _manifest(manifest)
+    , _clickDir(registry->impl->getClickDir(appid.package))
+    , _keyfile(manifestAppDesktop(manifest, appid.appname, _clickDir))
+{
+    if (!_keyfile)
+        throw std::runtime_error{"No keyfile found for click application: " + (std::string)appid};
+}
+
+AppID Click::appId()
+{
+    return _appid;
+}
+
+std::shared_ptr<Application::Info> Click::info()
+{
+    return std::make_shared<app_info::Desktop>(_keyfile, _clickDir);
+}
+
+AppID::Version manifestVersion(const std::shared_ptr<JsonObject>& manifest)
+{
+    auto cstr = json_object_get_string_member(manifest.get(), "version");
+
+    if (cstr == nullptr)
+        throw std::runtime_error("Unable to find version number in manifest");
+
+    auto cppstr = AppID::Version::from_raw((const gchar*)cstr);
+    return cppstr;
+}
+
+std::list<AppID::AppName> manifestApps(const std::shared_ptr<JsonObject>& manifest)
+{
+    auto hooks = json_object_get_object_member(manifest.get(), "hooks");
+    if (hooks == nullptr)
+        throw std::runtime_error("Manifest for application does not have a 'hooks' field");
+
+    auto gapps = json_object_get_members(hooks);
+    if (gapps == nullptr)
+        throw std::runtime_error("GLib JSON confusion, please talk to your library vendor");
+
+    std::list<AppID::AppName> apps;
+
+    for (GList* item = gapps; item != nullptr; item = g_list_next(item))
+    {
+        auto appname = (const gchar*)item->data;
+
+        auto hooklist = json_object_get_object_member(hooks, appname);
+
+        if (json_object_has_member(hooklist, "desktop") == TRUE)
+        {
+            apps.emplace_back(AppID::AppName::from_raw(appname));
+        }
+    }
+
+    g_list_free_full(gapps, g_free);
+    return apps;
+}
+
+std::shared_ptr<GKeyFile> manifestAppDesktop(const std::shared_ptr<JsonObject>& manifest,
+                                             const std::string& app,
+                                             const std::string& clickDir)
+{
+    auto hooks = json_object_get_object_member(manifest.get(), "hooks");
+    if (hooks == nullptr)
+        throw std::runtime_error("Manifest for application '" + app + "' does not have a 'hooks' field");
+
+    auto gapps = json_object_get_members(hooks);
+    if (gapps == nullptr)
+        throw std::runtime_error("GLib JSON confusion, please talk to your library vendor");
+
+    auto hooklist = json_object_get_object_member(hooks, app.c_str());
+    if (hooklist == nullptr)
+        throw std::runtime_error("Manifest for does not have an application '" + app + "'");
+
+    auto desktoppath = json_object_get_string_member(hooklist, "desktop");
+    if (desktoppath == nullptr)
+        throw std::runtime_error("Manifest for application '" + app + "' does not have a 'desktop' hook");
+
+    auto path = std::shared_ptr<gchar>(g_build_filename(clickDir.c_str(), desktoppath, nullptr), g_free);
+
+    std::shared_ptr<GKeyFile> keyfile(g_key_file_new(), g_key_file_free);
+    GError* error = nullptr;
+    g_key_file_load_from_file(keyfile.get(), path.get(), G_KEY_FILE_NONE, &error);
+    if (error != nullptr)
+    {
+        auto perror = std::shared_ptr<GError>(error, g_error_free);
+        throw std::runtime_error(perror.get()->message);
+    }
+
+    return keyfile;
+}
+
+std::list<std::shared_ptr<Application>> Click::list(const std::shared_ptr<Registry>& registry)
+{
+    std::list<std::shared_ptr<Application>> applist;
+
+    for (auto pkg : registry->impl->getClickPackages())
+    {
+        auto manifest = registry->impl->getClickManifest(pkg);
+
+        for (auto appname : manifestApps(manifest))
+        {
+            AppID appid{package : pkg, appname : appname, version : manifestVersion(manifest)};
+            auto app = std::make_shared<Click>(appid, manifest, registry);
+            applist.push_back(app);
+        }
+    }
+
+    return applist;
+}
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-impl-click.h'
--- libubuntu-app-launch/application-impl-click.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-click.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <gio/gdesktopappinfo.h>
+#include <json-glib/json-glib.h>
+#include "application-impl-base.h"
+
+#pragma once
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+class Click : public Base
+{
+public:
+    Click(const AppID& appid, const std::shared_ptr<Registry>& registry);
+    Click(const AppID& appid, const std::shared_ptr<JsonObject>& manifest, const std::shared_ptr<Registry>& registry);
+
+    static std::list<std::shared_ptr<Application>> list(const std::shared_ptr<Registry>& registry);
+
+    AppID appId() override;
+
+    std::shared_ptr<Info> info() override;
+
+private:
+    AppID _appid;
+
+    std::shared_ptr<JsonObject> _manifest;
+
+    std::string _clickDir;
+    std::shared_ptr<GKeyFile> _keyfile;
+};
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-impl-legacy.cpp'
--- libubuntu-app-launch/application-impl-legacy.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-legacy.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,128 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application-impl-legacy.h"
+#include "application-info-desktop.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+std::shared_ptr<GKeyFile> keyfileForApp(const AppID::AppName& name);
+
+void clear_keyfile(GKeyFile* keyfile)
+{
+    if (keyfile != nullptr)
+    {
+        g_key_file_free(keyfile);
+    }
+}
+
+Legacy::Legacy(const AppID::AppName& appname,
+               const std::shared_ptr<GKeyFile>& keyfile,
+               const std::shared_ptr<Registry>& registry)
+    : Base(registry)
+    , _appname(appname)
+    , _keyfile(keyfile)
+{
+    if (!_keyfile)
+        throw std::runtime_error{"Unable to find keyfile for legacy application: " + appname.value()};
+}
+
+Legacy::Legacy(const AppID::AppName& appname, const std::shared_ptr<Registry>& registry)
+    : Legacy(appname, keyfileForApp(appname), registry)
+{
+}
+
+std::shared_ptr<GKeyFile> keyfileForApp(const AppID::AppName& name)
+{
+    std::string desktopName = name.value() + ".desktop";
+    auto keyfilecheck = [desktopName](const gchar* dir) -> std::shared_ptr<GKeyFile> {
+        auto fullname = g_build_filename(dir, "applications", desktopName.c_str(), nullptr);
+        if (!g_file_test(fullname, G_FILE_TEST_EXISTS))
+        {
+            g_free(fullname);
+            return {};
+        }
+
+        auto keyfile = std::shared_ptr<GKeyFile>(g_key_file_new(), clear_keyfile);
+
+        GError* error = nullptr;
+        g_key_file_load_from_file(keyfile.get(), fullname, G_KEY_FILE_NONE, &error);
+        g_free(fullname);
+
+        if (error != nullptr)
+        {
+            g_debug("Unable to load keyfile '%s' becuase: %s", desktopName.c_str(), error->message);
+            g_error_free(error);
+            return {};
+        }
+
+        return keyfile;
+    };
+
+    auto retval = keyfilecheck(g_get_user_data_dir());
+
+    auto systemDirs = g_get_system_data_dirs();
+    for (auto i = 0; !retval && systemDirs[i] != nullptr; i++)
+    {
+        retval = keyfilecheck(systemDirs[i]);
+    }
+
+    return retval;
+}
+
+std::shared_ptr<Application::Info> Legacy::info()
+{
+    return std::make_shared<app_info::Desktop>(_keyfile, "/usr/share/icons/");
+}
+
+std::list<std::shared_ptr<Application>> Legacy::list(const std::shared_ptr<Registry>& registry)
+{
+    std::list<std::shared_ptr<Application>> list;
+    GList* head = g_app_info_get_all();
+    for (GList* item = head; item != nullptr; item = g_list_next(item))
+    {
+        GDesktopAppInfo* appinfo = G_DESKTOP_APP_INFO(item->data);
+
+        if (appinfo == nullptr)
+        {
+            continue;
+        }
+
+        if (g_app_info_should_show(G_APP_INFO(appinfo)) == FALSE)
+        {
+            continue;
+        }
+
+        auto app = std::make_shared<Legacy>(AppID::AppName::from_raw(g_app_info_get_id(G_APP_INFO(appinfo))), registry);
+        list.push_back(app);
+    }
+
+    g_list_free_full(head, g_object_unref);
+
+    return list;
+}
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-impl-legacy.h'
--- libubuntu-app-launch/application-impl-legacy.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-legacy.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <gio/gdesktopappinfo.h>
+
+#include "application-impl-base.h"
+
+#pragma once
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+class Legacy : public Base
+{
+public:
+    Legacy(const AppID::AppName& appname, const std::shared_ptr<Registry>& registry);
+    Legacy(const AppID::AppName& appname,
+           const std::shared_ptr<GKeyFile>& keyfile,
+           const std::shared_ptr<Registry>& registry);
+
+    AppID appId() override
+    {
+        return {package : AppID::Package::from_raw({}), appname : _appname, version : AppID::Version::from_raw({})};
+    }
+
+    std::shared_ptr<Info> info() override;
+
+    static std::list<std::shared_ptr<Application>> list(const std::shared_ptr<Registry> &registry);
+
+private:
+    AppID::AppName _appname;
+    std::shared_ptr<GKeyFile> _keyfile;
+};
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-impl-libertine.cpp'
--- libubuntu-app-launch/application-impl-libertine.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-libertine.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application-impl-libertine.h"
+#include "application-info-desktop.h"
+#include "libertine.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+std::shared_ptr<GKeyFile> keyfileFromPath(const gchar* pathname);
+
+Libertine::Libertine(const AppID::Package& container,
+                     const AppID::AppName& appname,
+                     const std::shared_ptr<Registry>& registry)
+    : Base(registry)
+    , _container(container)
+    , _appname(appname)
+{
+    if (!_keyfile)
+    {
+        auto container_path = libertine_container_path(container.value().c_str());
+        auto container_app_path = g_build_filename(container_path, "usr", "share", "applications",
+                                                   (appname.value() + ".desktop").c_str(), NULL);
+
+        _keyfile = keyfileFromPath(container_app_path);
+
+        g_free(container_app_path);
+        g_free(container_path);
+    }
+
+    if (!_keyfile)
+    {
+        auto home_path = libertine_container_home_path(container.value().c_str());
+        auto home_app_path = g_build_filename(home_path, ".local", "share", "applications",
+                                              (appname.value() + ".desktop").c_str(), NULL);
+
+        _keyfile = keyfileFromPath(home_app_path);
+
+        g_free(home_app_path);
+        g_free(home_path);
+    }
+
+    if (!_keyfile)
+        throw std::runtime_error{"Unable to find a keyfile for application '" + appname.value() + "' in container '" +
+                                 container.value() + "'"};
+}
+
+std::shared_ptr<GKeyFile> keyfileFromPath(const gchar* pathname)
+{
+    if (!g_file_test(pathname, G_FILE_TEST_EXISTS))
+    {
+        return {};
+    }
+
+    std::shared_ptr<GKeyFile> keyfile(g_key_file_new(), [](GKeyFile* keyfile) {
+        if (keyfile != nullptr)
+        {
+            g_key_file_free(keyfile);
+        }
+    });
+    GError* error = nullptr;
+
+    g_key_file_load_from_file(keyfile.get(), pathname, G_KEY_FILE_NONE, &error);
+
+    if (error != nullptr)
+    {
+        g_error_free(error);
+        return {};
+    }
+
+    return keyfile;
+}
+
+std::list<std::shared_ptr<Application>> Libertine::list(const std::shared_ptr<Registry>& registry)
+{
+    std::list<std::shared_ptr<Application>> applist;
+
+    auto containers = libertine_list_containers();
+
+    for (int i = 0; containers[i] != nullptr; i++)
+    {
+        auto container = containers[i];
+        auto apps = libertine_list_apps_for_container(container);
+
+        for (int i = 0; apps[i] != nullptr; i++)
+        {
+            auto sapp = std::make_shared<Libertine>(AppID::Package::from_raw(container),
+                                                    AppID::AppName::from_raw(apps[i]), registry);
+            applist.push_back(sapp);
+        }
+
+        g_strfreev(apps);
+    }
+    g_strfreev(containers);
+
+    return applist;
+}
+
+std::shared_ptr<Application::Info> Libertine::info()
+{
+    return std::make_shared<app_info::Desktop>(_keyfile, libertine_container_path(_container.value().c_str()));
+}
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-impl-libertine.h'
--- libubuntu-app-launch/application-impl-libertine.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-impl-libertine.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application-impl-base.h"
+#include <gio/gdesktopappinfo.h>
+
+#pragma once
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_impls
+{
+
+class Libertine : public Base
+{
+public:
+    Libertine(const AppID::Package& container,
+              const AppID::AppName& appname,
+              const std::shared_ptr<Registry>& registry);
+
+    static std::list<std::shared_ptr<Application>> list(const std::shared_ptr<Registry> &registry);
+
+    AppID appId() override
+    {
+        return {package : _container, appname : _appname, version : AppID::Version::from_raw("0.0")};
+    }
+
+    std::shared_ptr<Info> info() override;
+
+private:
+    AppID::Package _container;
+    AppID::AppName _appname;
+    std::shared_ptr<GKeyFile> _keyfile;
+};
+
+};  // namespace app_impls
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-info-desktop.cpp'
--- libubuntu-app-launch/application-info-desktop.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-info-desktop.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application-info-desktop.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_info
+{
+
+constexpr const char* DESKTOP_GROUP = "Desktop Entry";
+
+template <typename T>
+auto stringFromKeyfile(std::shared_ptr<GKeyFile> keyfile, const std::string& key, const std::string& exceptionText = {})
+    -> T
+{
+    GError* error = nullptr;
+    auto keyval = g_key_file_get_locale_string(keyfile.get(), DESKTOP_GROUP, key.c_str(), nullptr, &error);
+
+    if (error != nullptr)
+    {
+        auto perror = std::shared_ptr<GError>(error, g_error_free);
+        if (!exceptionText.empty())
+        {
+            throw std::runtime_error(exceptionText + perror.get()->message);
+        }
+
+        return T::from_raw({});
+    }
+
+    T retval = T::from_raw(keyval);
+    g_free(keyval);
+    return retval;
+}
+
+template <typename T>
+auto fileFromKeyfile(std::shared_ptr<GKeyFile> keyfile,
+                     const std::string basePath,
+                     const std::string& key,
+                     const std::string& exceptionText = {}) -> T
+{
+    GError* error = nullptr;
+    auto keyval = g_key_file_get_locale_string(keyfile.get(), DESKTOP_GROUP, key.c_str(), nullptr, &error);
+
+    if (error != nullptr)
+    {
+        auto perror = std::shared_ptr<GError>(error, g_error_free);
+        if (!exceptionText.empty())
+        {
+            throw std::runtime_error(exceptionText + perror.get()->message);
+        }
+
+        return T::from_raw({});
+    }
+
+    /* If we're already an absolute path, don't prepend the base path */
+    if (keyval[0] == '/')
+    {
+        T retval = T::from_raw(keyval);
+        g_free(keyval);
+        return retval;
+    }
+
+    auto cpath = g_build_filename(basePath.c_str(), keyval, nullptr);
+
+    T retval = T::from_raw(cpath);
+
+    g_free(keyval);
+    g_free(cpath);
+
+    return retval;
+}
+
+template <typename T>
+auto boolFromKeyfile(std::shared_ptr<GKeyFile> keyfile,
+                     const std::string& key,
+                     bool defaultReturn,
+                     const std::string& exceptionText = {}) -> T
+{
+    GError* error = nullptr;
+    auto keyval = g_key_file_get_boolean(keyfile.get(), DESKTOP_GROUP, key.c_str(), &error);
+
+    if (error != nullptr)
+    {
+        auto perror = std::shared_ptr<GError>(error, g_error_free);
+        if (!exceptionText.empty())
+        {
+            throw std::runtime_error(exceptionText + perror.get()->message);
+        }
+
+        return T::from_raw(defaultReturn);
+    }
+
+    T retval = T::from_raw(keyval == TRUE);
+    return retval;
+}
+
+Desktop::Desktop(std::shared_ptr<GKeyFile> keyfile, const std::string& basePath)
+    : _keyfile([keyfile]() {
+        if (!keyfile)
+        {
+            throw std::runtime_error("Can not build a desktop application info object with a null keyfile");
+        }
+        return keyfile;
+    }())
+    , _basePath(basePath)
+    , _name(stringFromKeyfile<Application::Info::Name>(keyfile, "Name", "Unable to get name from keyfile"))
+    , _description(stringFromKeyfile<Application::Info::Description>(keyfile, "Comment"))
+    , _iconPath(
+          fileFromKeyfile<Application::Info::IconPath>(keyfile, basePath, "Icon", "Missing icon for desktop file"))
+    , _splashInfo({
+        title : stringFromKeyfile<Application::Info::Splash::Title>(keyfile, "X-Ubuntu-Splash-Title"),
+        image : fileFromKeyfile<Application::Info::Splash::Image>(keyfile, basePath, "X-Ubuntu-Splash-Image"),
+        backgroundColor : stringFromKeyfile<Application::Info::Splash::Color>(keyfile, "X-Ubuntu-Splash-Color"),
+        headerColor : stringFromKeyfile<Application::Info::Splash::Color>(keyfile, "X-Ubuntu-Splash-Color-Header"),
+        footerColor : stringFromKeyfile<Application::Info::Splash::Color>(keyfile, "X-Ubuntu-Splash-Color-Footer"),
+        showHeader :
+            boolFromKeyfile<Application::Info::Splash::ShowHeader>(keyfile, "X-Ubuntu-Splash-Show-Header", false)
+    })
+    , _supportedOrientations([keyfile]() {
+        Orientations all = {portrait : true, landscape : true, invertedPortrait : true, invertedLandscape : true};
+
+        GError* error = nullptr;
+        auto orientationStrv = g_key_file_get_string_list(keyfile.get(), DESKTOP_GROUP,
+                                                          "X-Ubuntu-Supported-Orientations", nullptr, &error);
+
+        if (error != nullptr)
+        {
+            g_error_free(error);
+            return all;
+        }
+
+        Orientations retval =
+            {portrait : false, landscape : false, invertedPortrait : false, invertedLandscape : false};
+
+        try
+        {
+            for (auto i = 0; orientationStrv[i] != nullptr; i++)
+            {
+                g_strstrip(orientationStrv[i]); /* remove whitespace */
+
+                if (g_ascii_strcasecmp("portrait", orientationStrv[i]) == 0)
+                {
+                    retval.portrait = true;
+                }
+                else if (g_ascii_strcasecmp("landscape", orientationStrv[i]) == 0)
+                {
+                    retval.landscape = true;
+                }
+                else if (g_ascii_strcasecmp("invertedPortrait", orientationStrv[i]) == 0)
+                {
+                    retval.invertedPortrait = true;
+                }
+                else if (g_ascii_strcasecmp("invertedLandscape", orientationStrv[i]) == 0)
+                {
+                    retval.invertedLandscape = true;
+                }
+                else if (g_ascii_strcasecmp("primary", orientationStrv[i]) == 0 && i == 0)
+                {
+                    /* Pass, we'll let primary be the first entry, it should be the only. */
+                }
+                else
+                {
+                    throw std::runtime_error("Invalid orientation string '" + std::string(orientationStrv[i]) + "'");
+                }
+            }
+        }
+        catch (...)
+        {
+            retval = all;
+        }
+
+        g_strfreev(orientationStrv);
+        return retval;
+    }())
+    , _rotatesWindow(
+          boolFromKeyfile<Application::Info::RotatesWindow>(keyfile, "X-Ubuntu-Rotates-Window-Content", false))
+    , _ubuntuLifecycle(boolFromKeyfile<Application::Info::UbuntuLifecycle>(keyfile, "X-Ubuntu-Touch", false))
+{
+}
+
+};  // namespace app_info
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application-info-desktop.h'
--- libubuntu-app-launch/application-info-desktop.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application-info-desktop.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application.h"
+#include <glib.h>
+#include <mutex>
+
+#pragma once
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace app_info
+{
+
+class Desktop : public Application::Info
+{
+public:
+    Desktop(std::shared_ptr<GKeyFile> keyfile, const std::string& basePath);
+
+    const Application::Info::Name& name() override
+    {
+        return _name;
+    }
+    const Application::Info::Description& description() override
+    {
+        return _description;
+    }
+    const Application::Info::IconPath& iconPath() override
+    {
+        return _iconPath;
+    }
+
+    Application::Info::Splash splash() override
+    {
+        return _splashInfo;
+    }
+
+    Application::Info::Orientations supportedOrientations() override
+    {
+        return _supportedOrientations;
+    }
+
+    Application::Info::RotatesWindow rotatesWindowContents() override
+    {
+        return _rotatesWindow;
+    }
+
+    Application::Info::UbuntuLifecycle supportsUbuntuLifecycle() override
+    {
+        return _ubuntuLifecycle;
+    }
+
+private:
+    std::shared_ptr<GKeyFile> _keyfile;
+    std::string _basePath;
+
+    Application::Info::Name _name;
+    Application::Info::Description _description;
+    Application::Info::IconPath _iconPath;
+
+    Application::Info::Splash _splashInfo;
+    Application::Info::Orientations _supportedOrientations;
+    Application::Info::RotatesWindow _rotatesWindow;
+    Application::Info::UbuntuLifecycle _ubuntuLifecycle;
+};
+
+};  // namespace AppInfo
+};  // namespace AppLaunch
+};  // namespace Ubuntu

=== added file 'libubuntu-app-launch/application.cpp'
--- libubuntu-app-launch/application.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,225 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+extern "C" {
+#include "app-info.h"
+#include "ubuntu-app-launch.h"
+}
+
+#include "application-impl-click.h"
+#include "application-impl-legacy.h"
+#include "application-impl-libertine.h"
+#include "application.h"
+
+#include <iostream>
+#include <regex>
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+std::shared_ptr<Application> Application::create(const AppID& appid, const std::shared_ptr<Registry>& registry)
+{
+    if (appid.empty())
+    {
+        throw std::runtime_error("AppID is empty");
+    }
+
+    std::string sappid = appid;
+    if (app_info_click(sappid.c_str(), NULL, NULL))
+    {
+        return std::make_shared<app_impls::Click>(appid, registry);
+    }
+    else if (app_info_libertine(sappid.c_str(), NULL, NULL))
+    {
+        return std::make_shared<app_impls::Libertine>(appid.package, appid.appname, registry);
+    }
+    else if (app_info_legacy(sappid.c_str(), NULL, NULL))
+    {
+        return std::make_shared<app_impls::Legacy>(appid.appname, registry);
+    }
+    else
+    {
+        throw std::runtime_error("Invalid app ID: " + sappid);
+    }
+}
+
+AppID::AppID()
+    : package(Package::from_raw({}))
+    , appname(AppName::from_raw({}))
+    , version(Version::from_raw({}))
+{
+}
+
+AppID::AppID(Package pkg, AppName app, Version ver)
+    : package(pkg)
+    , appname(app)
+    , version(ver)
+{
+}
+
+/* These are the Regex's taken from the Click Reviewer Tools
+   on Jan 16, 2016 revision 566 */
+#define REGEX_PKGNAME "([a-z0-9][a-z0-9+.-]+)"
+#define REGEX_APPNAME "([A-Za-z0-9+-.:~-]+)"
+#define REGEX_VERSION "([\\d+:]?[A-Za-z0-9.+:~-]+?[-[A-Za-z0-9+.~]+]?)"
+
+const std::regex full_appid_regex("^" REGEX_PKGNAME "_" REGEX_APPNAME "_" REGEX_VERSION "$");
+const std::regex short_appid_regex("^" REGEX_PKGNAME "_" REGEX_APPNAME "$");
+const std::regex legacy_appid_regex("^" REGEX_APPNAME "$");
+
+AppID AppID::parse(const std::string& sappid)
+{
+    std::smatch match;
+
+    if (std::regex_match(sappid, match, full_appid_regex))
+    {
+        return {AppID::Package::from_raw(match[1].str()), AppID::AppName::from_raw(match[2].str()),
+                AppID::Version::from_raw(match[3].str())};
+    }
+    else
+    {
+        /* Allow returning an empty AppID with empty internal */
+        return {AppID::Package::from_raw({}), AppID::AppName::from_raw({}), AppID::Version::from_raw({})};
+    }
+}
+
+bool AppID::valid(const std::string& sappid)
+{
+    return std::regex_match(sappid, full_appid_regex);
+}
+
+AppID AppID::find(const std::string& sappid)
+{
+    std::smatch match;
+
+    if (std::regex_match(sappid, match, full_appid_regex))
+    {
+        return {AppID::Package::from_raw(match[1].str()), AppID::AppName::from_raw(match[2].str()),
+                AppID::Version::from_raw(match[3].str())};
+    }
+    else if (std::regex_match(sappid, match, short_appid_regex))
+    {
+        return discover(match[1].str(), match[2].str());
+    }
+    else if (std::regex_match(sappid, match, legacy_appid_regex))
+    {
+        return {AppID::Package::from_raw({}), AppID::AppName::from_raw(sappid), AppID::Version::from_raw({})};
+    }
+    else
+    {
+        return {AppID::Package::from_raw({}), AppID::AppName::from_raw({}), AppID::Version::from_raw({})};
+    }
+}
+
+AppID::operator std::string() const
+{
+    if (package.value().empty() && version.value().empty())
+    {
+        if (appname.value().empty())
+        {
+            return {};
+        }
+        else
+        {
+            return appname.value();
+        }
+    }
+
+    return package.value() + "_" + appname.value() + "_" + version.value();
+}
+
+bool operator==(const AppID& a, const AppID& b)
+{
+    return a.package.value() == b.package.value() && a.appname.value() == b.appname.value() &&
+           a.version.value() == b.version.value();
+}
+
+bool operator!=(const AppID& a, const AppID& b)
+{
+    return a.package.value() != b.package.value() || a.appname.value() != b.appname.value() ||
+           a.version.value() != b.version.value();
+}
+
+bool AppID::empty() const
+{
+    return package.value().empty() && appname.value().empty() && version.value().empty();
+}
+
+std::string app_wildcard(AppID::ApplicationWildcard card)
+{
+    switch (card)
+    {
+        case AppID::ApplicationWildcard::FIRST_LISTED:
+            return "first-listed-app";
+        case AppID::ApplicationWildcard::LAST_LISTED:
+            return "last-listed-app";
+        case AppID::ApplicationWildcard::ONLY_LISTED:
+            return "only-listed-app";
+    }
+
+    return "";
+}
+
+std::string ver_wildcard(AppID::VersionWildcard card)
+{
+    switch (card)
+    {
+        case AppID::VersionWildcard::CURRENT_USER_VERSION:
+            return "current-user-version";
+    }
+
+    return "";
+}
+
+AppID AppID::discover(const std::string& package, const std::string& appname, const std::string& version)
+{
+    auto cappid = ubuntu_app_launch_triplet_to_app_id(package.c_str(), appname.c_str(), version.c_str());
+
+    auto appid = cappid != nullptr ? AppID::parse(cappid) : AppID::parse("");
+
+    g_free(cappid);
+
+    return appid;
+}
+
+AppID AppID::discover(const std::string& package, ApplicationWildcard appwildcard, VersionWildcard versionwildcard)
+{
+    return discover(package, app_wildcard(appwildcard), ver_wildcard(versionwildcard));
+}
+
+AppID AppID::discover(const std::string& package, const std::string& appname, VersionWildcard versionwildcard)
+{
+    auto appid = discover(package, appname, ver_wildcard(versionwildcard));
+
+    if (appid.empty())
+    {
+        /* If we weren't able to go that route, we can see if it's libertine */
+        if (app_info_libertine((package + "_" + appname + "_0.0").c_str(), nullptr, nullptr))
+        {
+            appid = AppID(Package::from_raw(package), AppName::from_raw(appname), Version::from_raw("0.0"));
+        }
+    }
+
+    return appid;
+}
+
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/application.h'
--- libubuntu-app-launch/application.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/application.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <list>
+#include <memory>
+#include <sys/types.h>
+#include <vector>
+
+#include "appid.h"
+#include "type-tagger.h"
+
+#pragma once
+#pragma GCC visibility push(default)
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+class Registry;
+
+class Application
+{
+public:
+    struct URLTag;
+    typedef TypeTagger<URLTag, std::string> URL;
+
+    static std::shared_ptr<Application> create(const AppID& appid, const std::shared_ptr<Registry>& registry);
+
+    /* System level info */
+    virtual AppID appId() = 0;
+
+    class Info
+    {
+    public:
+        /* Basic information */
+        struct NameTag;
+        struct DescriptionTag;
+        struct IconPathTag;
+
+        typedef TypeTagger<NameTag, std::string> Name;
+        typedef TypeTagger<DescriptionTag, std::string> Description;
+        typedef TypeTagger<IconPathTag, std::string> IconPath;
+
+        virtual const Name& name() = 0;
+        virtual const Description& description() = 0;
+        virtual const IconPath& iconPath() = 0;
+
+        /* Splash information */
+        struct Splash
+        {
+            struct TitleTag;
+            struct ImageTag;
+            struct ColorTag;
+            struct ShowHeaderTag;
+
+            typedef TypeTagger<TitleTag, std::string> Title;
+            typedef TypeTagger<ImageTag, std::string> Image;
+            typedef TypeTagger<ColorTag, std::string> Color;
+            typedef TypeTagger<ShowHeaderTag, bool> ShowHeader;
+
+            Title title;
+            Image image;
+            Color backgroundColor;
+            Color headerColor;
+            Color footerColor;
+            ShowHeader showHeader;
+        };
+
+        virtual Splash splash() = 0;
+
+        /* Orientation and placement */
+        struct Orientations
+        {
+            bool portrait;
+            bool landscape;
+            bool invertedPortrait;
+            bool invertedLandscape;
+
+            bool operator==(const Orientations& b) const
+            {
+                return portrait == b.portrait && landscape == b.landscape && invertedPortrait == b.invertedPortrait &&
+                       invertedLandscape == b.invertedLandscape;
+            }
+        };
+
+        struct RotatesWindowTag;
+
+        typedef TypeTagger<RotatesWindowTag, bool> RotatesWindow;
+
+        virtual Orientations supportedOrientations() = 0;
+        virtual RotatesWindow rotatesWindowContents() = 0;
+
+        /* Lifecycle */
+        struct UbuntuLifecycleTag;
+
+        typedef TypeTagger<UbuntuLifecycleTag, bool> UbuntuLifecycle;
+
+        virtual UbuntuLifecycle supportsUbuntuLifecycle() = 0;
+    };
+
+    virtual std::shared_ptr<Info> info() = 0;
+
+    class Instance
+    {
+    public:
+        /* Query lifecycle */
+        virtual bool isRunning() = 0;
+
+        /* Instance Info */
+        virtual std::string logPath() = 0;
+
+        /* PIDs */
+        virtual pid_t primaryPid() = 0;
+        virtual bool hasPid(pid_t pid) = 0;
+        virtual std::vector<pid_t> pids() = 0;
+
+        /* Manage lifecycle */
+        virtual void pause() = 0;
+        virtual void resume() = 0;
+        virtual void stop() = 0;
+    };
+
+    virtual bool hasInstances() = 0;
+    virtual std::vector<std::shared_ptr<Instance>> instances() = 0;
+
+    virtual std::shared_ptr<Instance> launch(const std::vector<URL>& urls = {}) = 0;
+    virtual std::shared_ptr<Instance> launchTest(const std::vector<URL>& urls = {}) = 0;
+};
+
+};  // namespace app_launch
+};  // namespace ubuntu
+
+#pragma GCC visibility pop

=== modified file 'libubuntu-app-launch/desktop-exec.c'
--- libubuntu-app-launch/desktop-exec.c	2015-08-12 02:52:05 +0000
+++ libubuntu-app-launch/desktop-exec.c	2016-03-04 11:34:19 +0000
@@ -186,7 +186,7 @@
 	/* This string is quoted using desktop file quoting:
 	   http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#exec-variables */
 	gchar * execline = desktop_to_exec(keyfile, app_id);
-	g_return_val_if_fail(execline != NULL, 1);
+	g_return_val_if_fail(execline != NULL, FALSE);
 
 	if (is_libertine) {
 		static const gchar * libertine_launch = NULL;

=== added file 'libubuntu-app-launch/glib-thread.cpp'
--- libubuntu-app-launch/glib-thread.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/glib-thread.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,156 @@
+/*
+ * Copyright © 2015 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/>.
+ *
+ * Authors:
+ *   Ted Gould <[e-mail]>
+ */
+
+#include "glib-thread.h"
+
+namespace GLib
+{
+
+ContextThread::ContextThread(std::function<void()> beforeLoop, std::function<void()> afterLoop)
+{
+    _cancel = std::shared_ptr<GCancellable>(g_cancellable_new(), [](GCancellable* cancel) {
+        if (cancel != nullptr)
+        {
+            g_cancellable_cancel(cancel);
+            g_object_unref(cancel);
+        }
+    });
+    std::promise<std::pair<std::shared_ptr<GMainContext>, std::shared_ptr<GMainLoop>>> context_promise;
+
+    /* NOTE: We copy afterLoop but reference beforeLoop. We're blocking so we
+       know that beforeLoop will stay valid long enough, but we can't say the
+       same for afterLoop */
+    _thread = std::thread([&context_promise, &beforeLoop, afterLoop, this]() {
+        /* Build up the context and loop for the async events and a place
+           for GDBus to send its events back to */
+        auto context = std::shared_ptr<GMainContext>(
+            g_main_context_new(), [](GMainContext* context) { g_clear_pointer(&context, g_main_context_unref); });
+        auto loop = std::shared_ptr<GMainLoop>(g_main_loop_new(context.get(), FALSE),
+                                               [](GMainLoop* loop) { g_clear_pointer(&loop, g_main_loop_unref); });
+
+        g_main_context_push_thread_default(context.get());
+
+        beforeLoop();
+
+        /* Free's the constructor to continue */
+        auto pair = std::pair<std::shared_ptr<GMainContext>, std::shared_ptr<GMainLoop>>(context, loop);
+        context_promise.set_value(pair);
+
+        if (!g_cancellable_is_cancelled(_cancel.get()))
+        {
+            g_main_loop_run(loop.get());
+        }
+
+        afterLoop();
+    });
+
+    /* We need to have the context and the mainloop ready before
+       other functions on this object can work properly. So we wait
+       for them and set them on this thread. */
+    auto context_future = context_promise.get_future();
+    context_future.wait();
+    auto context_value = context_future.get();
+
+    _context = context_value.first;
+    _loop = context_value.second;
+
+    if (!_context || !_loop)
+    {
+        throw std::runtime_error("Unable to create GLib Thread");
+    }
+}
+
+ContextThread::~ContextThread()
+{
+    quit();
+}
+
+void ContextThread::quit()
+{
+    g_cancellable_cancel(_cancel.get()); /* Force the cancellation on ongoing tasks */
+    if (_loop)
+    {
+        g_main_loop_quit(_loop.get()); /* Quit the loop */
+    }
+
+    /* Joining here because we want to ensure that the final afterLoop()
+       function is run before returning */
+    if (std::this_thread::get_id() != _thread.get_id())
+    {
+        if (_thread.joinable())
+        {
+            _thread.join();
+        }
+    }
+}
+
+bool ContextThread::isCancelled()
+{
+    return g_cancellable_is_cancelled(_cancel.get()) == TRUE;
+}
+
+std::shared_ptr<GCancellable> ContextThread::getCancellable()
+{
+    return _cancel;
+}
+
+void ContextThread::simpleSource(std::function<GSource*()> srcBuilder, std::function<void()> work)
+{
+    if (isCancelled())
+    {
+        throw std::runtime_error("Trying to execute work on a GLib thread that is shutting down.");
+    }
+
+    /* Copy the work so that we can reuse it */
+    /* Lifecycle is handled with the source pointer when we attach
+       it to the context. */
+    auto heapWork = new std::function<void()>(work);
+
+    auto source = std::shared_ptr<GSource>(srcBuilder(), [](GSource* src) { g_clear_pointer(&src, g_source_unref); });
+    g_source_set_callback(source.get(),
+                          [](gpointer data) {
+                              auto heapWork = static_cast<std::function<void()>*>(data);
+                              (*heapWork)();
+                              return G_SOURCE_REMOVE;
+                          },
+                          heapWork,
+                          [](gpointer data) {
+                              auto heapWork = static_cast<std::function<void()>*>(data);
+                              delete heapWork;
+                          });
+
+    g_source_attach(source.get(), _context.get());
+}
+
+void ContextThread::executeOnThread(std::function<void()> work)
+{
+    simpleSource(g_idle_source_new, work);
+}
+
+void ContextThread::timeout(const std::chrono::milliseconds& length, std::function<void()> work)
+{
+    simpleSource([length]() { return g_timeout_source_new(length.count()); }, work);
+}
+
+void ContextThread::timeoutSeconds(const std::chrono::seconds& length, std::function<void()> work)
+{
+    simpleSource([length]() { return g_timeout_source_new_seconds(length.count()); }, work);
+}
+
+}  // ns GLib

=== added file 'libubuntu-app-launch/glib-thread.h'
--- libubuntu-app-launch/glib-thread.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/glib-thread.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2015 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/>.
+ *
+ * Authors:
+ *   Ted Gould <[e-mail]>
+ */
+
+#include <thread>
+#include <future>
+
+#include <gio/gio.h>
+
+namespace GLib
+{
+
+class ContextThread
+{
+    std::thread _thread;
+    std::shared_ptr<GMainContext> _context;
+    std::shared_ptr<GMainLoop> _loop;
+    std::shared_ptr<GCancellable> _cancel;
+
+public:
+    ContextThread(std::function<void()> beforeLoop =
+                      []
+                  {
+                  },
+                  std::function<void()> afterLoop =
+                      []
+                  {
+                  });
+    ~ContextThread();
+
+    void quit();
+    bool isCancelled();
+    std::shared_ptr<GCancellable> getCancellable();
+
+    void executeOnThread(std::function<void()> work);
+    template <typename T>
+    auto executeOnThread(std::function<T()> work) -> T
+    {
+        if (std::this_thread::get_id() == _thread.get_id())
+        {
+            /* Don't block if we're on the same thread */
+            return work();
+        }
+
+        std::promise<T> promise;
+        std::function<void()> magicFunc = [&promise, &work]()
+        {
+            promise.set_value(work());
+        };
+
+        executeOnThread(magicFunc);
+
+        auto future = promise.get_future();
+        future.wait();
+        return future.get();
+    }
+
+    void timeout(const std::chrono::milliseconds& length, std::function<void()> work);
+    template <class Rep, class Period>
+    void timeout(const std::chrono::duration<Rep, Period>& length, std::function<void()> work)
+    {
+        return timeout(std::chrono::duration_cast<std::chrono::milliseconds>(length), work);
+    }
+
+    void timeoutSeconds(const std::chrono::seconds& length, std::function<void()> work);
+    template <class Rep, class Period>
+    void timeoutSeconds(const std::chrono::duration<Rep, Period>& length, std::function<void()> work)
+    {
+        return timeoutSeconds(std::chrono::duration_cast<std::chrono::seconds>(length), work);
+    }
+
+private:
+    void simpleSource(std::function<GSource*()> srcBuilder, std::function<void()> work);
+};
+}

=== added file 'libubuntu-app-launch/helper-impl-click.cpp'
--- libubuntu-app-launch/helper-impl-click.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/helper-impl-click.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,175 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "helper-impl-click.h"
+#include "registry-impl.h"
+
+#include "ubuntu-app-launch.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace helper_impls
+{
+
+bool Click::hasInstances()
+{
+    return _registry->impl->thread.executeOnThread<bool>([this]() {
+        auto instances = ubuntu_app_launch_list_helper_instances(_type.value().c_str(), ((std::string)_appid).c_str());
+        auto retval = (g_strv_length(instances) != 0);
+
+        g_strfreev(instances);
+
+        return retval;
+    });
+}
+
+class ClickInstance : public Helper::Instance
+{
+public: /* all one file, no one to hide from */
+    AppID _appid;
+    Helper::Type _type;
+    std::string _instanceid;
+    std::shared_ptr<Registry> _registry;
+
+    ClickInstance(const AppID& appid,
+                  const Helper::Type& type,
+                  const std::string& instanceid,
+                  std::shared_ptr<Registry> registry)
+        : _appid(appid)
+        , _type(type)
+        , _instanceid(instanceid)
+        , _registry(registry)
+    {
+    }
+
+    bool isRunning() override
+    {
+        return _registry->impl->thread.executeOnThread<bool>([this]() {
+            bool found = false;
+
+            auto instances =
+                ubuntu_app_launch_list_helper_instances(_type.value().c_str(), ((std::string)_appid).c_str());
+            for (int i = 0; instances[i] != nullptr; i++)
+            {
+                if (_instanceid == std::string(instances[i]))
+                {
+                    found = true;
+                    break;
+                }
+            }
+
+            g_strfreev(instances);
+
+            return found;
+        });
+    }
+
+    void stop() override
+    {
+        _registry->impl->thread.executeOnThread<bool>([this]() {
+            return ubuntu_app_launch_stop_multiple_helper(_type.value().c_str(), ((std::string)_appid).c_str(),
+                                                          _instanceid.c_str()) == TRUE;
+        });
+    }
+};
+
+std::vector<std::shared_ptr<Click::Instance>> Click::instances()
+{
+    return _registry->impl->thread.executeOnThread<std::vector<std::shared_ptr<Click::Instance>>>(
+        [this]() -> std::vector<std::shared_ptr<Click::Instance>> {
+            std::vector<std::shared_ptr<Click::Instance>> vect;
+            auto instances =
+                ubuntu_app_launch_list_helper_instances(_type.value().c_str(), ((std::string)_appid).c_str());
+            for (int i = 0; instances[i] != nullptr; i++)
+            {
+                auto inst = std::make_shared<ClickInstance>(_appid, _type, instances[i], _registry);
+                vect.push_back(inst);
+            }
+
+            g_strfreev(instances);
+
+            return vect;
+        });
+}
+
+std::shared_ptr<gchar*> urlsToStrv(std::vector<Helper::URL> urls)
+{
+    if (urls.size() == 0)
+    {
+        return {};
+    }
+
+    auto array = g_array_new(TRUE, FALSE, sizeof(gchar*));
+
+    for (auto url : urls)
+    {
+        auto str = g_strdup(url.value().c_str());
+        g_array_append_val(array, str);
+    }
+
+    return std::shared_ptr<gchar*>((gchar**)g_array_free(array, FALSE), g_strfreev);
+}
+
+std::shared_ptr<Click::Instance> Click::launch(std::vector<Helper::URL> urls)
+{
+    auto urlstrv = urlsToStrv(urls);
+
+    return _registry->impl->thread.executeOnThread<std::shared_ptr<Click::Instance>>([this, urlstrv]() {
+        auto instanceid = ubuntu_app_launch_start_multiple_helper(_type.value().c_str(), ((std::string)_appid).c_str(),
+                                                                  urlstrv.get());
+
+        return std::make_shared<ClickInstance>(_appid, _type, instanceid, _registry);
+    });
+}
+
+std::shared_ptr<Click::Instance> Click::launch(MirPromptSession* session, std::vector<Helper::URL> urls)
+{
+    auto urlstrv = urlsToStrv(urls);
+
+    return _registry->impl->thread.executeOnThread<std::shared_ptr<Click::Instance>>([this, session, urlstrv]() {
+        auto instanceid = ubuntu_app_launch_start_session_helper(_type.value().c_str(), session,
+                                                                 ((std::string)_appid).c_str(), urlstrv.get());
+
+        return std::make_shared<ClickInstance>(_appid, _type, instanceid, _registry);
+    });
+}
+
+std::list<std::shared_ptr<Helper>> Click::running(Helper::Type type, std::shared_ptr<Registry> registry)
+{
+    return registry->impl->thread.executeOnThread<std::list<std::shared_ptr<Helper>>>([type, registry]() {
+        std::list<std::shared_ptr<Helper>> helpers;
+
+        auto appidv = ubuntu_app_launch_list_helpers(type.value().c_str());
+        for (int i = 0; appidv[i] != nullptr; i++)
+        {
+            auto helper = std::make_shared<Click>(type, AppID::parse(appidv[i]), registry);
+            helpers.push_back(helper);
+        }
+
+        g_strfreev(appidv);
+
+        return helpers;
+    });
+}
+
+};  // namespace helper_impl
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/helper-impl-click.h'
--- libubuntu-app-launch/helper-impl-click.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/helper-impl-click.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <list>
+
+#include "helper.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+namespace helper_impls
+{
+
+class Click : public Helper
+{
+public:
+    Click(const Helper::Type& type, const AppID& appid, const std::shared_ptr<Registry>& registry)
+        : _type(type)
+        , _appid(appid)
+        , _registry(registry)
+    {
+    }
+
+    AppID appId() override
+    {
+        return _appid;
+    }
+
+    bool hasInstances() override;
+    std::vector<std::shared_ptr<Helper::Instance>> instances() override;
+
+    std::shared_ptr<Helper::Instance> launch(std::vector<Helper::URL> urls = {}) override;
+    std::shared_ptr<Helper::Instance> launch(MirPromptSession* session, std::vector<Helper::URL> urls = {}) override;
+
+    static std::list<std::shared_ptr<Helper>> running(Helper::Type type, std::shared_ptr<Registry> registry);
+
+private:
+    Helper::Type _type;
+    AppID _appid;
+    std::shared_ptr<Registry> _registry;
+};
+
+};  // namespace helper_impl
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/helper.cpp'
--- libubuntu-app-launch/helper.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/helper.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "helper.h"
+
+#include "helper-impl-click.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+std::shared_ptr<Helper> Helper::create(Type type, AppID appid, std::shared_ptr<Registry> registry)
+{
+    /* Only one type today */
+    return std::make_shared<helper_impls::Click>(type, appid, registry);
+}
+
+};  // namespace AppLaunch
+};  // namespace Ubuntu

=== added file 'libubuntu-app-launch/helper.h'
--- libubuntu-app-launch/helper.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/helper.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <memory>
+#include <vector>
+
+#include <mir_toolkit/mir_prompt_session.h>
+
+#include "appid.h"
+#include "type-tagger.h"
+
+#pragma once
+#pragma GCC visibility push(default)
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+class Registry;
+
+class Helper
+{
+public:
+    struct TypeTag;
+    struct URLTag;
+
+    typedef TypeTagger<TypeTag, std::string> Type;
+    typedef TypeTagger<URLTag, std::string> URL;
+
+    static std::shared_ptr<Helper> create(Type type, AppID appid, std::shared_ptr<Registry> registry);
+
+    virtual AppID appId() = 0;
+
+    class Instance
+    {
+    public:
+        /* Query lifecycle */
+        virtual bool isRunning() = 0;
+
+        /* Manage lifecycle */
+        virtual void stop() = 0;
+    };
+
+    virtual bool hasInstances() = 0;
+    virtual std::vector<std::shared_ptr<Instance>> instances() = 0;
+
+    virtual std::shared_ptr<Instance> launch(std::vector<URL> urls = {}) = 0;
+    virtual std::shared_ptr<Instance> launch(MirPromptSession* session, std::vector<URL> urls = {}) = 0;
+};
+
+};  // namespace app_launch
+};  // namespace ubuntu
+
+#pragma GCC visibility pop

=== modified file 'libubuntu-app-launch/libubuntu-app-launch.map'
--- libubuntu-app-launch/libubuntu-app-launch.map	2014-11-21 15:57:08 +0000
+++ libubuntu-app-launch/libubuntu-app-launch.map	2016-03-04 11:34:19 +0000
@@ -1,6 +1,23 @@
 {
 global:
 	ubuntu_app_launch_*;
+	extern "C++" {
+		ubuntu::app_launch::Registry::[!I]*;
+		typeinfo?for?ubuntu::app_launch::Registry;
+		typeinfo?name?for?ubuntu::app_launch::Registry;
+		ubuntu::app_launch::Application::*;
+		typeinfo?for?ubuntu::app_launch::Application;
+		typeinfo?name?for?ubuntu::app_launch::Application;
+		ubuntu::app_launch::AppID::*;
+		typeinfo?for?ubuntu::app_launch::AppID;
+		typeinfo?name?for?ubuntu::app_launch::AppID;
+		ubuntu::app_launch::Helper::*;
+		typeinfo?for?ubuntu::app_launch::Helper;
+		typeinfo?name?for?ubuntu::app_launch::Helper;
+	};
 local:
 	*;
+	extern "C++" {
+		*;
+	};
 };

=== added file 'libubuntu-app-launch/registry-impl.cpp'
--- libubuntu-app-launch/registry-impl.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/registry-impl.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,185 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "registry-impl.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+Registry::Impl::Impl(Registry* registry)
+    : thread([]() {},
+             [this]() {
+                 _clickUser.reset();
+                 _clickDB.reset();
+
+                 g_dbus_connection_flush_sync(_dbus.get(), nullptr, nullptr);
+                 _dbus.reset();
+             })
+    , _registry(registry)
+// _manager(nullptr)
+{
+    auto cancel = thread.getCancellable();
+    _dbus = thread.executeOnThread<std::shared_ptr<GDBusConnection>>([cancel]() {
+        return std::shared_ptr<GDBusConnection>(g_bus_get_sync(G_BUS_TYPE_SESSION, cancel.get(), nullptr),
+                                                [](GDBusConnection* bus) { g_clear_object(&bus); });
+    });
+}
+
+void Registry::Impl::initClick()
+{
+    if (_clickDB && _clickUser)
+    {
+        return;
+    }
+
+    auto init = thread.executeOnThread<bool>([this]() {
+        GError* error = nullptr;
+
+        if (!_clickDB)
+        {
+            _clickDB = std::shared_ptr<ClickDB>(click_db_new(), [](ClickDB* db) { g_clear_object(&db); });
+            /* If TEST_CLICK_DB is unset, this reads the system database. */
+            click_db_read(_clickDB.get(), g_getenv("TEST_CLICK_DB"), &error);
+
+            if (error != nullptr)
+            {
+                auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
+                throw std::runtime_error(perror->message);
+            }
+        }
+
+        if (!_clickUser)
+        {
+            _clickUser =
+                std::shared_ptr<ClickUser>(click_user_new_for_user(_clickDB.get(), g_getenv("TEST_CLICK_USER"), &error),
+                                           [](ClickUser* user) { g_clear_object(&user); });
+
+            if (error != nullptr)
+            {
+                auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
+                throw std::runtime_error(perror->message);
+            }
+        }
+
+        return true;
+    });
+
+    if (!init)
+    {
+        throw std::runtime_error("Unable to initialize the Click Database");
+    }
+}
+
+std::shared_ptr<JsonObject> Registry::Impl::getClickManifest(const std::string& package)
+{
+    initClick();
+
+    auto retval = thread.executeOnThread<std::shared_ptr<JsonObject>>([this, package]() {
+        GError* error = nullptr;
+        auto retval = std::shared_ptr<JsonObject>(click_user_get_manifest(_clickUser.get(), package.c_str(), &error),
+                                                  [](JsonObject* obj) {
+                                                      if (obj != nullptr)
+                                                      {
+                                                          json_object_unref(obj);
+                                                      }
+                                                  });
+
+        if (error != nullptr)
+        {
+            auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
+            throw std::runtime_error(perror->message);
+        }
+
+        return retval;
+    });
+
+    if (!retval)
+        throw std::runtime_error("Unable to get Click manifest for package: " + package);
+
+    return retval;
+}
+
+std::list<AppID::Package> Registry::Impl::getClickPackages()
+{
+    initClick();
+
+    return thread.executeOnThread<std::list<AppID::Package>>([this]() {
+        GError* error = nullptr;
+        GList* pkgs = click_db_get_packages(_clickDB.get(), FALSE, &error);
+
+        if (error != nullptr)
+        {
+            auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
+            throw std::runtime_error(perror->message);
+        }
+
+        std::list<AppID::Package> list;
+        for (GList* item = pkgs; item != NULL; item = g_list_next(item))
+        {
+            list.emplace_back(AppID::Package::from_raw((gchar*)item->data));
+        }
+
+        g_list_free_full(pkgs, g_free);
+        return list;
+    });
+}
+
+std::string Registry::Impl::getClickDir(const std::string& package)
+{
+    initClick();
+
+    return thread.executeOnThread<std::string>([this, package]() {
+        GError* error = nullptr;
+        auto dir = click_user_get_path(_clickUser.get(), package.c_str(), &error);
+
+        if (error != nullptr)
+        {
+            auto perror = std::shared_ptr<GError>(error, [](GError* error) { g_error_free(error); });
+            throw std::runtime_error(perror->message);
+        }
+
+        std::string cppdir(dir);
+        g_free(dir);
+        return cppdir;
+    });
+}
+
+#if 0
+void
+Registry::Impl::setManager (Registry::Manager* manager)
+{
+    if (_manager != nullptr)
+    {
+        throw std::runtime_error("Already have a manager and trying to set another");
+    }
+
+    _manager = manager;
+}
+
+void
+Registry::Impl::clearManager ()
+{
+    _manager = nullptr;
+}
+#endif
+
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/registry-impl.h'
--- libubuntu-app-launch/registry-impl.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/registry-impl.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "registry.h"
+#include "glib-thread.h"
+
+#include <json-glib/json-glib.h>
+#include <click.h>
+#include <gio/gio.h>
+
+#pragma once
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+class Registry::Impl
+{
+public:
+    Impl(Registry* registry);
+    virtual ~Impl()
+    {
+        thread.quit();
+    }
+
+    std::shared_ptr<JsonObject> getClickManifest(const std::string& package);
+    std::list<AppID::Package> getClickPackages();
+    std::string getClickDir(const std::string& package);
+
+#if 0
+    void setManager (Registry::Manager* manager);
+    void clearManager ();
+#endif
+
+    GLib::ContextThread thread;
+
+private:
+    Registry* _registry;
+#if 0
+    Registry::Manager* _manager;
+#endif
+
+    std::shared_ptr<ClickDB> _clickDB;
+    std::shared_ptr<ClickUser> _clickUser;
+
+    std::shared_ptr<GDBusConnection> _dbus;
+
+    void initClick();
+};
+
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/registry.cpp'
--- libubuntu-app-launch/registry.cpp	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/registry.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "registry.h"
+#include "registry-impl.h"
+
+#include "application-impl-click.h"
+#include "application-impl-legacy.h"
+#include "application-impl-libertine.h"
+
+#include "helper-impl-click.h"
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+Registry::Registry()
+{
+    impl = std::unique_ptr<Impl>(new Impl(this));
+}
+
+Registry::~Registry()
+{
+}
+
+std::list<std::shared_ptr<Application>> Registry::runningApps(std::shared_ptr<Registry> connection)
+{
+    return connection->impl->thread.executeOnThread<std::list<std::shared_ptr<Application>>>(
+        [connection]() -> std::list<std::shared_ptr<Application>> {
+            auto strv = ubuntu_app_launch_list_running_apps();
+            if (strv == nullptr)
+            {
+                return {};
+            }
+
+            std::list<std::shared_ptr<Application>> list;
+            for (int i = 0; strv[i] != nullptr; i++)
+            {
+                auto appid = AppID::find(strv[i]);
+                auto app = Application::create(appid, connection);
+                list.push_back(app);
+            }
+
+            g_strfreev(strv);
+
+            return list;
+        });
+}
+
+std::list<std::shared_ptr<Application>> Registry::installedApps(std::shared_ptr<Registry> connection)
+{
+    std::list<std::shared_ptr<Application>> list;
+
+    list.splice(list.begin(), app_impls::Click::list(connection));
+    list.splice(list.begin(), app_impls::Legacy::list(connection));
+    list.splice(list.begin(), app_impls::Libertine::list(connection));
+
+    return list;
+}
+
+std::list<std::shared_ptr<Helper>> Registry::runningHelpers(Helper::Type type, std::shared_ptr<Registry> connection)
+{
+    std::list<std::shared_ptr<Helper>> list;
+
+    list.splice(list.begin(), helper_impls::Click::running(type, connection));
+
+    return list;
+}
+
+std::shared_ptr<Registry> defaultRegistry;
+std::shared_ptr<Registry> Registry::getDefault()
+{
+    if (!defaultRegistry)
+    {
+        defaultRegistry = std::make_shared<Registry>();
+    }
+
+    return defaultRegistry;
+}
+
+};  // namespace app_launch
+};  // namespace ubuntu

=== added file 'libubuntu-app-launch/registry.h'
--- libubuntu-app-launch/registry.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/registry.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <core/signal.h>
+#include <functional>
+#include <list>
+#include <memory>
+
+#include "application.h"
+#include "helper.h"
+
+#pragma once
+#pragma GCC visibility push(default)
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+class Registry
+{
+public:
+    enum class FailureType
+    {
+        CRASH,
+        START_FAILURE,
+    };
+
+    Registry();
+    virtual ~Registry();
+
+    /* Lots of application lists */
+    static std::list<std::shared_ptr<Application>> runningApps(std::shared_ptr<Registry> registry = getDefault());
+    static std::list<std::shared_ptr<Application>> installedApps(std::shared_ptr<Registry> registry = getDefault());
+
+#if 0 /* TODO -- In next MR */
+    /* Signals to discover what is happening to apps */
+    core::Signal<std::shared_ptr<Application>, std::shared_ptr<Application::Instance>> appStarted;
+    core::Signal<std::shared_ptr<Application>, std::shared_ptr<Application::Instance>> appStopped;
+    core::Signal<std::shared_ptr<Application>, std::shared_ptr<Application::Instance>, FailureType> appFailed;
+    core::Signal<std::shared_ptr<Application>, std::shared_ptr<Application::Instance>> appPaused;
+    core::Signal<std::shared_ptr<Application>, std::shared_ptr<Application::Instance>> appResumed;
+
+    /* The Application Manager, almost always if you're not Unity8, don't
+       use this API. Testing is a special case. */
+    class Manager
+    {
+        virtual bool focusRequest (std::shared_ptr<Application> app, std::shared_ptr<Application::Instance> instance) = 0;
+        virtual bool startingRequest (std::shared_ptr<Application> app, std::shared_ptr<Application::Instance> instance) = 0;
+
+    protected:
+        Manager() = default;
+    };
+
+    void setManager (Manager* manager);
+    void clearManager ();
+#endif
+
+    /* Helper Lists */
+    static std::list<std::shared_ptr<Helper>> runningHelpers(Helper::Type type,
+                                                             std::shared_ptr<Registry> registry = getDefault());
+
+    /* Default Junk */
+    static std::shared_ptr<Registry> getDefault();
+    static void clearDefault();
+
+    /* Hide our implementation */
+    class Impl;
+    std::unique_ptr<Impl> impl;
+};
+
+};  // namespace app_launch
+};  // namespace ubuntu
+
+#pragma GCC visibility pop

=== added file 'libubuntu-app-launch/type-tagger.h'
--- libubuntu-app-launch/type-tagger.h	1970-01-01 00:00:00 +0000
+++ libubuntu-app-launch/type-tagger.h	2016-03-04 11:34:19 +0000
@@ -0,0 +1,37 @@
+#pragma once
+
+namespace ubuntu
+{
+namespace app_launch
+{
+
+template <typename Tag, typename T>
+class TypeTagger
+{
+public:
+    static TypeTagger<Tag, T> from_raw(const T& value)
+    {
+        return TypeTagger<Tag, T>(value);
+    }
+    const T& value() const
+    {
+        return _value;
+    }
+    operator T() const
+    {
+        return _value;
+    }
+    ~TypeTagger()
+    {
+    }
+
+private:
+    TypeTagger(const T& value)
+        : _value(value)
+    {
+    }
+    T _value;
+};
+
+};  // namespace app_launch
+};  // namespace ubuntu

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.c'
--- libubuntu-app-launch/ubuntu-app-launch.c	2015-08-17 21:38:29 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.c	2016-03-04 11:34:19 +0000
@@ -38,7 +38,6 @@
 
 static void apps_for_job (GDBusConnection * con, const gchar * name, GArray * apps, gboolean truncate_legacy);
 static void free_helper (gpointer value);
-static GList * pids_for_appid (const gchar * appid);
 int kill (pid_t pid, int signal);
 static gchar * escape_dbus_string (const gchar * input);
 
@@ -588,7 +587,7 @@
 
 	do {
 		hash_table_size = g_hash_table_size(pidssignaled);
-		GList * pidlist = pids_for_appid(appid);
+		GList * pidlist = ubuntu_app_launch_get_pids(appid);
 		GList * iter;
 
 		if (pidlist == NULL) {
@@ -1506,9 +1505,10 @@
 /* Get the PIDs for an AppID. If it's click or legacy single instance that's
    a simple call to the helper. But if it's not, we have to make a call for
    each instance of the app that we have running. */
-static GList *
-pids_for_appid (const gchar * appid)
+GList *
+ubuntu_app_launch_get_pids (const gchar * appid)
 {
+	g_return_val_if_fail(appid != NULL, NULL);
 	ual_tracepoint(pids_list_start, appid);
 
 	GDBusConnection * cgmanager = cgroup_manager_connection();
@@ -1522,7 +1522,7 @@
 
 		ual_tracepoint(pids_list_finished, appid, g_list_length(pids));
 		return pids;
-	} else if (!is_libertine(appid) && legacy_single_instance(appid)) {
+	} else if (is_libertine(appid) || legacy_single_instance(appid)) {
 		gchar * jobname = g_strdup_printf("%s-", appid);
 		GList * pids = pids_from_cgroup(cgmanager, "application-legacy", jobname);
 		g_free(jobname);
@@ -1572,7 +1572,7 @@
 		return FALSE;
 	}
 
-	GList * pidlist = pids_for_appid(appid);
+	GList * pidlist = ubuntu_app_launch_get_pids(appid);
 	GList * head;
 
 	for (head = pidlist; head != NULL; head = g_list_next(head)) {
@@ -2403,7 +2403,7 @@
 	const gchar * job_name = g_getenv("UPSTART_JOB");
 	const gchar * instance_name = g_getenv("UPSTART_INSTANCE");
 	const gchar * demangler = g_getenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
-	g_return_if_fail(job_name != NULL);
+	g_return_val_if_fail(job_name != NULL, FALSE);
 
 	GError * error = NULL;
 	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error);

=== modified file 'libubuntu-app-launch/ubuntu-app-launch.h'
--- libubuntu-app-launch/ubuntu-app-launch.h	2015-08-10 14:19:05 +0000
+++ libubuntu-app-launch/ubuntu-app-launch.h	2016-03-04 11:34:19 +0000
@@ -388,6 +388,18 @@
 GPid       ubuntu_app_launch_get_primary_pid           (const gchar *                     appid);
 
 /**
+ * ubuntu_app_launch_get_pids:
+ * @appid: ID of the application to look for
+ *
+ * Checks to see if an application is running and returns
+ * the PIDs associated with it.
+ *
+ * Return Value: (transfer full) (element-type GLib.Pid): A list
+ *   of PIDs associated with @appid, empty if not running.
+ */
+GList *     ubuntu_app_launch_get_pids                 (const gchar *                     appid);
+
+/**
  * ubuntu_app_launch_pid_in_app_id:
  * @pid: Process ID to check on
  * @appid: ID of the application to look in

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-06-26 17:26:50 +0000
+++ tests/CMakeLists.txt	2016-03-04 11:34:19 +0000
@@ -42,6 +42,11 @@
 	mir-mock.cpp)
 target_link_libraries (libual-test gtest ${GTEST_LIBS} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} ubuntu-launcher)
 
+add_executable (libual-cpp-test
+	libual-cpp-test.cc
+	mir-mock.cpp)
+target_link_libraries (libual-cpp-test gtest ${GTEST_LIBS} ${LIBUPSTART_LIBRARIES} ${DBUSTEST_LIBRARIES} ubuntu-launcher)
+
 add_executable (data-spew
 	data-spew.c)
 target_link_libraries (data-spew ${GLIB2_LIBRARIES})
@@ -50,6 +55,16 @@
 	socket-tool.c)
 
 add_test (NAME libual-test COMMAND libual-test)
+add_test (NAME libual-cpp-test COMMAND libual-cpp-test)
+
+# Application Info Desktop
+
+add_executable (application-info-desktop-test
+	application-info-desktop.cpp
+	${CMAKE_SOURCE_DIR}/libubuntu-app-launch/application-info-desktop.cpp)
+target_link_libraries (application-info-desktop-test gtest ${GTEST_LIBS} ubuntu-launcher)
+
+add_test (NAME application-info-desktop-test COMMAND application-info-desktop-test)
 
 # Failure Test
 
@@ -101,3 +116,8 @@
 configure_file ("xmir-helper-test.in" "${CMAKE_CURRENT_BINARY_DIR}/xmir-helper-test" @ONLY)
 add_test (xmir-helper-test xmir-helper-test)
 
+# Formatted code
+
+add_custom_target(format-tests
+	COMMAND clang-format -i -style=file libual-cpp-test.cc
+)

=== added file 'tests/application-info-desktop.cpp'
--- tests/application-info-desktop.cpp	1970-01-01 00:00:00 +0000
+++ tests/application-info-desktop.cpp	2016-03-04 11:34:19 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright © 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 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include "application-info-desktop.h"
+
+#include <gtest/gtest.h>
+
+class ApplicationInfoDesktop : public ::testing::Test
+{
+    virtual void SetUp()
+    {
+    }
+
+    virtual void TearDown()
+    {
+    }
+};
+
+#define DESKTOP "Desktop Entry"
+
+TEST_F(ApplicationInfoDesktop, DefaultState)
+{
+    auto keyfile = std::shared_ptr<GKeyFile>(g_key_file_new(), g_key_file_free);
+    g_key_file_set_string(keyfile.get(), DESKTOP, "Name", "Foo App");
+    g_key_file_set_string(keyfile.get(), DESKTOP, "Exec", "foo");
+    g_key_file_set_string(keyfile.get(), DESKTOP, "Icon", "foo.png");
+
+    auto appinfo = ubuntu::app_launch::app_info::Desktop(keyfile, "/");
+
+    EXPECT_EQ("Foo App", appinfo.name().value());
+    EXPECT_EQ("", appinfo.description().value());
+    EXPECT_EQ("/foo.png", appinfo.iconPath().value());
+
+    EXPECT_EQ("", appinfo.splash().title.value());
+    EXPECT_EQ("", appinfo.splash().image.value());
+    EXPECT_EQ("", appinfo.splash().backgroundColor.value());
+    EXPECT_EQ("", appinfo.splash().headerColor.value());
+    EXPECT_EQ("", appinfo.splash().footerColor.value());
+    EXPECT_FALSE( appinfo.splash().showHeader.value());
+
+    EXPECT_TRUE(appinfo.supportedOrientations().portrait);
+    EXPECT_TRUE(appinfo.supportedOrientations().landscape);
+    EXPECT_TRUE(appinfo.supportedOrientations().invertedPortrait);
+    EXPECT_TRUE(appinfo.supportedOrientations().invertedLandscape);
+
+    EXPECT_FALSE(appinfo.rotatesWindowContents().value());
+
+    EXPECT_FALSE(appinfo.supportsUbuntuLifecycle().value());
+}
+
+TEST_F(ApplicationInfoDesktop, KeyfileErrors)
+{
+    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop({}, "/"), std::runtime_error);
+
+    auto noname = std::shared_ptr<GKeyFile>(g_key_file_new(), g_key_file_free);
+    g_key_file_set_string(noname.get(), DESKTOP, "Comment", "This is a comment");
+    g_key_file_set_string(noname.get(), DESKTOP, "Exec", "foo");
+    g_key_file_set_string(noname.get(), DESKTOP, "Icon", "foo.png");
+
+    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(noname, "/"), std::runtime_error);
+
+    auto noicon = std::shared_ptr<GKeyFile>(g_key_file_new(), g_key_file_free);
+    g_key_file_set_string(noicon.get(), DESKTOP, "Name", "Foo App");
+    g_key_file_set_string(noicon.get(), DESKTOP, "Comment", "This is a comment");
+    g_key_file_set_string(noicon.get(), DESKTOP, "Exec", "foo");
+
+    EXPECT_THROW(ubuntu::app_launch::app_info::Desktop(noicon, "/"), std::runtime_error);
+}
+
+TEST_F(ApplicationInfoDesktop, Orientations)
+{
+    ubuntu::app_launch::Application::Info::Orientations defaultOrientations =
+    {
+portrait:
+        true,
+landscape:
+        true,
+invertedPortrait:
+        true,
+invertedLandscape:
+        true
+    };
+
+    auto keyfile = std::shared_ptr<GKeyFile>(g_key_file_new(), g_key_file_free);
+    g_key_file_set_string(keyfile.get(), DESKTOP, "Name", "Foo App");
+    g_key_file_set_string(keyfile.get(), DESKTOP, "Exec", "foo");
+    g_key_file_set_string(keyfile.get(), DESKTOP, "Icon", "foo.png");
+
+    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "this should not parse");
+    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "this;should;not;parse;");
+    EXPECT_EQ(defaultOrientations, ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "portrait;");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: false, invertedPortrait: false, invertedLandscape: false}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "landscape;portrait;");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: false, invertedLandscape: false}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "landscape  ;  portrait;	invertedPortrait");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: true, invertedLandscape: false}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "portrait;landscape;");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: false, invertedLandscape: false}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "portrait;landscape;invertedportrait;invertedlandscape;");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: true, invertedLandscape: true}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "PORTRAIT;");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: false, invertedPortrait: false, invertedLandscape: false}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "pOrTraIt;lANDscApE;inVErtEDpORtrAit;iNVErtEDLAnDsCapE;");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: true, landscape: true, invertedPortrait: true, invertedLandscape: true}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "primary;");
+    EXPECT_EQ((ubuntu::app_launch::Application::Info::Orientations {portrait: false, landscape: false, invertedPortrait: false, invertedLandscape: false}),
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+
+    g_key_file_set_string(keyfile.get(), DESKTOP, "X-Ubuntu-Supported-Orientations", "foobar;primary;");
+    EXPECT_EQ(defaultOrientations,
+              ubuntu::app_launch::app_info::Desktop(keyfile, "/").supportedOrientations());
+}

=== modified file 'tests/click-app-dir/application.desktop'
--- tests/click-app-dir/application.desktop	2013-09-24 03:39:27 +0000
+++ tests/click-app-dir/application.desktop	2016-03-04 11:34:19 +0000
@@ -1,4 +1,6 @@
 [Desktop Entry]
+Version=1.0
 Name=Application
 Type=Application
-Exec=foo
+Exec=grep
+Icon=foo

=== modified file 'tests/exec-util-test.cc'
--- tests/exec-util-test.cc	2015-08-11 19:11:15 +0000
+++ tests/exec-util-test.cc	2016-03-04 11:34:19 +0000
@@ -172,7 +172,7 @@
 		{"APP_DIR", [](const gchar * value) {
 			EXPECT_STREQ(APP_DIR, value); }},
 		{"APP_EXEC", [](const gchar * value) {
-			EXPECT_STREQ("foo", value); }},
+			EXPECT_STREQ("grep", value); }},
 		{"APP_ID", [](const gchar * value) {
 			EXPECT_STREQ("com.test.good_application_1.2.3", value); }},
 		{"APP_LAUNCHER_PID", [](const gchar * value) {

=== modified file 'tests/helper-handshake-test.cc'
--- tests/helper-handshake-test.cc	2014-04-30 16:18:29 +0000
+++ tests/helper-handshake-test.cc	2016-03-04 11:34:19 +0000
@@ -103,6 +103,7 @@
 {
 	bool * reached = static_cast<bool *>(user_data);
 	*reached = true;
+	return true;
 }
 
 TEST_F(HelperHandshakeTest, HandshakeTimeout)
@@ -114,6 +115,8 @@
 
 	starting_handshake_wait(handshake);
 
+	g_source_remove(outertimeout);
+
 	ASSERT_FALSE(timeout_reached);
 
 	return;

=== modified file 'tests/helper-test.cc'
--- tests/helper-test.cc	2014-11-11 22:05:30 +0000
+++ tests/helper-test.cc	2016-03-04 11:34:19 +0000
@@ -297,8 +297,6 @@
 	ASSERT_NE(calls, nullptr);
 	ASSERT_STREQ("SetEnvList", calls[0].name);
 
-	unsigned int i;
-
 	bool got_app_isolation = false;
 	bool got_cache_home = false;
 	bool got_config_home = false;

=== modified file 'tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/test.desktop'
--- tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/test.desktop	2015-08-06 21:38:31 +0000
+++ tests/libertine-data/libertine-container/container-name/rootfs/usr/share/applications/test.desktop	2016-03-04 11:34:19 +0000
@@ -2,3 +2,4 @@
 Name=Test
 Type=Application
 Exec=test
+Icon=test

=== added file 'tests/libual-cpp-test.cc'
--- tests/libual-cpp-test.cc	1970-01-01 00:00:00 +0000
+++ tests/libual-cpp-test.cc	2016-03-04 11:34:19 +0000
@@ -0,0 +1,1599 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License 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/>.
+ *
+ * Authors:
+ *     Ted Gould <[e-mail]>
+ */
+
+#include <future>
+#include <thread>
+
+#include <gtest/gtest.h>
+#include <gio/gio.h>
+#include <zeitgeist.h>
+#include "mir-mock.h"
+
+#include "registry.h"
+#include "application.h"
+#include "helper.h"
+
+extern "C" {
+#include "ubuntu-app-launch.h"
+#include "libdbustest/dbus-test.h"
+#include <fcntl.h>
+}
+
+class LibUAL : public ::testing::Test
+{
+protected:
+    DbusTestService* service = NULL;
+    DbusTestDbusMock* mock = NULL;
+    DbusTestDbusMock* cgmock = NULL;
+    GDBusConnection* bus = NULL;
+    std::string last_focus_appid;
+    std::string last_resume_appid;
+    guint resume_timeout = 0;
+    std::shared_ptr<ubuntu::app_launch::Registry> registry;
+
+private:
+    static void focus_cb(const gchar* appid, gpointer user_data)
+    {
+        g_debug("Focus Callback: %s", appid);
+        LibUAL* _this = static_cast<LibUAL*>(user_data);
+        _this->last_focus_appid = appid;
+    }
+
+    static void resume_cb(const gchar* appid, gpointer user_data)
+    {
+        g_debug("Resume Callback: %s", appid);
+        LibUAL* _this = static_cast<LibUAL*>(user_data);
+        _this->last_resume_appid = appid;
+
+        if (_this->resume_timeout > 0)
+        {
+            _this->pause(_this->resume_timeout);
+        }
+    }
+
+protected:
+    /* Useful debugging stuff, but not on by default.  You really want to
+       not get all this noise typically */
+    void debugConnection()
+    {
+        if (true)
+        {
+            return;
+        }
+
+        DbusTestBustle* bustle = dbus_test_bustle_new("test.bustle");
+        dbus_test_service_add_task(service, DBUS_TEST_TASK(bustle));
+        g_object_unref(bustle);
+
+        DbusTestProcess* monitor = dbus_test_process_new("dbus-monitor");
+        dbus_test_service_add_task(service, DBUS_TEST_TASK(monitor));
+        g_object_unref(monitor);
+    }
+
+    virtual void SetUp()
+    {
+        /* Click DB test mode */
+        g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
+        g_setenv("TEST_CLICK_USER", "test-user", TRUE);
+
+        gchar* linkfarmpath = g_build_filename(CMAKE_SOURCE_DIR, "link-farm", NULL);
+        g_setenv("UBUNTU_APP_LAUNCH_LINK_FARM", linkfarmpath, TRUE);
+        g_free(linkfarmpath);
+
+        g_setenv("XDG_DATA_DIRS", CMAKE_SOURCE_DIR, TRUE);
+        g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE);
+        g_setenv("XDG_DATA_HOME", CMAKE_SOURCE_DIR "/libertine-home", TRUE);
+
+        service = dbus_test_service_new(NULL);
+
+        debugConnection();
+
+        mock = dbus_test_dbus_mock_new("com.ubuntu.Upstart");
+
+        DbusTestDbusMockObject* obj =
+            dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, obj, "EmitEvent", G_VARIANT_TYPE("(sasb)"), NULL, "", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, obj, "GetJobByName", G_VARIANT_TYPE("s"), G_VARIANT_TYPE("o"),
+                                              "if args[0] == 'application-click':\n"
+                                              "	ret = dbus.ObjectPath('/com/test/application_click')\n"
+                                              "elif args[0] == 'application-legacy':\n"
+                                              "	ret = dbus.ObjectPath('/com/test/application_legacy')\n"
+                                              "elif args[0] == 'untrusted-helper':\n"
+                                              "	ret = dbus.ObjectPath('/com/test/untrusted/helper')\n",
+                                              NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, obj, "SetEnv", G_VARIANT_TYPE("(assb)"), NULL, "", NULL);
+
+        /* Click App */
+        DbusTestDbusMockObject* jobobj =
+            dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
+
+        dbus_test_dbus_mock_object_add_method(
+            mock, jobobj, "Start", G_VARIANT_TYPE("(asb)"), NULL,
+            "if args[0][0] == 'APP_ID=com.test.good_application_1.2.3':"
+            "    raise dbus.exceptions.DBusException('Foo running', name='com.ubuntu.Upstart0_6.Error.AlreadyStarted')",
+            NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, jobobj, "Stop", G_VARIANT_TYPE("(asb)"), NULL, "", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, jobobj, "GetAllInstances", NULL, G_VARIANT_TYPE("ao"),
+                                              "ret = [ dbus.ObjectPath('/com/test/app_instance') ]", NULL);
+
+        DbusTestDbusMockObject* instobj =
+            dbus_test_dbus_mock_get_object(mock, "/com/test/app_instance", "com.ubuntu.Upstart0_6.Instance", NULL);
+        dbus_test_dbus_mock_object_add_property(mock, instobj, "name", G_VARIANT_TYPE_STRING,
+                                                g_variant_new_string("com.test.good_application_1.2.3"), NULL);
+        gchar* process_var = g_strdup_printf("[('main', %d)]", getpid());
+        dbus_test_dbus_mock_object_add_property(mock, instobj, "processes", G_VARIANT_TYPE("a(si)"),
+                                                g_variant_new_parsed(process_var), NULL);
+        g_free(process_var);
+
+        /*  Legacy App */
+        DbusTestDbusMockObject* ljobobj =
+            dbus_test_dbus_mock_get_object(mock, "/com/test/application_legacy", "com.ubuntu.Upstart0_6.Job", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, ljobobj, "Start", G_VARIANT_TYPE("(asb)"), NULL, "", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, ljobobj, "Stop", G_VARIANT_TYPE("(asb)"), NULL, "", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, ljobobj, "GetAllInstances", NULL, G_VARIANT_TYPE("ao"),
+                                              "ret = [ dbus.ObjectPath('/com/test/legacy_app_instance') ]", NULL);
+
+        DbusTestDbusMockObject* linstobj = dbus_test_dbus_mock_get_object(mock, "/com/test/legacy_app_instance",
+                                                                          "com.ubuntu.Upstart0_6.Instance", NULL);
+        dbus_test_dbus_mock_object_add_property(mock, linstobj, "name", G_VARIANT_TYPE_STRING,
+                                                g_variant_new_string("multiple-2342345"), NULL);
+        dbus_test_dbus_mock_object_add_property(mock, linstobj, "processes", G_VARIANT_TYPE("a(si)"),
+                                                g_variant_new_parsed("[('main', 5678)]"), NULL);
+
+        /*  Untrusted Helper */
+        DbusTestDbusMockObject* uhelperobj =
+            dbus_test_dbus_mock_get_object(mock, "/com/test/untrusted/helper", "com.ubuntu.Upstart0_6.Job", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, uhelperobj, "Start", G_VARIANT_TYPE("(asb)"), NULL, "", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, uhelperobj, "Stop", G_VARIANT_TYPE("(asb)"), NULL, "", NULL);
+
+        dbus_test_dbus_mock_object_add_method(mock, uhelperobj, "GetAllInstances", NULL, G_VARIANT_TYPE("ao"),
+                                              "ret = [ dbus.ObjectPath('/com/test/untrusted/helper/instance'), "
+                                              "dbus.ObjectPath('/com/test/untrusted/helper/multi_instance') ]",
+                                              NULL);
+
+        DbusTestDbusMockObject* uhelperinstance = dbus_test_dbus_mock_get_object(
+            mock, "/com/test/untrusted/helper/instance", "com.ubuntu.Upstart0_6.Instance", NULL);
+        dbus_test_dbus_mock_object_add_property(mock, uhelperinstance, "name", G_VARIANT_TYPE_STRING,
+                                                g_variant_new_string("untrusted-type::com.foo_bar_43.23.12"), NULL);
+
+        DbusTestDbusMockObject* unhelpermulti = dbus_test_dbus_mock_get_object(
+            mock, "/com/test/untrusted/helper/multi_instance", "com.ubuntu.Upstart0_6.Instance", NULL);
+        dbus_test_dbus_mock_object_add_property(
+            mock, unhelpermulti, "name", G_VARIANT_TYPE_STRING,
+            g_variant_new_string("untrusted-type:24034582324132:com.bar_foo_8432.13.1"), NULL);
+
+        /* Create the cgroup manager mock */
+        cgmock = dbus_test_dbus_mock_new("org.test.cgmock");
+        g_setenv("UBUNTU_APP_LAUNCH_CG_MANAGER_NAME", "org.test.cgmock", TRUE);
+
+        DbusTestDbusMockObject* cgobject = dbus_test_dbus_mock_get_object(cgmock, "/org/linuxcontainers/cgmanager",
+                                                                          "org.linuxcontainers.cgmanager0_0", NULL);
+        dbus_test_dbus_mock_object_add_method(cgmock, cgobject, "GetTasksRecursive", G_VARIANT_TYPE("(ss)"),
+                                              G_VARIANT_TYPE("ai"), "ret = [100, 200, 300]", NULL);
+
+        /* Put it together */
+        dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
+        dbus_test_service_add_task(service, DBUS_TEST_TASK(cgmock));
+        dbus_test_service_start_tasks(service);
+
+        bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+        g_dbus_connection_set_exit_on_close(bus, FALSE);
+        g_object_add_weak_pointer(G_OBJECT(bus), (gpointer*)&bus);
+
+        /* Make sure we pretend the CG manager is just on our bus */
+        g_setenv("UBUNTU_APP_LAUNCH_CG_MANAGER_SESSION_BUS", "YES", TRUE);
+
+        ASSERT_TRUE(ubuntu_app_launch_observer_add_app_focus(focus_cb, this));
+        ASSERT_TRUE(ubuntu_app_launch_observer_add_app_resume(resume_cb, this));
+
+        registry = std::make_shared<ubuntu::app_launch::Registry>();
+    }
+
+    virtual void TearDown()
+    {
+        registry.reset();
+
+        ubuntu_app_launch_observer_delete_app_focus(focus_cb, this);
+        ubuntu_app_launch_observer_delete_app_resume(resume_cb, this);
+
+        g_clear_object(&mock);
+        g_clear_object(&cgmock);
+        g_clear_object(&service);
+
+        g_object_unref(bus);
+
+        unsigned int cleartry = 0;
+        while (bus != NULL && cleartry < 100)
+        {
+            pause(100);
+            cleartry++;
+        }
+        ASSERT_EQ(nullptr, bus);
+    }
+
+    GVariant* find_env(GVariant* env_array, const gchar* var)
+    {
+        unsigned int i;
+        GVariant* retval = nullptr;
+
+        for (i = 0; i < g_variant_n_children(env_array); i++)
+        {
+            GVariant* child = g_variant_get_child_value(env_array, i);
+            const gchar* envvar = g_variant_get_string(child, nullptr);
+
+            if (g_str_has_prefix(envvar, var))
+            {
+                if (retval != nullptr)
+                {
+                    g_warning("Found the env var more than once!");
+                    g_variant_unref(retval);
+                    return nullptr;
+                }
+
+                retval = child;
+            }
+            else
+            {
+                g_variant_unref(child);
+            }
+        }
+
+        if (!retval)
+        {
+            gchar* envstr = g_variant_print(env_array, FALSE);
+            g_warning("Unable to find '%s' in '%s'", var, envstr);
+            g_free(envstr);
+        }
+
+        return retval;
+    }
+
+    bool check_env(GVariant* env_array, const gchar* var, const gchar* value)
+    {
+        bool found = false;
+        GVariant* val = find_env(env_array, var);
+        if (val == nullptr)
+        {
+            return false;
+        }
+
+        const gchar* envvar = g_variant_get_string(val, nullptr);
+
+        gchar* combined = g_strdup_printf("%s=%s", var, value);
+        if (g_strcmp0(envvar, combined) == 0)
+        {
+            found = true;
+        }
+
+        g_variant_unref(val);
+
+        return found;
+    }
+
+    void pause(guint time = 0)
+    {
+        if (time > 0)
+        {
+            GMainLoop* mainloop = g_main_loop_new(NULL, FALSE);
+
+            g_timeout_add(time,
+                          [](gpointer pmainloop) -> gboolean
+                          {
+                              g_main_loop_quit(static_cast<GMainLoop*>(pmainloop));
+                              return G_SOURCE_REMOVE;
+                          },
+                          mainloop);
+
+            g_main_loop_run(mainloop);
+
+            g_main_loop_unref(mainloop);
+        }
+
+        while (g_main_pending())
+        {
+            g_main_iteration(TRUE);
+        }
+    }
+};
+
+TEST_F(LibUAL, DISABLED_StartApplication)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
+
+    /* Basic make sure we can send the event */
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.multiple_first_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    app->launch();
+
+    EXPECT_EQ(1, dbus_test_dbus_mock_object_check_method_call(mock, obj, "Start", NULL, NULL));
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    /* Now look at the details of the call */
+    app->launch();
+
+    guint len = 0;
+    const DbusTestDbusMockCall* calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    EXPECT_STREQ("Start", calls->name);
+    EXPECT_EQ(2, g_variant_n_children(calls->params));
+
+    GVariant* block = g_variant_get_child_value(calls->params, 1);
+    EXPECT_TRUE(g_variant_get_boolean(block));
+    g_variant_unref(block);
+
+    GVariant* env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
+    g_variant_unref(env);
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    /* Let's pass some URLs */
+    std::vector<ubuntu::app_launch::Application::URL> urls{
+        ubuntu::app_launch::Application::URL::from_raw("http://ubuntu.com/"),
+        ubuntu::app_launch::Application::URL::from_raw("https://ubuntu.com/"),
+        ubuntu::app_launch::Application::URL::from_raw("file:///home/phablet/test.txt")};
+
+    app->launch(urls);
+
+    len = 0;
+    calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
+    EXPECT_TRUE(
+        check_env(env, "APP_URIS", "'http://ubuntu.com/' 'https://ubuntu.com/' 'file:///home/phablet/test.txt'"));
+    g_variant_unref(env);
+
+    return;
+}
+
+TEST_F(LibUAL, DISABLED_StartApplicationTest)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
+
+    /* Basic make sure we can send the event */
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.multiple_first_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    app->launchTest();
+
+    guint len = 0;
+    const DbusTestDbusMockCall* calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    EXPECT_STREQ("Start", calls->name);
+    EXPECT_EQ(2, g_variant_n_children(calls->params));
+
+    GVariant* block = g_variant_get_child_value(calls->params, 1);
+    EXPECT_TRUE(g_variant_get_boolean(block));
+    g_variant_unref(block);
+
+    GVariant* env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
+    EXPECT_TRUE(check_env(env, "QT_LOAD_TESTABILITY", "1"));
+    g_variant_unref(env);
+}
+
+TEST_F(LibUAL, DISABLED_StopApplication)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/test/application_click", "com.ubuntu.Upstart0_6.Job", NULL);
+
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+
+    ASSERT_TRUE(app->hasInstances());
+    EXPECT_EQ(1, app->instances().size());
+
+    app->instances()[0]->stop();
+
+    ASSERT_EQ(dbus_test_dbus_mock_object_check_method_call(mock, obj, "Stop", NULL, NULL), 1);
+}
+
+/* NOTE: The fact that there is 'libertine-data' in these strings is because
+   we're using one CACHE_HOME for this test suite and the libertine functions
+   need to pull things from there, where these are only comparisons. It's just
+   what value is in the environment variable */
+TEST_F(LibUAL, DISABLED_ApplicationLog)
+{
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+
+    EXPECT_EQ(
+        std::string(CMAKE_SOURCE_DIR "/libertine-data/upstart/application-click-com.test.good_application_1.2.3.log"),
+        app->instances()[0]->logPath());
+
+    appid = ubuntu::app_launch::AppID::find("single");
+    app = ubuntu::app_launch::Application::create(appid, registry);
+
+    EXPECT_EQ(std::string(CMAKE_SOURCE_DIR "/libertine-data/upstart/application-legacy-single-.log"),
+              app->instances()[0]->logPath());
+
+    appid = ubuntu::app_launch::AppID::find("multiple");
+    app = ubuntu::app_launch::Application::create(appid, registry);
+
+    EXPECT_EQ(std::string(CMAKE_SOURCE_DIR "/libertine-data/upstart/application-legacy-multiple-2342345.log"),
+              app->instances()[0]->logPath());
+}
+
+TEST_F(LibUAL, DISABLED_ApplicationPid)
+{
+    /* Check bad params */
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+
+    EXPECT_FALSE(app->instances()[0]->hasPid(0));
+
+    /* Check primary pid, which comes from Upstart */
+    EXPECT_EQ(getpid(), app->instances()[0]->primaryPid());
+
+    auto multiappid = ubuntu::app_launch::AppID::find("multiple");
+    auto multiapp = ubuntu::app_launch::Application::create(multiappid, registry);
+    EXPECT_EQ(5678, multiapp->instances()[0]->primaryPid());
+
+    /* Look at the full PID list from CG Manager */
+    DbusTestDbusMockObject* cgobject = dbus_test_dbus_mock_get_object(cgmock, "/org/linuxcontainers/cgmanager",
+                                                                      "org.linuxcontainers.cgmanager0_0", NULL);
+    const DbusTestDbusMockCall* calls = NULL;
+    guint len = 0;
+
+    /* Click in the set */
+    EXPECT_TRUE(app->instances()[0]->hasPid(100));
+    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
+    EXPECT_EQ(1, len);
+    EXPECT_STREQ("GetTasksRecursive", calls->name);
+    EXPECT_TRUE(g_variant_equal(
+        calls->params, g_variant_new("(ss)", "freezer", "upstart/application-click-com.test.good_application_1.2.3")));
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
+
+    /* Click out of the set */
+    EXPECT_FALSE(app->instances()[0]->hasPid(101));
+    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
+    EXPECT_EQ(1, len);
+    EXPECT_STREQ("GetTasksRecursive", calls->name);
+    EXPECT_TRUE(g_variant_equal(
+        calls->params, g_variant_new("(ss)", "freezer", "upstart/application-click-com.test.good_application_1.2.3")));
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
+
+    /* Legacy Single Instance */
+    auto singleappid = ubuntu::app_launch::AppID::find("single");
+    auto singleapp = ubuntu::app_launch::Application::create(singleappid, registry);
+
+    EXPECT_TRUE(singleapp->instances()[0]->hasPid(100));
+
+    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
+    EXPECT_EQ(1, len);
+    EXPECT_STREQ("GetTasksRecursive", calls->name);
+    EXPECT_TRUE(g_variant_equal(calls->params, g_variant_new("(ss)", "freezer", "upstart/application-legacy-single-")));
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
+
+    /* Legacy Multi Instance */
+    EXPECT_TRUE(multiapp->instances()[0]->hasPid(100));
+    calls = dbus_test_dbus_mock_object_get_method_calls(cgmock, cgobject, "GetTasksRecursive", &len, NULL);
+    EXPECT_EQ(1, len);
+    EXPECT_STREQ("GetTasksRecursive", calls->name);
+    EXPECT_TRUE(g_variant_equal(calls->params,
+                                g_variant_new("(ss)", "freezer", "upstart/application-legacy-multiple-2342345")));
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(cgmock, cgobject, NULL));
+}
+
+TEST_F(LibUAL, DISABLED_ApplicationId)
+{
+    g_setenv("TEST_CLICK_DB", "click-db-dir", TRUE);
+    g_setenv("TEST_CLICK_USER", "test-user", TRUE);
+
+    /* Test with current-user-version, should return the version in the manifest */
+    EXPECT_EQ("com.test.good_application_1.2.3",
+              (std::string)ubuntu::app_launch::AppID::discover("com.test.good", "application"));
+
+    /* Test with version specified, shouldn't even read the manifest */
+    EXPECT_EQ("com.test.good_application_1.2.4",
+              (std::string)ubuntu::app_launch::AppID::discover("com.test.good", "application", "1.2.4"));
+
+    /* Test with out a version or app, should return the version in the manifest */
+    EXPECT_EQ("com.test.good_application_1.2.3", (std::string)ubuntu::app_launch::AppID::discover(
+                                                     "com.test.good", "first-listed-app", "current-user-version"));
+
+    /* Make sure we can select the app from a list correctly */
+    EXPECT_EQ("com.test.multiple_first_1.2.3",
+              (std::string)ubuntu::app_launch::AppID::discover(
+                  "com.test.multiple", ubuntu::app_launch::AppID::ApplicationWildcard::FIRST_LISTED));
+    EXPECT_EQ("com.test.multiple_first_1.2.3", (std::string)ubuntu::app_launch::AppID::discover("com.test.multiple"));
+    EXPECT_EQ("com.test.multiple_fifth_1.2.3",
+              (std::string)ubuntu::app_launch::AppID::discover(
+                  "com.test.multiple", ubuntu::app_launch::AppID::ApplicationWildcard::LAST_LISTED));
+    EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover(
+                      "com.test.multiple", ubuntu::app_launch::AppID::ApplicationWildcard::ONLY_LISTED));
+    EXPECT_EQ("com.test.good_application_1.2.3",
+              (std::string)ubuntu::app_launch::AppID::discover(
+                  "com.test.good", ubuntu::app_launch::AppID::ApplicationWildcard::ONLY_LISTED));
+
+    /* A bunch that should be NULL */
+    EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover("com.test.no-hooks"));
+    EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover("com.test.no-json"));
+    EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover("com.test.no-object"));
+    EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover("com.test.no-version"));
+
+    /* Libertine tests */
+    EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover("container-name"));
+    EXPECT_EQ("", (std::string)ubuntu::app_launch::AppID::discover("container-name", "not-exist"));
+    EXPECT_EQ("container-name_test_0.0", (std::string)ubuntu::app_launch::AppID::discover("container-name", "test"));
+    EXPECT_EQ("container-name_user-app_0.0",
+              (std::string)ubuntu::app_launch::AppID::discover("container-name", "user-app"));
+}
+
+TEST_F(LibUAL, AppIdParse)
+{
+    EXPECT_FALSE(ubuntu::app_launch::AppID::parse("com.ubuntu.test_test_123").empty());
+    EXPECT_FALSE(ubuntu::app_launch::AppID::find("inkscape").empty());
+
+    auto id = ubuntu::app_launch::AppID::parse("com.ubuntu.test_test_123");
+
+    ASSERT_FALSE(id.empty());
+    EXPECT_EQ("com.ubuntu.test", id.package.value());
+    EXPECT_EQ("test", id.appname.value());
+    EXPECT_EQ("123", id.version.value());
+
+    return;
+}
+
+TEST_F(LibUAL, DISABLED_ApplicationList)
+{
+    auto apps = ubuntu::app_launch::Registry::runningApps(registry);
+
+    ASSERT_EQ(2, apps.size());
+
+    apps.sort([](const std::shared_ptr<ubuntu::app_launch::Application>& a,
+                 const std::shared_ptr<ubuntu::app_launch::Application>& b)
+              {
+                  std::string sa = a->appId();
+                  std::string sb = b->appId();
+
+                  return sa < sb;
+              });
+
+    EXPECT_EQ("com.test.good_application_1.2.3", (std::string)apps.front()->appId());
+    EXPECT_EQ("multiple", (std::string)apps.back()->appId());
+}
+
+typedef struct
+{
+    unsigned int count;
+    const gchar* name;
+} observer_data_t;
+
+static void observer_cb(const gchar* appid, gpointer user_data)
+{
+    observer_data_t* data = (observer_data_t*)user_data;
+
+    if (data->name == NULL)
+    {
+        data->count++;
+    }
+    else if (g_strcmp0(data->name, appid) == 0)
+    {
+        data->count++;
+    }
+}
+
+TEST_F(LibUAL, StartStopObserver)
+{
+    observer_data_t start_data = {.count = 0, .name = nullptr};
+    observer_data_t stop_data = {.count = 0, .name = nullptr};
+
+    ASSERT_TRUE(ubuntu_app_launch_observer_add_app_started(observer_cb, &start_data));
+    ASSERT_TRUE(ubuntu_app_launch_observer_add_app_stop(observer_cb, &stop_data));
+
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
+
+    /* Basic start */
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('started', ['JOB=application-click', 'INSTANCE=com.test.good_application_1.2.3'])"),
+        NULL);
+
+    g_usleep(100000);
+    while (g_main_pending())
+    {
+        g_main_iteration(TRUE);
+    }
+
+    ASSERT_EQ(start_data.count, 1);
+
+    /* Basic stop */
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('stopped', ['JOB=application-click', 'INSTANCE=com.test.good_application_1.2.3'])"),
+        NULL);
+
+    g_usleep(100000);
+    while (g_main_pending())
+    {
+        g_main_iteration(TRUE);
+    }
+
+    ASSERT_EQ(stop_data.count, 1);
+
+    /* Start legacy */
+    start_data.count = 0;
+    start_data.name = "multiple";
+
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('started', ['JOB=application-legacy', 'INSTANCE=multiple-234235'])"), NULL);
+
+    g_usleep(100000);
+    while (g_main_pending())
+    {
+        g_main_iteration(TRUE);
+    }
+
+    ASSERT_EQ(start_data.count, 1);
+
+    /* Legacy stop */
+    stop_data.count = 0;
+    stop_data.name = "bar";
+
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('stopped', ['JOB=application-legacy', 'INSTANCE=bar-9344321'])"), NULL);
+
+    g_usleep(100000);
+    while (g_main_pending())
+    {
+        g_main_iteration(TRUE);
+    }
+
+    ASSERT_EQ(stop_data.count, 1);
+
+    /* Test Noise Start */
+    start_data.count = 0;
+    start_data.name = "com.test.good_application_1.2.3";
+    stop_data.count = 0;
+    stop_data.name = "com.test.good_application_1.2.3";
+
+    /* A full lifecycle */
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('starting', ['JOB=application-click', 'INSTANCE=com.test.good_application_1.2.3'])"),
+        NULL);
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('started', ['JOB=application-click', 'INSTANCE=com.test.good_application_1.2.3'])"),
+        NULL);
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('stopping', ['JOB=application-click', 'INSTANCE=com.test.good_application_1.2.3'])"),
+        NULL);
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('stopped', ['JOB=application-click', 'INSTANCE=com.test.good_application_1.2.3'])"),
+        NULL);
+
+    g_usleep(100000);
+    while (g_main_pending())
+    {
+        g_main_iteration(TRUE);
+    }
+
+    /* Ensure we just signaled once for each */
+    ASSERT_EQ(start_data.count, 1);
+    ASSERT_EQ(stop_data.count, 1);
+
+    /* Remove */
+    ASSERT_TRUE(ubuntu_app_launch_observer_delete_app_started(observer_cb, &start_data));
+    ASSERT_TRUE(ubuntu_app_launch_observer_delete_app_stop(observer_cb, &stop_data));
+}
+
+static GDBusMessage* filter_starting(GDBusConnection* conn,
+                                     GDBusMessage* message,
+                                     gboolean incomming,
+                                     gpointer user_data)
+{
+    if (g_strcmp0(g_dbus_message_get_member(message), "UnityStartingSignal") == 0)
+    {
+        unsigned int* count = static_cast<unsigned int*>(user_data);
+        (*count)++;
+        g_object_unref(message);
+        return NULL;
+    }
+
+    return message;
+}
+
+static void starting_observer(const gchar* appid, gpointer user_data)
+{
+    std::string* last = static_cast<std::string*>(user_data);
+    *last = appid;
+    return;
+}
+
+TEST_F(LibUAL, StartingResponses)
+{
+    std::string last_observer;
+    unsigned int starting_count = 0;
+    GDBusConnection* session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+    guint filter = g_dbus_connection_add_filter(session, filter_starting, &starting_count, NULL);
+
+    EXPECT_TRUE(ubuntu_app_launch_observer_add_app_starting(starting_observer, &last_observer));
+
+    g_dbus_connection_emit_signal(session, NULL,                                           /* destination */
+                                  "/",                                                     /* path */
+                                  "com.canonical.UbuntuAppLaunch",                         /* interface */
+                                  "UnityStartingBroadcast",                                /* signal */
+                                  g_variant_new("(s)", "com.test.good_application_1.2.3"), /* params, the same */
+                                  NULL);
+
+    pause(100);
+
+    EXPECT_EQ("com.test.good_application_1.2.3", last_observer);
+    EXPECT_EQ(1, starting_count);
+
+    EXPECT_TRUE(ubuntu_app_launch_observer_delete_app_starting(starting_observer, &last_observer));
+
+    g_dbus_connection_remove_filter(session, filter);
+    g_object_unref(session);
+}
+
+TEST_F(LibUAL, AppIdTest)
+{
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    app->launch();
+
+    pause(50); /* Ensure all the events come through */
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_focus_appid);
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_resume_appid);
+}
+
+GDBusMessage* filter_func_good(GDBusConnection* conn, GDBusMessage* message, gboolean incomming, gpointer user_data)
+{
+    if (!incomming)
+    {
+        return message;
+    }
+
+    if (g_strcmp0(g_dbus_message_get_path(message), (gchar*)user_data) == 0)
+    {
+        GDBusMessage* reply = g_dbus_message_new_method_reply(message);
+        g_dbus_connection_send_message(conn, reply, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
+        g_object_unref(message);
+        return NULL;
+    }
+
+    return message;
+}
+
+TEST_F(LibUAL, UrlSendTest)
+{
+    GDBusConnection* session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+    guint filter = g_dbus_connection_add_filter(session, filter_func_good,
+                                                (gpointer) "/com_2etest_2egood_5fapplication_5f1_2e2_2e3", NULL);
+
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    std::vector<ubuntu::app_launch::Application::URL> uris = {
+        ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
+
+    app->launch(uris);
+
+    pause(100); /* Ensure all the events come through */
+
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_focus_appid);
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_resume_appid);
+
+    g_dbus_connection_remove_filter(session, filter);
+
+    /* Send multiple resume responses to ensure we unsubscribe */
+    /* Multiple to increase our chance of hitting a bad free in the middle,
+       fun with async! */
+    int i;
+    for (i = 0; i < 5; i++)
+    {
+        g_dbus_connection_emit_signal(session, NULL,                                           /* destination */
+                                      "/",                                                     /* path */
+                                      "com.canonical.UbuntuAppLaunch",                         /* interface */
+                                      "UnityResumeResponse",                                   /* signal */
+                                      g_variant_new("(s)", "com.test.good_application_1.2.3"), /* params, the same */
+                                      NULL);
+
+        pause(50); /* Ensure all the events come through */
+    }
+
+    g_object_unref(session);
+}
+
+TEST_F(LibUAL, UrlSendNoObjectTest)
+{
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    std::vector<ubuntu::app_launch::Application::URL> uris = {
+        ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
+
+    app->launch(uris);
+
+    pause(100); /* Ensure all the events come through */
+
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_focus_appid);
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_resume_appid);
+}
+
+TEST_F(LibUAL, UnityTimeoutTest)
+{
+    this->resume_timeout = 100;
+
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+
+    app->launch();
+
+    pause(1000); /* Ensure all the events come through */
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_focus_appid);
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_resume_appid);
+}
+
+TEST_F(LibUAL, UnityTimeoutUriTest)
+{
+    this->resume_timeout = 200;
+
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    std::vector<ubuntu::app_launch::Application::URL> uris = {
+        ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
+
+    app->launch(uris);
+
+    pause(1000); /* Ensure all the events come through */
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_focus_appid);
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_resume_appid);
+}
+
+GDBusMessage* filter_respawn(GDBusConnection* conn, GDBusMessage* message, gboolean incomming, gpointer user_data)
+{
+    if (g_strcmp0(g_dbus_message_get_member(message), "UnityResumeResponse") == 0)
+    {
+        g_object_unref(message);
+        return NULL;
+    }
+
+    return message;
+}
+
+TEST_F(LibUAL, UnityLostTest)
+{
+    GDBusConnection* session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+    guint filter = g_dbus_connection_add_filter(session, filter_respawn, NULL, NULL);
+
+    guint start = g_get_monotonic_time();
+
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.good_application_1.2.3");
+    auto app = ubuntu::app_launch::Application::create(appid, registry);
+    std::vector<ubuntu::app_launch::Application::URL> uris = {
+        ubuntu::app_launch::Application::URL::from_raw("http://www.test.com")};
+
+    app->launch(uris);
+
+    guint end = g_get_monotonic_time();
+
+    g_debug("Start call time: %d ms", (end - start) / 1000);
+    EXPECT_LT(end - start, 2000 * 1000);
+
+    pause(1000); /* Ensure all the events come through */
+
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_focus_appid);
+    EXPECT_EQ("com.test.good_application_1.2.3", this->last_resume_appid);
+
+    g_dbus_connection_remove_filter(session, filter);
+    g_object_unref(session);
+}
+
+TEST_F(LibUAL, LegacySingleInstance)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/test/application_legacy", "com.ubuntu.Upstart0_6.Job", NULL);
+
+    /* Check for a single-instance app */
+    auto singleappid = ubuntu::app_launch::AppID::find("single");
+    auto singleapp = ubuntu::app_launch::Application::create(singleappid, registry);
+
+    singleapp->launch();
+
+    guint len = 0;
+    const DbusTestDbusMockCall* calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    EXPECT_STREQ("Start", calls->name);
+    EXPECT_EQ(2, g_variant_n_children(calls->params));
+
+    GVariant* block = g_variant_get_child_value(calls->params, 1);
+    EXPECT_TRUE(g_variant_get_boolean(block));
+    g_variant_unref(block);
+
+    GVariant* env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "single"));
+    EXPECT_TRUE(check_env(env, "INSTANCE_ID", ""));
+    g_variant_unref(env);
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    /* Check for a multi-instance app */
+    auto multipleappid = ubuntu::app_launch::AppID::find("multiple");
+    auto multipleapp = ubuntu::app_launch::Application::create(multipleappid, registry);
+
+    multipleapp->launch();
+
+    len = 0;
+    calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    EXPECT_STREQ("Start", calls->name);
+    EXPECT_EQ(2, g_variant_n_children(calls->params));
+
+    block = g_variant_get_child_value(calls->params, 1);
+    EXPECT_TRUE(g_variant_get_boolean(block));
+    g_variant_unref(block);
+
+    env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "multiple"));
+    EXPECT_FALSE(check_env(env, "INSTANCE_ID", ""));
+    g_variant_unref(env);
+}
+
+static void failed_observer(const gchar* appid, UbuntuAppLaunchAppFailed reason, gpointer user_data)
+{
+    if (reason == UBUNTU_APP_LAUNCH_APP_FAILED_CRASH)
+    {
+        std::string* last = static_cast<std::string*>(user_data);
+        *last = appid;
+    }
+    return;
+}
+
+TEST_F(LibUAL, FailingObserver)
+{
+    std::string last_observer;
+    GDBusConnection* session = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
+
+    EXPECT_TRUE(ubuntu_app_launch_observer_add_app_failed(failed_observer, &last_observer));
+
+    g_dbus_connection_emit_signal(
+        session, NULL,                                                     /* destination */
+        "/",                                                               /* path */
+        "com.canonical.UbuntuAppLaunch",                                   /* interface */
+        "ApplicationFailed",                                               /* signal */
+        g_variant_new("(ss)", "com.test.good_application_1.2.3", "crash"), /* params, the same */
+        NULL);
+
+    pause(100);
+
+    EXPECT_EQ("com.test.good_application_1.2.3", last_observer);
+
+    last_observer.clear();
+
+    g_dbus_connection_emit_signal(
+        session, NULL,                                                        /* destination */
+        "/",                                                                  /* path */
+        "com.canonical.UbuntuAppLaunch",                                      /* interface */
+        "ApplicationFailed",                                                  /* signal */
+        g_variant_new("(ss)", "com.test.good_application_1.2.3", "blahblah"), /* params, the same */
+        NULL);
+
+    pause(100);
+
+    EXPECT_EQ("com.test.good_application_1.2.3", last_observer);
+
+    last_observer.clear();
+
+    g_dbus_connection_emit_signal(
+        session, NULL,                                                             /* destination */
+        "/",                                                                       /* path */
+        "com.canonical.UbuntuAppLaunch",                                           /* interface */
+        "ApplicationFailed",                                                       /* signal */
+        g_variant_new("(ss)", "com.test.good_application_1.2.3", "start-failure"), /* params, the same */
+        NULL);
+
+    pause(100);
+
+    EXPECT_TRUE(last_observer.empty());
+
+    EXPECT_TRUE(ubuntu_app_launch_observer_delete_app_failed(failed_observer, &last_observer));
+
+    g_object_unref(session);
+}
+
+TEST_F(LibUAL, StartHelper)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/test/untrusted/helper", "com.ubuntu.Upstart0_6.Job", NULL);
+
+    auto untrusted = ubuntu::app_launch::Helper::Type::from_raw("untrusted-type");
+
+    /* Basic make sure we can send the event */
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.multiple_first_1.2.3");
+    auto helper = ubuntu::app_launch::Helper::create(untrusted, appid, registry);
+
+    helper->launch();
+
+    EXPECT_EQ(1, dbus_test_dbus_mock_object_check_method_call(mock, obj, "Start", NULL, NULL));
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    /* Now check a multi out */
+    helper->launch();
+
+    guint len = 0;
+    auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    EXPECT_STREQ("Start", calls->name);
+    EXPECT_EQ(2, g_variant_n_children(calls->params));
+
+    auto block = g_variant_get_child_value(calls->params, 1);
+    EXPECT_TRUE(g_variant_get_boolean(block));
+    g_variant_unref(block);
+
+    auto env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
+    EXPECT_TRUE(check_env(env, "HELPER_TYPE", "untrusted-type"));
+    g_variant_unref(env);
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    /* Let's pass some URLs */
+    std::vector<ubuntu::app_launch::Helper::URL> urls = {
+        ubuntu::app_launch::Helper::URL::from_raw("http://ubuntu.com/"),
+        ubuntu::app_launch::Helper::URL::from_raw("https://ubuntu.com/"),
+        ubuntu::app_launch::Helper::URL::from_raw("file:///home/phablet/test.txt")};
+    helper->launch(urls);
+
+    len = 0;
+    calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
+    EXPECT_TRUE(
+        check_env(env, "APP_URIS", "'http://ubuntu.com/' 'https://ubuntu.com/' 'file:///home/phablet/test.txt'"));
+    EXPECT_TRUE(check_env(env, "HELPER_TYPE", "untrusted-type"));
+    EXPECT_FALSE(check_env(env, "INSTANCE_ID", NULL));
+    g_variant_unref(env);
+
+    return;
+}
+
+TEST_F(LibUAL, StopHelper)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/test/untrusted/helper", "com.ubuntu.Upstart0_6.Job", NULL);
+
+    /* Multi helper */
+    auto untrusted = ubuntu::app_launch::Helper::Type::from_raw("untrusted-type");
+
+    auto appid = ubuntu::app_launch::AppID::parse("com.bar_foo_8432.13.1");
+    auto helper = ubuntu::app_launch::Helper::create(untrusted, appid, registry);
+
+    ASSERT_TRUE(helper->hasInstances());
+
+    auto instances = helper->instances();
+
+    EXPECT_EQ(1, instances.size());
+
+    instances[0]->stop();
+
+    ASSERT_EQ(dbus_test_dbus_mock_object_check_method_call(mock, obj, "Stop", NULL, NULL), 1);
+
+    guint len = 0;
+    auto calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Stop", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    EXPECT_STREQ("Stop", calls->name);
+    EXPECT_EQ(2, g_variant_n_children(calls->params));
+
+    auto block = g_variant_get_child_value(calls->params, 1);
+    EXPECT_TRUE(g_variant_get_boolean(block));
+    g_variant_unref(block);
+
+    auto env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "com.bar_foo_8432.13.1"));
+    EXPECT_TRUE(check_env(env, "HELPER_TYPE", "untrusted-type"));
+    EXPECT_TRUE(check_env(env, "INSTANCE_ID", "24034582324132"));
+    g_variant_unref(env);
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    return;
+}
+
+TEST_F(LibUAL, HelperList)
+{
+    auto nothelper = ubuntu::app_launch::Helper::Type::from_raw("not-a-type");
+    auto notlist = ubuntu::app_launch::Registry::runningHelpers(nothelper, registry);
+
+    EXPECT_EQ(0, notlist.size());
+
+    auto goodhelper = ubuntu::app_launch::Helper::Type::from_raw("untrusted-type");
+    auto goodlist = ubuntu::app_launch::Registry::runningHelpers(goodhelper, registry);
+
+    EXPECT_EQ(2, goodlist.size());
+
+    goodlist.sort(
+        [](const std::shared_ptr<ubuntu::app_launch::Helper>& a, const std::shared_ptr<ubuntu::app_launch::Helper>& b)
+        {
+            std::string sa = a->appId();
+            std::string sb = b->appId();
+
+            return sa < sb;
+        });
+
+    EXPECT_EQ("com.bar_foo_8432.13.1", (std::string)goodlist.front()->appId());
+    EXPECT_EQ("com.foo_bar_43.23.12", (std::string)goodlist.back()->appId());
+
+    EXPECT_TRUE(goodlist.front()->hasInstances());
+    EXPECT_TRUE(goodlist.back()->hasInstances());
+
+    EXPECT_EQ(1, goodlist.front()->instances().size());
+    EXPECT_EQ(1, goodlist.back()->instances().size());
+
+    EXPECT_TRUE(goodlist.front()->instances()[0]->isRunning());
+    EXPECT_TRUE(goodlist.back()->instances()[0]->isRunning());
+}
+
+typedef struct
+{
+    unsigned int count;
+    const gchar* appid;
+    const gchar* type;
+    const gchar* instance;
+} helper_observer_data_t;
+
+static void helper_observer_cb(const gchar* appid, const gchar* instance, const gchar* type, gpointer user_data)
+{
+    helper_observer_data_t* data = (helper_observer_data_t*)user_data;
+
+    if (g_strcmp0(data->appid, appid) == 0 && g_strcmp0(data->type, type) == 0 &&
+        g_strcmp0(data->instance, instance) == 0)
+    {
+        data->count++;
+    }
+}
+
+TEST_F(LibUAL, StartStopHelperObserver)
+{
+    helper_observer_data_t start_data = {
+        .count = 0, .appid = "com.foo_foo_1.2.3", .type = "my-type-is-scorpio", .instance = nullptr};
+    helper_observer_data_t stop_data = {
+        .count = 0, .appid = "com.bar_bar_44.32", .type = "my-type-is-libra", .instance = "1234"};
+
+    ASSERT_TRUE(ubuntu_app_launch_observer_add_helper_started(helper_observer_cb, "my-type-is-scorpio", &start_data));
+    ASSERT_TRUE(ubuntu_app_launch_observer_add_helper_stop(helper_observer_cb, "my-type-is-libra", &stop_data));
+
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
+
+    /* Basic start */
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed("('started', ['JOB=untrusted-helper', 'INSTANCE=my-type-is-scorpio::com.foo_foo_1.2.3'])"),
+        NULL);
+
+    g_usleep(100000);
+    while (g_main_pending())
+    {
+        g_main_iteration(TRUE);
+    }
+
+    ASSERT_EQ(start_data.count, 1);
+
+    /* Basic stop */
+    dbus_test_dbus_mock_object_emit_signal(
+        mock, obj, "EventEmitted", G_VARIANT_TYPE("(sas)"),
+        g_variant_new_parsed(
+            "('stopped', ['JOB=untrusted-helper', 'INSTANCE=my-type-is-libra:1234:com.bar_bar_44.32'])"),
+        NULL);
+
+    g_usleep(100000);
+    while (g_main_pending())
+    {
+        g_main_iteration(TRUE);
+    }
+
+    ASSERT_EQ(stop_data.count, 1);
+
+    /* Remove */
+    ASSERT_TRUE(
+        ubuntu_app_launch_observer_delete_helper_started(helper_observer_cb, "my-type-is-scorpio", &start_data));
+    ASSERT_TRUE(ubuntu_app_launch_observer_delete_helper_stop(helper_observer_cb, "my-type-is-libra", &stop_data));
+}
+
+gboolean datain(GIOChannel* source, GIOCondition cond, gpointer data)
+{
+    gsize* datacnt = static_cast<gsize*>(data);
+    gchar* str = NULL;
+    gsize len = 0;
+    GError* error = NULL;
+
+    g_io_channel_read_line(source, &str, &len, NULL, &error);
+    g_free(str);
+
+    if (error != NULL)
+    {
+        g_warning("Unable to read from channel: %s", error->message);
+        g_error_free(error);
+    }
+
+    *datacnt += len;
+
+    return TRUE;
+}
+
+static void signal_increment(GDBusConnection* connection,
+                             const gchar* sender,
+                             const gchar* path,
+                             const gchar* interface,
+                             const gchar* signal,
+                             GVariant* params,
+                             gpointer user_data)
+{
+    guint* count = (guint*)user_data;
+    g_debug("Count incremented to: %d", *count + 1);
+    *count = *count + 1;
+}
+
+TEST_F(LibUAL, PauseResume)
+{
+    g_setenv("UBUNTU_APP_LAUNCH_OOM_PROC_PATH", CMAKE_BINARY_DIR "/libual-proc", 1);
+
+    /* Setup some spew */
+    GPid spewpid = 0;
+    gint spewstdout = 0;
+    const gchar* spewline[] = {SPEW_UTILITY, NULL};
+    ASSERT_TRUE(g_spawn_async_with_pipes(NULL, (gchar**)spewline, NULL, /* environment */
+                                         G_SPAWN_DEFAULT, NULL, NULL,   /* child setup */
+                                         &spewpid, NULL,                /* stdin */
+                                         &spewstdout, NULL,             /* stderr */
+                                         NULL));                        /* error */
+
+    gsize datacnt = 0;
+    GIOChannel* spewoutchan = g_io_channel_unix_new(spewstdout);
+    g_io_channel_set_flags(spewoutchan, G_IO_FLAG_NONBLOCK, NULL);
+    g_io_add_watch(spewoutchan, G_IO_IN, datain, &datacnt);
+
+    /* Setup our OOM adjust file */
+    gchar* procdir = g_strdup_printf(CMAKE_BINARY_DIR "/libual-proc/%d", spewpid);
+    ASSERT_EQ(0, g_mkdir_with_parents(procdir, 0700));
+    gchar* oomadjfile = g_strdup_printf("%s/oom_score_adj", procdir);
+    g_free(procdir);
+    ASSERT_TRUE(g_file_set_contents(oomadjfile, "0", -1, NULL));
+
+    /* Setup the cgroup */
+    g_setenv("UBUNTU_APP_LAUNCH_CG_MANAGER_NAME", "org.test.cgmock2", TRUE);
+    DbusTestDbusMock* cgmock2 = dbus_test_dbus_mock_new("org.test.cgmock2");
+    DbusTestDbusMockObject* cgobject = dbus_test_dbus_mock_get_object(cgmock2, "/org/linuxcontainers/cgmanager",
+                                                                      "org.linuxcontainers.cgmanager0_0", NULL);
+    gchar* pypids = g_strdup_printf("ret = [%d]", spewpid);
+    dbus_test_dbus_mock_object_add_method(cgmock, cgobject, "GetTasksRecursive", G_VARIANT_TYPE("(ss)"),
+                                          G_VARIANT_TYPE("ai"), pypids, NULL);
+    g_free(pypids);
+
+    dbus_test_service_add_task(service, DBUS_TEST_TASK(cgmock2));
+    dbus_test_task_run(DBUS_TEST_TASK(cgmock2));
+    g_object_unref(G_OBJECT(cgmock2));
+
+    /* Setup ZG Mock */
+    DbusTestDbusMock* zgmock = dbus_test_dbus_mock_new("org.gnome.zeitgeist.Engine");
+    DbusTestDbusMockObject* zgobj =
+        dbus_test_dbus_mock_get_object(zgmock, "/org/gnome/zeitgeist/log/activity", "org.gnome.zeitgeist.Log", NULL);
+
+    dbus_test_dbus_mock_object_add_method(zgmock, zgobj, "InsertEvents", G_VARIANT_TYPE("a(asaasay)"),
+                                          G_VARIANT_TYPE("au"), "ret = [ 0 ]", NULL);
+
+    dbus_test_service_add_task(service, DBUS_TEST_TASK(zgmock));
+    dbus_test_task_run(DBUS_TEST_TASK(zgmock));
+    g_object_unref(G_OBJECT(zgmock));
+
+    /* Give things a chance to start */
+    do
+    {
+        g_debug("Giving mocks a chance to start");
+        pause(200);
+    } while (dbus_test_task_get_state(DBUS_TEST_TASK(cgmock2)) != DBUS_TEST_TASK_STATE_RUNNING &&
+             dbus_test_task_get_state(DBUS_TEST_TASK(zgmock)) != DBUS_TEST_TASK_STATE_RUNNING);
+
+    /* Setup signal handling */
+    guint paused_count = 0;
+    guint resumed_count = 0;
+    guint paused_signal =
+        g_dbus_connection_signal_subscribe(bus, nullptr, "com.canonical.UbuntuAppLaunch", "ApplicationPaused", "/",
+                                           nullptr, G_DBUS_SIGNAL_FLAGS_NONE, signal_increment, &paused_count, nullptr);
+    guint resumed_signal = g_dbus_connection_signal_subscribe(
+        bus, nullptr, "com.canonical.UbuntuAppLaunch", "ApplicationResumed", "/", nullptr, G_DBUS_SIGNAL_FLAGS_NONE,
+        signal_increment, &resumed_count, nullptr);
+
+    /* Test it */
+    EXPECT_NE(0, datacnt);
+    paused_count = 0;
+
+    /* Pause the app */
+    EXPECT_TRUE(ubuntu_app_launch_pause_application("com.test.good_application_1.2.3"));
+
+    pause(0);    /* Flush queued events */
+    datacnt = 0; /* clear it */
+
+    pause(200);
+
+    /* Check data coming out */
+    EXPECT_EQ(1, paused_count);
+    EXPECT_EQ(0, datacnt);
+
+    /* Check to make sure we sent the event to ZG */
+    guint numcalls = 0;
+    const DbusTestDbusMockCall* calls =
+        dbus_test_dbus_mock_object_get_method_calls(zgmock, zgobj, "InsertEvents", &numcalls, NULL);
+
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, numcalls);
+
+    dbus_test_dbus_mock_object_clear_method_calls(zgmock, zgobj, NULL);
+
+    /* Check to ensure we set the OOM score */
+    gchar* pauseoomscore = NULL;
+    ASSERT_TRUE(g_file_get_contents(oomadjfile, &pauseoomscore, NULL, NULL));
+    EXPECT_STREQ("900", pauseoomscore);
+    g_free(pauseoomscore);
+    resumed_count = 0;
+
+    /* Now Resume the App */
+    EXPECT_TRUE(ubuntu_app_launch_resume_application("com.test.good_application_1.2.3"));
+
+    pause(200);
+
+    EXPECT_NE(0, datacnt);
+    EXPECT_EQ(1, resumed_count);
+
+    /* Check to make sure we sent the event to ZG */
+    numcalls = 0;
+    calls = dbus_test_dbus_mock_object_get_method_calls(zgmock, zgobj, "InsertEvents", &numcalls, NULL);
+
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, numcalls);
+
+    /* Check to ensure we set the OOM score */
+    gchar* resumeoomscore = NULL;
+    ASSERT_TRUE(g_file_get_contents(oomadjfile, &resumeoomscore, NULL, NULL));
+    EXPECT_STREQ("100", resumeoomscore);
+    g_free(resumeoomscore);
+
+    /* Clean up */
+    gchar* killstr = g_strdup_printf("kill -9 %d", spewpid);
+    ASSERT_TRUE(g_spawn_command_line_sync(killstr, NULL, NULL, NULL, NULL));
+    g_free(killstr);
+
+    g_io_channel_unref(spewoutchan);
+
+    g_spawn_command_line_sync("rm -rf " CMAKE_BINARY_DIR "/libual-proc", NULL, NULL, NULL, NULL);
+
+    g_dbus_connection_signal_unsubscribe(bus, paused_signal);
+    g_dbus_connection_signal_unsubscribe(bus, resumed_signal);
+
+    /* Kill ZG default instance :-( */
+    ZeitgeistLog* log = zeitgeist_log_get_default();
+    g_object_unref(log);
+    g_object_unref(log);
+
+    g_free(oomadjfile);
+}
+
+TEST_F(LibUAL, StartSessionHelper)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/test/untrusted/helper", "com.ubuntu.Upstart0_6.Job", NULL);
+    MirConnection* conn = mir_connect_sync("libual-test", "start-session-helper");  // Mocked, doesn't need cleaning up
+    MirPromptSession* msession = mir_connection_create_prompt_session_sync(conn, 5, nullptr, nullptr);
+
+    /* Building a temporary file and making an FD for it */
+    const char* filedata = "This is some data that we should get on the other side\n";
+    ASSERT_TRUE(g_file_set_contents(SESSION_TEMP_FILE, filedata, strlen(filedata), nullptr) == TRUE);
+    int mirfd = open(SESSION_TEMP_FILE, 0);
+    mir_mock_set_trusted_fd(mirfd);
+
+    /* Basic make sure we can send the event */
+    auto untrusted = ubuntu::app_launch::Helper::Type::from_raw("untrusted-type");
+    auto appid = ubuntu::app_launch::AppID::parse("com.test.multiple_first_1.2.3");
+    auto helper = ubuntu::app_launch::Helper::create(untrusted, appid, registry);
+
+    helper->launch(msession);
+
+    guint len = 0;
+    const DbusTestDbusMockCall* calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "Start", &len, NULL);
+    EXPECT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    EXPECT_STREQ("Start", calls->name);
+    EXPECT_EQ(2, g_variant_n_children(calls->params));
+
+    GVariant* block = g_variant_get_child_value(calls->params, 1);
+    EXPECT_TRUE(g_variant_get_boolean(block));
+    g_variant_unref(block);
+
+    /* Check the environment */
+    GVariant* env = g_variant_get_child_value(calls->params, 0);
+    EXPECT_TRUE(check_env(env, "APP_ID", "com.test.multiple_first_1.2.3"));
+    EXPECT_TRUE(check_env(env, "HELPER_TYPE", "untrusted-type"));
+
+    GVariant* mnamev = find_env(env, "UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
+    ASSERT_NE(nullptr, mnamev); /* Have to assert because, eh, GVariant */
+    EXPECT_STREQ(g_dbus_connection_get_unique_name(bus),
+                 g_variant_get_string(mnamev, nullptr) + strlen("UBUNTU_APP_LAUNCH_DEMANGLE_NAME="));
+    GVariant* mpathv = find_env(env, "UBUNTU_APP_LAUNCH_DEMANGLE_PATH");
+    ASSERT_NE(nullptr, mpathv); /* Have to assert because, eh, GVariant */
+
+    g_variant_unref(env);
+
+    /* Setup environment for call */
+    const gchar* mname = g_variant_get_string(mnamev, nullptr);
+    mname += strlen("UBUNTU_APP_LAUNCH_DEMANGLE_NAME=");
+    g_setenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME", mname, TRUE);
+    g_variant_unref(mnamev);
+
+    const gchar* mpath = g_variant_get_string(mpathv, nullptr);
+    mpath += strlen("UBUNTU_APP_LAUNCH_DEMANGLE_PATH=");
+    g_setenv("UBUNTU_APP_LAUNCH_DEMANGLE_PATH", mpath, TRUE);
+    g_variant_unref(mpathv);
+
+    /* Exec our tool */
+    std::promise<std::string> outputpromise;
+    std::thread t(
+        [&outputpromise]()
+        {
+            gchar* socketstdout = nullptr;
+            GError* error = nullptr;
+            g_unsetenv("G_MESSAGES_DEBUG");
+
+            g_spawn_command_line_sync(SOCKET_DEMANGLER " " SOCKET_TOOL, &socketstdout, nullptr, nullptr, &error);
+
+            if (error != nullptr)
+            {
+                fprintf(stderr, "Unable to spawn '" SOCKET_DEMANGLER " " SOCKET_TOOL "': %s\n", error->message);
+                g_error_free(error);
+                outputpromise.set_value(std::string(""));
+            }
+            else
+            {
+                outputpromise.set_value(std::string(socketstdout));
+                g_free(socketstdout);
+            }
+        });
+    t.detach();
+
+    auto outputfuture = outputpromise.get_future();
+    while (outputfuture.wait_for(std::chrono::milliseconds{1}) != std::future_status::ready)
+    {
+        pause();
+    }
+
+    ASSERT_STREQ(filedata, outputfuture.get().c_str());
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    return;
+}
+
+TEST_F(LibUAL, SetExec)
+{
+    DbusTestDbusMockObject* obj =
+        dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", NULL);
+
+    const char* exec = "lets exec this";
+
+    g_setenv("UPSTART_JOB", "fubar", TRUE);
+    g_unsetenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME");
+    EXPECT_TRUE(ubuntu_app_launch_helper_set_exec(exec, NULL));
+
+    guint len = 0;
+    const DbusTestDbusMockCall* calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
+    ASSERT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    gchar* appexecstr = g_strdup_printf("APP_EXEC=%s", exec);
+    GVariant* appexecenv = g_variant_get_child_value(calls[0].params, 1);
+    EXPECT_STREQ(appexecstr, g_variant_get_string(appexecenv, nullptr));
+    g_variant_unref(appexecenv);
+    g_free(appexecstr);
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    /* Now check for the demangler */
+    g_setenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME", g_dbus_connection_get_unique_name(bus), TRUE);
+    EXPECT_TRUE(ubuntu_app_launch_helper_set_exec(exec, NULL));
+
+    calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
+    ASSERT_NE(nullptr, calls);
+    EXPECT_EQ(1, len);
+
+    gchar* demangleexecstr = g_strdup_printf("APP_EXEC=%s %s", SOCKET_DEMANGLER_INSTALL, exec);
+    appexecenv = g_variant_get_child_value(calls[0].params, 1);
+    EXPECT_STREQ(demangleexecstr, g_variant_get_string(appexecenv, nullptr));
+    g_variant_unref(appexecenv);
+    g_free(demangleexecstr);
+
+    ASSERT_TRUE(dbus_test_dbus_mock_object_clear_method_calls(mock, obj, NULL));
+
+    /* Now check for the directory */
+    g_setenv("UBUNTU_APP_LAUNCH_DEMANGLE_NAME", g_dbus_connection_get_unique_name(bus), TRUE);
+    EXPECT_TRUE(ubuntu_app_launch_helper_set_exec(exec, "/not/a/real/directory"));