1
=== modified file 'debian/control'
2
--- debian/control	2017-02-15 15:10:07 +0000
3
+++ debian/control	2017-03-07 19:04:20 +0000
4
@@ -78,6 +78,7 @@
5
78
Architecture: any
78
Architecture: any
6
79
Depends: ${misc:Depends},
79
Depends: ${misc:Depends},
7
80
         ${shlibs:Depends},
80
         ${shlibs:Depends},
8
81
         libertine-tools,
9
81
Pre-Depends: ${misc:Pre-Depends},
82
Pre-Depends: ${misc:Pre-Depends},
10
82
Multi-Arch: same
83
Multi-Arch: same
11
83
Description: library for sending requests to the ubuntu app launch
84
Description: library for sending requests to the ubuntu app launch
12
84
85
13
=== modified file 'libubuntu-app-launch/application-impl-legacy.cpp'
14
--- libubuntu-app-launch/application-impl-legacy.cpp	2017-02-15 15:09:51 +0000
15
+++ libubuntu-app-launch/application-impl-legacy.cpp	2017-03-07 19:04:20 +0000
16
@@ -62,8 +62,14 @@
17
62
        rootDir = rootenv;
62
        rootDir = rootenv;
18
63
    }
63
    }
19
64
64
22
65
    appinfo_ = std::make_shared<app_info::Desktop>(appId(), _keyfile, _basedir, rootDir,
65
    auto flags = app_info::DesktopFlags::ALLOW_NO_DISPLAY;
23
66
                                                   app_info::DesktopFlags::ALLOW_NO_DISPLAY, _registry);
66
24
67
    if (!g_key_file_has_key(_keyfile.get(), "Desktop Entry", "X-Ubuntu-Touch", nullptr))
25
68
    {
26
69
        flags |= app_info::DesktopFlags::XMIR_DEFAULT;
27
70
    }
28
71
29
72
    appinfo_ = std::make_shared<app_info::Desktop>(appId(), _keyfile, _basedir, rootDir, flags, _registry);
30
67
73
31
68
    if (!_keyfile)
74
    if (!_keyfile)
