Merge lp:~laney/unity-lens-applications/dont-set-desktop-env into lp:unity-lens-applications

Proposed by Iain Lane on 2016-09-27
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2016-09-27
Approved revision: 387
Merged at revision: 385
Proposed branch: lp:~laney/unity-lens-applications/dont-set-desktop-env
Merge into: lp:unity-lens-applications
Diff against target: 45 lines (+16/-3)
3 files modified
debian/changelog (+11/-0)
debian/rules (+5/-0)
src/main.vala (+0/-3)
To merge this branch: bzr merge lp:~laney/unity-lens-applications/dont-set-desktop-env
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2016-09-27 Approve on 2016-09-27
Review via email: mp+306914@code.launchpad.net

Commit message

Make XDG_CURRENT_DESKTOP be used. Fix running the tests under sbuild.

Description of the change

To allow NotShowIn=Unity7 to work, we need to not call set_desktop_env().

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-06-02 01:01:00 +0000
3+++ debian/changelog 2016-09-27 16:18:37 +0000
4@@ -1,3 +1,14 @@
5+unity-lens-applications (7.1.0+16.10.20160602-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * debian/rules: Set HOME to the real home directory for the test. This might
8+ not be set right when building the package, but one of the tests looks up
9+ ~user and checks that it corresponds to $HOME, so we need to make sure it
10+ is.
11+ * src/main.vala: Don't call set_desktop_env(). It's not needed with modern
12+ GLib, and prevents XDG_CURRENT_DESKTOP from being used.
13+
14+ -- Iain Lane <iain.lane@canonical.com> Tue, 27 Sep 2016 17:16:52 +0100
15+
16 unity-lens-applications (7.1.0+16.10.20160602-0ubuntu1) yakkety; urgency=medium
17
18 [ Andrea Azzarone ]
19
20=== modified file 'debian/rules'
21--- debian/rules 2013-07-26 10:16:26 +0000
22+++ debian/rules 2016-09-27 16:18:37 +0000
23@@ -11,3 +11,8 @@
24 override_dh_install:
25 dh_install --fail-missing
26 rm -f debian/unity-lens-applications/usr/lib/*/unity/*.la
27+
28+override_dh_auto_test:
29+ # get the real home directory - some tests rely on HOME and ~${USER}
30+ # corresponding
31+ HOME="$(shell eval echo ~${USER})" dh_auto_test
32
33=== modified file 'src/main.vala'
34--- src/main.vala 2013-08-27 20:44:21 +0000
35+++ src/main.vala 2016-09-27 16:18:37 +0000
36@@ -34,9 +34,6 @@
37 GLib.Intl.bind_textdomain_codeset (Config.PACKAGE, "UTF-8");
38 GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
39
40- /* Make sure the desktop appinfos are picked up correctly */
41- DesktopAppInfo.set_desktop_env ("Unity");
42-
43 var scopes = new List<Unity.AbstractScope> ();
44 var apps_scope = new Unity.ApplicationsLens.ApplicationsScope ();
45 var scopes_scope = new Unity.ApplicationsLens.ScopesScope (apps_scope);

Subscribers

People subscribed via source and target branches