Ubuntu Application Launcher

Merge lp:~ken-vandine/ubuntu-app-launch/untrusted-helper-uris into lp:~ted/ubuntu-app-launch/untrusted-helper

  1. untrusted-helper-uris
  2. Merge into untrusted-helper
Proposed by Ken VanDine
Status: Merged
Merged at revision: 110
Proposed branch: lp:~ken-vandine/ubuntu-app-launch/untrusted-helper-uris
Merge into: lp:~ted/ubuntu-app-launch/untrusted-helper
Diff against target: 90 lines (+15/-7)
3 files modified
libupstart-app-launch/upstart-app-launch.c (+10/-5)
libupstart-app-launch/upstart-app-launch.h (+4/-2)
upstart-jobs/untrusted-helper.conf.in (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/ubuntu-app-launch/untrusted-helper-uris
Reviewer Review Type Date Requested Status
Ted Gould Pending
Review via email: mp+203174@code.launchpad.net

Commit message

Added APP_URIS to start_helper and start_multiple_helper

Description of the change

Added APP_URIS to start_helper and start_multiple_helper

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libupstart-app-launch/upstart-app-launch.c'
--- libupstart-app-launch/upstart-app-launch.c 2014-01-24 16:26:40 +0000
+++ libupstart-app-launch/upstart-app-launch.c 2014-01-24 20:42:33 +0000
@@ -1075,7 +1075,7 @@
1075 to define the instance. In the end there's only one job with1075 to define the instance. In the end there's only one job with
1076 an array of instances. */1076 an array of instances. */
1077static gboolean1077static gboolean
1078start_helper_core (const gchar * type, const gchar * appid, const gchar * instance)1078start_helper_core (const gchar * type, const gchar * appid, const gchar * const * uris, const gchar * instance)
1079{1079{
1080 GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);1080 GDBusConnection * con = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
1081 g_return_val_if_fail(con != NULL, FALSE);1081 g_return_val_if_fail(con != NULL, FALSE);
@@ -1089,6 +1089,11 @@
1089 g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("APP_ID=%s", appid)));1089 g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("APP_ID=%s", appid)));
1090 g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("HELPER_TYPE=%s", type)));1090 g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("HELPER_TYPE=%s", type)));
10911091
1092 if (uris != NULL) {
1093 gchar * urisjoin = app_uris_string(uris);
1094 g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("APP_URIS=%s", urisjoin)));
1095 }
1096
1092 if (instance != NULL) {1097 if (instance != NULL) {
1093 g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("INSTANCE_ID=%s", instance)));1098 g_variant_builder_add_value(&builder, g_variant_new_take_string(g_strdup_printf("INSTANCE_ID=%s", instance)));
1094 }1099 }
@@ -1116,17 +1121,17 @@
1116}1121}
11171122
1118gboolean1123gboolean
1119upstart_app_launch_start_helper (const gchar * type, const gchar * appid)1124upstart_app_launch_start_helper (const gchar * type, const gchar * appid, const gchar * const * uris)
1120{1125{
1121 g_return_val_if_fail(type != NULL, FALSE);1126 g_return_val_if_fail(type != NULL, FALSE);
1122 g_return_val_if_fail(appid != NULL, FALSE);1127 g_return_val_if_fail(appid != NULL, FALSE);
1123 g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, FALSE);1128 g_return_val_if_fail(g_strstr_len(type, -1, ":") == NULL, FALSE);
11241129
1125 return start_helper_core(type, appid, NULL);1130 return start_helper_core(type, appid, uris, NULL);
1126}1131}
11271132
1128gchar *1133gchar *
1129upstart_app_launch_start_multiple_helper (const gchar * type, const gchar * appid)1134upstart_app_launch_start_multiple_helper (const gchar * type, const gchar * appid, const gchar * const * uris)
1130{1135{
1131 g_return_val_if_fail(type != NULL, NULL);1136 g_return_val_if_fail(type != NULL, NULL);
1132 g_return_val_if_fail(appid != NULL, NULL);1137 g_return_val_if_fail(appid != NULL, NULL);
@@ -1134,7 +1139,7 @@
11341139
1135 gchar * instanceid = g_strdup_printf("%" G_GUINT64_FORMAT, g_get_real_time());1140 gchar * instanceid = g_strdup_printf("%" G_GUINT64_FORMAT, g_get_real_time());
11361141
1137 if (start_helper_core(type, appid, instanceid)) {1142 if (start_helper_core(type, appid, uris, instanceid)) {
1138 return instanceid;1143 return instanceid;
1139 }1144 }
11401145
11411146
=== modified file 'libupstart-app-launch/upstart-app-launch.h'
--- libupstart-app-launch/upstart-app-launch.h 2014-01-24 16:26:40 +0000
+++ libupstart-app-launch/upstart-app-launch.h 2014-01-24 20:42:33 +0000
@@ -299,7 +299,8 @@
299 * Return value: Whether the helper was able to be started299 * Return value: Whether the helper was able to be started
300 */300 */
301gboolean upstart_app_launch_start_helper (const gchar * type,301gboolean upstart_app_launch_start_helper (const gchar * type,
302 const gchar * appid);302 const gchar * appid,
303 const gchar * const * uris);
303304
304/**305/**
305 * upstart_app_launch_start_multiple_helper:306 * upstart_app_launch_start_multiple_helper:
@@ -317,7 +318,8 @@
317 * Return value: The generated instance ID or NULL on failure318 * Return value: The generated instance ID or NULL on failure
318 */319 */
319gchar * upstart_app_launch_start_multiple_helper (const gchar * type,320gchar * upstart_app_launch_start_multiple_helper (const gchar * type,
320 const gchar * appid);321 const gchar * appid,
322 const gchar * const * uris);
321323
322/**324/**
323 * upstart_app_launch_stop_helper:325 * upstart_app_launch_stop_helper:
324326
=== modified file 'upstart-jobs/untrusted-helper.conf.in'
--- upstart-jobs/untrusted-helper.conf.in 2014-01-23 22:57:43 +0000
+++ upstart-jobs/untrusted-helper.conf.in 2014-01-24 20:42:33 +0000
@@ -9,6 +9,7 @@
9env APP_EXEC="echo Error"9env APP_EXEC="echo Error"
10env HELPER_TYPE10env HELPER_TYPE
11env INSTANCE_ID=""11env INSTANCE_ID=""
12env APP_URIS
1213
13env UPSTART_APP_LAUNCH_ARCH="@upstart_app_launch_arch@"14env UPSTART_APP_LAUNCH_ARCH="@upstart_app_launch_arch@"
14export UPSTART_APP_LAUNCH_ARCH15export UPSTART_APP_LAUNCH_ARCH

Subscribers

People subscribed via source and target branches

to all changes: