Unity 8

Merge lp:~saviq/unity8/fix-frequent-app-ids into lp:unity8

  1. fix-frequent-app-ids
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 414
Merged at revision: 425
Proposed branch: lp:~saviq/unity8/fix-frequent-app-ids
Merge into: lp:unity8
Diff against target: 121 lines (+4/-85)
2 files modified
Dash/Apps/AppsAvailableForDownloadModel.qml (+0/-81)
Dash/Apps/FrequentlyUsedAppsModel.qml (+4/-4)
To merge this branch: bzr merge lp:~saviq/unity8/fix-frequent-app-ids
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Albert Astals Cid (community) Approve
David Barth (community) Needs Fixing
Gerry Boland Pending
Review via email: mp+190161@code.launchpad.net

This proposal supersedes a proposal from 2013-10-01.

Commit message

Fix frequent application IDs and drop old AppsAvailableForDownload model.

Description of the change

This needs url-dispatcher trunk.

To post a comment you must log in.
Revision history for this message
David Barth (dbarth) wrote : Posted in a previous version of this proposal

For reference, the correct appid string for Facebook is:

"appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"

as confirmed by Ted on IRC.

review: Needs Fixing
Revision history for this message
David Barth (dbarth) wrote :

The gmail appid should be:

appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version

ie, replace facebook in the package name with gmail

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:413
http://jenkins.qa.ubuntu.com/job/unity8-ci/1331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4833
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2692
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2197
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/354
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1331
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1330
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1011
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/708
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2694
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2694/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2231
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2243

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1331/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

com.ubuntu.developer.webapps.webapp-facebook/webapp-gmail sounds wrong

review: Needs Fixing
lp:~saviq/unity8/fix-frequent-app-ids updated
414. By Michał Sawicz

s/facebook/gmail/

Revision history for this message
Albert Astals Cid (aacid) wrote :

Works

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:414
http://jenkins.qa.ubuntu.com/job/unity8-ci/1346/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4885
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/2212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-amd64-ci/369
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1346
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/1346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/1345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/760
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/760/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2758
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2758/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2294
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2309

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1346/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'Dash/Apps/AppsAvailableForDownloadModel.qml'
--- Dash/Apps/AppsAvailableForDownloadModel.qml 2013-08-11 21:21:38 +0000
+++ Dash/Apps/AppsAvailableForDownloadModel.qml 1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; version 3.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17import QtQuick 2.0
18import "../../Applications"
19
20ListModel {
21 ListElement {
22 uri: "application://evernote.desktop"
23 icon: "../../graphics/applicationIcons/evernote.png"
24 category: 0
25 mimetype: "application/x-desktop"
26 title: "Evernote"
27 comment: ""
28 dndUri: "file:///usr/share/applications/evernote.desktop"
29 metadata: ""
30 }
31 ListElement {
32 uri: "application://map.desktop"
33 icon: "../../graphics/applicationIcons/map.png"
34 category: 0
35 mimetype: "application/x-desktop"
36 title: "Map"
37 comment: ""
38 dndUri: "file:///usr/share/applications/map.desktop"
39 metadata: ""
40 }
41 ListElement {
42 uri: "application://pinterest.desktop"
43 icon: "../../graphics/applicationIcons/pinterest.png"
44 category: 0
45 mimetype: "application/x-desktop"
46 title: "Pinterest"
47 comment: ""
48 dndUri: "file:///usr/share/applications/pinterest.desktop"
49 metadata: ""
50 }
51 ListElement {
52 uri: "application://soundcloud.desktop"
53 icon: "../../graphics/applicationIcons/soundcloud.png"
54 category: 0
55 mimetype: "application/x-desktop"
56 title: "Soundcloud"
57 comment: ""
58 dndUri: "file:///usr/share/applications/soundcloud.desktop"
59 metadata: ""
60 }
61 ListElement {
62 uri: "application://wikipedia.desktop"
63 icon: "../../graphics/applicationIcons/wikipedia.png"
64 category: 0
65 mimetype: "application/x-desktop"
66 title: "Wikipedia"
67 comment: ""
68 dndUri: "file:///usr/share/applications/wikipedia.desktop"
69 metadata: ""
70 }
71 ListElement {
72 uri: "application://youtube.desktop"
73 icon: "../../graphics/applicationIcons/youtube.png"
74 category: 0
75 mimetype: "application/x-desktop"
76 title: "Youtube"
77 comment: ""
78 dndUri: "file:///usr/share/applications/youtube.desktop"
79 metadata: ""
80 }
81}
820
=== modified file 'Dash/Apps/FrequentlyUsedAppsModel.qml'
--- Dash/Apps/FrequentlyUsedAppsModel.qml 2013-08-26 17:01:24 +0000
+++ Dash/Apps/FrequentlyUsedAppsModel.qml 2013-10-10 08:46:30 +0000
@@ -68,13 +68,13 @@
68 metadata: ""68 metadata: ""
69 }69 }
70 ListElement {70 ListElement {
71 uri: "application:///usr/share/applications/facebook-webapp.desktop"71 uri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
72 icon: "../../graphics/applicationIcons/facebook.png"72 icon: "../../graphics/applicationIcons/facebook.png"
73 category: 073 category: 0
74 mimetype: "application/x-desktop"74 mimetype: "application/x-desktop"
75 title: "Facebook"75 title: "Facebook"
76 comment: ""76 comment: ""
77 dndUri: "file:///usr/share/applications/facebook-webapp.desktop"77 dndUri: "appid://com.ubuntu.developer.webapps.webapp-facebook/webapp-facebook/current-user-version"
78 metadata: ""78 metadata: ""
79 }79 }
80 ListElement {80 ListElement {
@@ -88,13 +88,13 @@
88 metadata: ""88 metadata: ""
89 }89 }
90 ListElement {90 ListElement {
91 uri: "application:///usr/share/applications/gmail-webapp.desktop"91 uri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"
92 icon: "../../graphics/applicationIcons/gmail.png"92 icon: "../../graphics/applicationIcons/gmail.png"
93 category: 093 category: 0
94 mimetype: "application/x-desktop"94 mimetype: "application/x-desktop"
95 title: "GMail"95 title: "GMail"
96 comment: ""96 comment: ""
97 dndUri: "file:///usr/share/applications/gmail-webapp.desktop"97 dndUri: "appid://com.ubuntu.developer.webapps.webapp-gmail/webapp-gmail/current-user-version"
98 metadata: ""98 metadata: ""
99 }99 }
100 ListElement {100 ListElement {

Subscribers

People subscribed via source and target branches