Merge lp:~paulliu/unity-lens-applications/phablet into lp:unity-lens-applications/phablet

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Michał Sawicz
Approved revision: 332
Merged at revision: 331
Proposed branch: lp:~paulliu/unity-lens-applications/phablet
Merge into: lp:unity-lens-applications/phablet
Diff against target: 39 lines (+21/-0)
2 files modified
debian/changelog (+6/-0)
src/daemon.vala (+15/-0)
To merge this branch: bzr merge lp:~paulliu/unity-lens-applications/phablet
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+155464@code.launchpad.net

Commit message

* Filtering X-Ubuntu-Touch.

Description of the change

Please refer to
https://blueprints.launchpad.net/ubuntu/+spec/client-1303-unity-ui-dash

1. Filtering X-Ubuntu-Touch.
2. Provide X-Ubuntu-Stage info.
3. Add more categories.

To post a comment you must log in.
Ying-Chun Liu (paulliu) wrote :

Seems to me that the above building failure is quantal build environment problem?

Michał Sawicz (saviq) wrote :

Yes, missing libcolumbus - built now in ppa:phablet-team and I've restarted the job.

Michał Sawicz (saviq) wrote :

Order of the categories is wrong, we need it to be:

Running
Featured
Frequent
Installed
Available for Download

review: Needs Fixing
Michał Sawicz (saviq) wrote :

Hey Paul, we have reevaluated the approach and I'll have to ask you to tweak the approach:
* revert all the changes to categories
* drop the X-Ubuntu-Stage changes

Only leave the X-Ubuntu-Touch filter, please.

review: Needs Fixing
331. By Ying-Chun Liu on 2013-03-28

Filtering X-Ubuntu-Touch. Default: false.

Ying-Chun Liu (paulliu) wrote :

Sorry, forget to write a comment but please re-review the commit 331 I've pushed last week.

Michał Sawicz (saviq) wrote :

Please release with a version number bumped to 7.80, to prevent uptades from distro from overwriting.

review: Needs Fixing
332. By Ying-Chun Liu on 2013-04-03

Release with version 7.80: to avoid updates from distro.

Michał Sawicz (saviq) :
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 2013-03-06 13:25:55 +0000
3+++ debian/changelog 2013-04-03 16:15:32 +0000
4@@ -1,3 +1,9 @@
5+unity-lens-applications (7.80-0ubuntu1) raring; urgency=low
6+
7+ * Release with version 7.80: to avoid updates from distro.
8+
9+ -- Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com> Wed, 03 Apr 2013 23:52:59 +0800
10+
11 unity-lens-applications (6.10.0daily13.03.06-0ubuntu1) raring; urgency=low
12
13 [ Jussi Pakkanen ]
14
15=== modified file 'src/daemon.vala'
16--- src/daemon.vala 2013-02-28 09:18:42 +0000
17+++ src/daemon.vala 2013-04-03 16:15:32 +0000
18@@ -905,6 +905,21 @@
19 AppInfo? app = appmanager.lookup (desktop_id);
20 full_path = appmanager.get_path (desktop_id);
21
22+ bool x_ubuntu_touch=false;
23+ if (full_path != null) {
24+ GLib.KeyFile key_file = new GLib.KeyFile();
25+ key_file.load_from_file(full_path, GLib.KeyFileFlags.NONE);
26+ try {
27+ x_ubuntu_touch = key_file.get_boolean("Desktop Entry", "X-Ubuntu-Touch");
28+ } catch (GLib.KeyFileError e) {
29+ x_ubuntu_touch = false;
30+ }
31+ }
32+
33+ if (!x_ubuntu_touch) {
34+ continue;
35+ }
36+
37 /* De-dupe by 'application://foo.desktop' URI. Also note that we need
38 * to de-dupe before we chuck out NoDisplay app infos, otherwise they'd
39 * show up from alternate sources */

Subscribers

People subscribed via source and target branches

to all changes: