Unity

Merge lp:~boiko/unity/phablet-rename_phoneapp into lp:unity/phablet

  1. phablet-rename_phoneapp
  2. Merge into phablet
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: no longer in the source branch.
Merged at revision: 491
Proposed branch: lp:~boiko/unity/phablet-rename_phoneapp
Merge into: lp:unity/phablet
Diff against target: 89 lines (+10/-10)
6 files modified
Applications/applications.js (+3/-3)
Components/ApplicationManagerWrapper.qml (+2/-2)
Dash/Apps/FrequentlyUsedAppsModel.qml (+1/-1)
Dash/Apps/InstalledApplicationsModel.qml (+1/-1)
Dash/People/PeoplePreview.qml (+2/-2)
Launcher/Launcher.qml (+1/-1)
To merge this branch: bzr merge lp:~boiko/unity/phablet-rename_phoneapp
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Albert Astals Cid (community) Approve
Review via email: mp+153812@code.launchpad.net

Commit message

Rename telephony-app to phone-app.

Description of the change

Rename telephony-app to phone-app.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/61/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/60/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/60/rebuild

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

Looks good

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-phablet-autolanding/42/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/42/console
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-autolanding/42/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-autolanding/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/105/console

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Applications/applications.js'
2--- Applications/applications.js 2013-03-18 11:46:23 +0000
3+++ Applications/applications.js 2013-03-18 14:05:28 +0000
4@@ -29,10 +29,10 @@
5 var SideStage = 1;
6
7 var __availableApplications = {
8- '/usr/share/applications/telephony-app.desktop': {
9+ '/usr/share/applications/phone-app.desktop': {
10 'name': 'Phone',
11- 'icon': 'telephony',
12- 'exec': '/usr/bin/telephony-app',
13+ 'icon': 'phone',
14+ 'exec': '/usr/bin/phone-app',
15 'stage': SideStage
16 },
17 '/usr/share/applications/camera-app.desktop': {
18
19=== modified file 'Components/ApplicationManagerWrapper.qml'
20--- Components/ApplicationManagerWrapper.qml 2013-03-08 11:28:21 +0000
21+++ Components/ApplicationManagerWrapper.qml 2013-03-18 14:05:28 +0000
22@@ -133,8 +133,8 @@
23 desktopFile = "/usr/share/applications/share-app.desktop"
24 } else if (favoriteApplication == ApplicationManager.BrowserApplication) {
25 desktopFile = "/usr/share/applications/webbrowser-app.desktop"
26- } else if (favoriteApplication == 4) { // ApplicationManager.TelephonyApplication
27- desktopFile = "/usr/share/applications/telephony-app.desktop"
28+ } else if (favoriteApplication == 4) { // ApplicationManager.PhoneApplication
29+ desktopFile = "/usr/share/applications/phone-app.desktop"
30 }
31 applicationManager.focusRequested(desktopFile);
32 }
33
34=== modified file 'Dash/Apps/FrequentlyUsedAppsModel.qml'
35--- Dash/Apps/FrequentlyUsedAppsModel.qml 2013-03-08 11:28:21 +0000
36+++ Dash/Apps/FrequentlyUsedAppsModel.qml 2013-03-18 14:05:28 +0000
37@@ -18,7 +18,7 @@
38
39 ListModel {
40 ListElement { desktopFile: "/usr/share/applications/camera-app.desktop"; }
41- ListElement { desktopFile: "/usr/share/applications/telephony-app.desktop"; }
42+ ListElement { desktopFile: "/usr/share/applications/phone-app.desktop"; }
43 ListElement { desktopFile: "/usr/share/applications/ubuntu-gallery.desktop"; }
44 ListElement { desktopFile: "/usr/share/applications/facebook-webapp.desktop"; }
45 ListElement { desktopFile: "/usr/share/applications/webbrowser-app.desktop"; }
46
47=== modified file 'Dash/Apps/InstalledApplicationsModel.qml'
48--- Dash/Apps/InstalledApplicationsModel.qml 2013-02-26 13:51:48 +0000
49+++ Dash/Apps/InstalledApplicationsModel.qml 2013-03-18 14:05:28 +0000
50@@ -23,7 +23,7 @@
51 ListElement { desktopFile: "/usr/share/applications/media-player.desktop"; }
52 ListElement { desktopFile: "/usr/share/applications/music-player-mockapp.desktop"; }
53 ListElement { desktopFile: "/usr/share/applications/notepad.desktop"; }
54- ListElement { desktopFile: "/usr/share/applications/telephony-app.desktop"; }
55+ ListElement { desktopFile: "/usr/share/applications/phone-app.desktop"; }
56 ListElement { desktopFile: "/usr/share/applications/share-app.desktop"; }
57 ListElement { desktopFile: "/usr/share/applications/ski-safari-mockapp.desktop"; }
58 ListElement { desktopFile: "/usr/share/applications/twitter-webapp.desktop"; }
59
60=== modified file 'Dash/People/PeoplePreview.qml'
61--- Dash/People/PeoplePreview.qml 2013-02-26 13:51:48 +0000
62+++ Dash/People/PeoplePreview.qml 2013-03-18 14:05:28 +0000
63@@ -68,8 +68,8 @@
64 delegate: Phone {
65 model: preview.model
66 // FIXME these should trigger actions on the lens/scope, when there's support
67- onPhoneClicked: shell.activateApplication("/usr/share/applications/telephony-app.desktop", "call://%1".arg(number.replace(/[^\d\+]/g, "")))
68- onTextClicked: shell.activateApplication("/usr/share/applications/telephony-app.desktop", "message://%1".arg(number.replace(/[^\d\+]/g, "")))
69+ onPhoneClicked: shell.activateApplication("/usr/share/applications/phone-app.desktop", "call://%1".arg(number.replace(/[^\d\+]/g, "")))
70+ onTextClicked: shell.activateApplication("/usr/share/applications/phone-app.desktop", "message://%1".arg(number.replace(/[^\d\+]/g, "")))
71 }
72 }
73 }
74
75=== renamed file 'Dash/graphics/phone/screenshots/telephony@12.png' => 'Dash/graphics/phone/screenshots/phone@12.png'
76=== modified file 'Launcher/Launcher.qml'
77--- Launcher/Launcher.qml 2013-03-08 11:28:21 +0000
78+++ Launcher/Launcher.qml 2013-03-18 14:05:28 +0000
79@@ -22,7 +22,7 @@
80 Item {
81 id: launcher
82
83- property var favourites: ["/usr/share/applications/telephony-app.desktop",
84+ property var favourites: ["/usr/share/applications/phone-app.desktop",
85 "/usr/share/applications/camera-app.desktop",
86 "/usr/share/applications/ubuntu-gallery.desktop",
87 "/usr/share/applications/facebook-webapp.desktop",
88
89=== renamed file 'graphics/applicationIcons/telephony@18.png' => 'graphics/applicationIcons/phone@18.png'

Subscribers

People subscribed via source and target branches