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

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

Subscribers

People subscribed via source and target branches