Merge lp:~ted/ubuntu-app-launch/second-exec-quotes into lp:ubuntu-app-launch/14.04

[Ted Gould]

Use the parsing of the line to split appart the URLs.

Use the parsing of the line to split appart the URLs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/upstart-app-launch-ci/166/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-armhf-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/upstart-app-launch-trusty-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/upstart-app-launch-ci/166/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Confirmed that this MR WfM -- running "upstart-app-launch webbrowser-app http://www.ubuntu.com" twice from the command line as per the problem statement now works.

review: Approve

=== modified file 'second-exec-core.c'
--- second-exec-core.c	2013-09-27 17:48:33 +0000
+++ second-exec-core.c	2013-12-05 12:52:48 +0000
@@ -95,16 +95,23 @@
 		return;
 	}
 
-	/* TODO: Joining only with space could cause issues with breaking them
-	   back out.  We don't have any cases of more than one today.  But, this
-	   isn't good.
-	   https://bugs.launchpad.net/upstart-app-launch/+bug/1229354
-	   */
 	GVariant * uris = NULL;
-	gchar ** uri_split = g_strsplit(input_uris, " ", 0);
-	if (uri_split[0] == NULL) {
-		g_free(uri_split);
+	gchar ** uri_split = NULL;
+	GError * error = NULL;
+
+	g_shell_parse_argv(input_uris, NULL, &uri_split, &error);
+
+	if (uri_split == NULL || uri_split[0] == NULL || error != NULL) {
+		if (error != NULL) {
+			g_warning("Unable to parse URLs '%s': %s", input_uris, error->message);
+			g_error_free(error);
+		}
+
 		uris = g_variant_new_array(G_VARIANT_TYPE_STRING, NULL, 0);
+
+		if (uri_split != NULL) {
+			g_strfreev(uri_split);
+		}
 	} else {
 		GVariantBuilder builder;
 		g_variant_builder_init(&builder, G_VARIANT_TYPE_ARRAY);