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
1
unity-lens-applications (7.80-0ubuntu1) raring; urgency=low
6
2
7
3
  * Release with version 7.80: to avoid updates from distro.
8
4
9
5
 -- Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com>  Wed, 03 Apr 2013 23:52:59 +0800
10
6
11
1
unity-lens-applications (6.10.0daily13.03.06-0ubuntu1) raring; urgency=low
7
unity-lens-applications (6.10.0daily13.03.06-0ubuntu1) raring; urgency=low
12
2
8
13
3
  [ Jussi Pakkanen ]
9
  [ Jussi Pakkanen ]
14
4
10
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
905
        AppInfo? app = appmanager.lookup (desktop_id);
905
        AppInfo? app = appmanager.lookup (desktop_id);
20
906
        full_path = appmanager.get_path (desktop_id);
906
        full_path = appmanager.get_path (desktop_id);
21
907
907
22
908
        bool x_ubuntu_touch=false;
23
909
        if (full_path != null) {
24
910
            GLib.KeyFile key_file = new GLib.KeyFile();
25
911
            key_file.load_from_file(full_path, GLib.KeyFileFlags.NONE);
26
912
            try {
27
913
                x_ubuntu_touch = key_file.get_boolean("Desktop Entry", "X-Ubuntu-Touch");
28
914
            } catch (GLib.KeyFileError e) {
29
915
                x_ubuntu_touch = false;
30
916
            }
31
917
        }
32
918
33
919
        if (!x_ubuntu_touch) {
34
920
            continue;
35
921
        }
36
922
37
908
        /* De-dupe by 'application://foo.desktop' URI. Also note that we need
923
        /* De-dupe by 'application://foo.desktop' URI. Also note that we need
38
909
         * to de-dupe before we chuck out NoDisplay app infos, otherwise they'd
924
         * to de-dupe before we chuck out NoDisplay app infos, otherwise they'd
39
910
         * show up from alternate sources */
925
         * show up from alternate sources */
Status:	Merged
Approved by:	Michał Sawicz on 2013-04-03
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2013-03-26	Approve on 2013-04-03
PS Jenkins bot (community)	continuous-integration		Approve on 2013-04-02
Review via email: mp+155464@code.launchpad.net