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

[Iain Lane]

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

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

[Marco Trevisan (Treviño) (3v1n0)]

Thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-02 01:01:00 +0000
+++ debian/changelog	2016-09-27 16:18:37 +0000
@@ -1,3 +1,14 @@
+unity-lens-applications (7.1.0+16.10.20160602-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/rules: Set HOME to the real home directory for the test. This might
+    not be set right when building the package, but one of the tests looks up
+    ~user and checks that it corresponds to $HOME, so we need to make sure it
+    is.
+  * src/main.vala: Don't call set_desktop_env(). It's not needed with modern
+    GLib, and prevents XDG_CURRENT_DESKTOP from being used.
+
+ -- Iain Lane <[e-mail]>  Tue, 27 Sep 2016 17:16:52 +0100
+
 unity-lens-applications (7.1.0+16.10.20160602-0ubuntu1) yakkety; urgency=medium
 
   [ Andrea Azzarone ]

=== modified file 'debian/rules'
--- debian/rules	2013-07-26 10:16:26 +0000
+++ debian/rules	2016-09-27 16:18:37 +0000
@@ -11,3 +11,8 @@
 override_dh_install:
 	dh_install --fail-missing
 	rm -f debian/unity-lens-applications/usr/lib/*/unity/*.la
+
+override_dh_auto_test:
+	# get the real home directory - some tests rely on HOME and ~${USER}
+	# corresponding
+	HOME="$(shell eval echo ~${USER})" dh_auto_test

=== modified file 'src/main.vala'
--- src/main.vala	2013-08-27 20:44:21 +0000
+++ src/main.vala	2016-09-27 16:18:37 +0000
@@ -34,9 +34,6 @@
   GLib.Intl.bind_textdomain_codeset (Config.PACKAGE, "UTF-8");
   GLib.Intl.setlocale(GLib.LocaleCategory.ALL, "");
 
-  /* Make sure the desktop appinfos are picked up correctly */
-  DesktopAppInfo.set_desktop_env ("Unity");
-
   var scopes = new List<Unity.AbstractScope> ();
   var apps_scope = new Unity.ApplicationsLens.ApplicationsScope ();
   var scopes_scope = new Unity.ApplicationsLens.ScopesScope (apps_scope);