Merge lp:~ted/ubuntu-app-launch/liblibertine-dep into lp:ubuntu-app-launch/15.10

[Ted Gould]

Remove libertine custom code with calls to liblibertine

NOTE: Requires liblibertine to get into the archive.

[lp:~ted/ubuntu-app-launch/liblibertine-dep]

213. By Ted Gould on 2015-08-26

Dep on liblibertine

Unmerged revisions

213. By Ted Gould on 2015-08-26

Dep on liblibertine

212. By Ted Gould on 2015-08-26

Use liblibertine in ual.c

211. By Ted Gould on 2015-08-26

Use a boolean to track and keep the iter in the 'if'

210. By Ted Gould on 2015-08-26

Migrate the app-info code to liblibertine

209. By Ted Gould on 2015-08-26

Connecting in liblibertine

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-11 02:45:49 +0000
+++ CMakeLists.txt	2015-08-26 13:15:07 +0000
@@ -77,6 +77,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")

=== modified file 'debian/control'
--- debian/control	2015-07-31 00:15:57 +0000
+++ debian/control	2015-08-26 13:15:07 +0000
@@ -15,6 +15,7 @@
                libglib2.0-dev,
                libgtest-dev,
                libjson-glib-dev,
+               liblibertine-dev,
                liblttng-ust-dev,
                libmirclient-dev (>= 0.5),
                libnih-dbus-dev,

=== modified file 'libubuntu-app-launch/CMakeLists.txt'
--- libubuntu-app-launch/CMakeLists.txt	2015-08-11 19:11:15 +0000
+++ libubuntu-app-launch/CMakeLists.txt	2015-08-26 13:15:07 +0000
@@ -59,6 +59,7 @@
 	${CLICK_LIBRARIES}
 	${ZEITGEIST_LIBRARIES}
 	${MIR_LIBRARIES}
+	${LIBERTINE_LIBRARIES}
 	helpers
 	-Wl,--no-undefined
 )

=== modified file 'libubuntu-app-launch/app-info.c'
--- libubuntu-app-launch/app-info.c	2015-08-12 02:52:05 +0000
+++ libubuntu-app-launch/app-info.c	2015-08-26 13:15:07 +0000
@@ -19,6 +19,7 @@
 
 #include <json-glib/json-glib.h>
 #include <click.h>
+#include <libertine.h>
 
 #include "ubuntu-app-launch.h"
 #include "app-info.h"
@@ -258,19 +259,54 @@
 		return FALSE;
 	}
 
+	gchar ** containerlist = libertine_list_containers();
+
+	if (true) {
+		gchar * containerstr = g_strjoinv(", ", containerlist);
+		g_debug("Libertine Containers: %s", containerstr);
+		g_free(containerstr);
+	}
+
+	gboolean validcontainer = FALSE;
+	if (containerlist != NULL && containerlist[0] != NULL) {
+		gchar ** containeriter = NULL;
+		for (containeriter = containerlist; *containeriter != NULL; containeriter++) {
+			if (g_strcmp0(*containeriter, container) == 0) {
+				validcontainer = TRUE;
+				break;
+			}
+		}
+	}
+
+	g_strfreev(containerlist);
+
+	if (!validcontainer) {
+		g_warning("Container '%s' is not in the libertine container list", container);
+		return FALSE;
+	}
+
 	gchar * desktopname = g_strdup_printf("%s.desktop", app);
 
-	gchar * desktopdir = g_build_filename(g_get_user_cache_dir(), "libertine-container", container, "rootfs", "usr", "share", NULL);
+	gchar * libertinedir = libertine_container_path(container);
+	gchar * desktopdir = g_build_filename(libertinedir, "usr", "share", NULL);
+	g_free(libertinedir);
+
 	gchar * desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
 
 	if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
+		g_debug("Unable to find desktop file '%s' in container '%s' (checking userdir)", desktopfile, container);
+
 		g_free(desktopdir);
 		g_free(desktopfile);
 
-		desktopdir = g_build_filename(g_get_user_data_dir(), "libertine-container", "user-data", container, ".local", "share", NULL);
+		libertinedir = libertine_container_home_path(container);
+		desktopdir = g_build_filename(libertinedir, ".local", "share", NULL);
+		g_free(libertinedir);
 		desktopfile = g_build_filename(desktopdir, "applications", desktopname, NULL);
 
 		if (!g_file_test(desktopfile, G_FILE_TEST_EXISTS)) {
+			g_debug("Unable to find desktop file '%s' in container '%s' (now failing)", desktopfile, container);
+
 			g_free(desktopdir);
 			g_free(desktopfile);
 

=== 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	2015-08-26 13:15:07 +0000
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <zeitgeist.h>
+#include <libertine.h>
 
 #include "ubuntu-app-launch-trace.h"
 #include "second-exec-core.h"
@@ -1630,8 +1631,8 @@
 	g_return_val_if_fail(pkg != NULL, NULL);
 
 	/* Check if is a libertine container */
-	gchar * libertinepath = g_build_filename(g_get_user_cache_dir(), "libertine-container", pkg, NULL);
-	gboolean libcontainer = g_file_test(libertinepath, G_FILE_TEST_EXISTS);
+	gchar * libertinepath = libertine_container_path(pkg);
+	gboolean libcontainer = libertinepath != NULL;
 	g_free(libertinepath);
 
 	if (libcontainer) {

=== added directory 'tests/libertine-home/libertine'
=== added file 'tests/libertine-home/libertine/ContainersConfig.json'
--- tests/libertine-home/libertine/ContainersConfig.json	1970-01-01 00:00:00 +0000
+++ tests/libertine-home/libertine/ContainersConfig.json	2015-08-26 13:15:07 +0000
@@ -0,0 +1,23 @@
+{
+    "containerList": [
+        {
+            "id": "another-container",
+            "image": "wily",
+            "installStatus": "new",
+            "installedApps": [
+            ],
+            "name": "Ubuntu 'Wily Werewolf'",
+            "type": "lxc"
+        },
+        {
+            "id": "container-name",
+            "image": "wily",
+            "installStatus": "new",
+            "installedApps": [
+            ],
+            "name": "Ubuntu 'Wily Werewolf'",
+            "type": "lxc"
+        }
+    ],
+    "defaultContainer": "container-name"
+}