32
69
    {
75
    {
33
70
76
34
=== modified file 'tests/exec-util-test.cc'
35
--- tests/exec-util-test.cc	2017-02-15 15:10:07 +0000
36
+++ tests/exec-util-test.cc	2017-03-07 19:04:20 +0000
37
@@ -211,7 +211,7 @@
38
211
{
211
{
39
212
	StartCheckEnv("foo", {
212
	StartCheckEnv("foo", {
40
213
		{"APP_EXEC", [](const gchar * value) {
213
		{"APP_EXEC", [](const gchar * value) {
42
214
			EXPECT_STREQ("foo", value); }},
214
			EXPECT_STREQ("libertine-launch foo", value); }},
43
215
		{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
215
		{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
44
216
			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value); }},
216
			EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value); }},
45
217
		{"APP_EXEC_POLICY", [](const gchar * value) {
217
		{"APP_EXEC_POLICY", [](const gchar * value) {
46
@@ -222,7 +222,7 @@
47
222
		{"APP_LAUNCHER_PID", [](const gchar * value) {
222
		{"APP_LAUNCHER_PID", [](const gchar * value) {
48
223
			EXPECT_EQ(getpid(), atoi(value)); }},
223
			EXPECT_EQ(getpid(), atoi(value)); }},
49
224
		{"APP_XMIR_ENABLE", [](const gchar * value) {
224
		{"APP_XMIR_ENABLE", [](const gchar * value) {
51
225
			EXPECT_STREQ("0", value); }},
225
			EXPECT_STREQ("1", value); }},
52
226
	});
226
	});
53
227
}
227
}
54
228
228
Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada			Needs Fixing on 2017-03-08
dobey (community)		2017-03-02	Approve on 2017-03-07
unity-api-1-bot	continuous-integration		Approve on 2017-03-07
kevin gunn		2017-03-02	Pending
Review via email: mp+318834@code.launchpad.net
1	=== modified file 'debian/control'
2	--- debian/control 2017-02-15 15:10:07 +0000
3	+++ debian/control 2017-03-07 19:04:20 +0000
4	@@ -78,6 +78,7 @@
5	78	Architecture: any	78	Architecture: any
6	79	Depends: ${misc:Depends},	79	Depends: ${misc:Depends},
7	80	${shlibs:Depends},	80	${shlibs:Depends},
8			81	libertine-tools,
9	81	Pre-Depends: ${misc:Pre-Depends},	82	Pre-Depends: ${misc:Pre-Depends},
10	82	Multi-Arch: same	83	Multi-Arch: same
11	83	Description: library for sending requests to the ubuntu app launch	84	Description: library for sending requests to the ubuntu app launch
12	84		85
13	=== modified file 'libubuntu-app-launch/application-impl-legacy.cpp'
14	--- libubuntu-app-launch/application-impl-legacy.cpp 2017-02-15 15:09:51 +0000
15	+++ libubuntu-app-launch/application-impl-legacy.cpp 2017-03-07 19:04:20 +0000
16	@@ -62,8 +62,14 @@
17	62	rootDir = rootenv;	62	rootDir = rootenv;
18	63	}	63	}
19	64		64
22	65	appinfo_ = std::make_shared<app_info::Desktop>(appId(), _keyfile, _basedir, rootDir,	65	auto flags = app_info::DesktopFlags::ALLOW_NO_DISPLAY;
23	66	app_info::DesktopFlags::ALLOW_NO_DISPLAY, _registry);	66
24			67	if (!g_key_file_has_key(_keyfile.get(), "Desktop Entry", "X-Ubuntu-Touch", nullptr))
25			68	{
26			69	flags \|= app_info::DesktopFlags::XMIR_DEFAULT;
27			70	}
28			71
29			72	appinfo_ = std::make_shared<app_info::Desktop>(appId(), _keyfile, _basedir, rootDir, flags, _registry);
30	67		73
31	68	if (!_keyfile)	74	if (!_keyfile)
32	69	{	75	{
33	70		76
34	=== modified file 'tests/exec-util-test.cc'
35	--- tests/exec-util-test.cc 2017-02-15 15:10:07 +0000
36	+++ tests/exec-util-test.cc 2017-03-07 19:04:20 +0000
37	@@ -211,7 +211,7 @@
38	211	{	211	{
39	212	StartCheckEnv("foo", {	212	StartCheckEnv("foo", {
40	213	{"APP_EXEC", [](const gchar * value) {	213	{"APP_EXEC", [](const gchar * value) {
42	214	EXPECT_STREQ("foo", value); }},	214	EXPECT_STREQ("libertine-launch foo", value); }},
43	215	{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {	215	{"APP_DESKTOP_FILE_PATH", [](const gchar * value) {
44	216	EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value); }},	216	EXPECT_STREQ(CMAKE_SOURCE_DIR "/applications/foo.desktop", value); }},
45	217	{"APP_EXEC_POLICY", [](const gchar * value) {	217	{"APP_EXEC_POLICY", [](const gchar * value) {
46	@@ -222,7 +222,7 @@
47	222	{"APP_LAUNCHER_PID", [](const gchar * value) {	222	{"APP_LAUNCHER_PID", [](const gchar * value) {
48	223	EXPECT_EQ(getpid(), atoi(value)); }},	223	EXPECT_EQ(getpid(), atoi(value)); }},
49	224	{"APP_XMIR_ENABLE", [](const gchar * value) {	224	{"APP_XMIR_ENABLE", [](const gchar * value) {
51	225	EXPECT_STREQ("0", value); }},	225	EXPECT_STREQ("1", value); }},
52	226	});	226	});
53	227	}	227	}
54	228		228