Merge lp:~phablet-team/indicators-client/rename_phoneapp into lp:indicators-client

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Ricardo Salveti
Approved revision: 197
Merged at revision: 197
Proposed branch: lp:~phablet-team/indicators-client/rename_phoneapp
Merge into: lp:indicators-client
Diff against target: 54 lines (+11/-5)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
examples/chewie_messaging_populate_menu (+4/-4)
To merge this branch: bzr merge lp:~phablet-team/indicators-client/rename_phoneapp
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+154575@code.launchpad.net

Commit message

Rename entries from telephony-app to phone-app.

Description of the change

Rename entries from telephony-app to phone-app.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

Good, thanks!

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-02-18 20:51:30 +0000
3+++ debian/changelog 2013-03-21 02:17:22 +0000
4@@ -1,3 +1,9 @@
5+indicators-client (0.28) quantal; urgency=low
6+
7+ * Rename entries from telephony-app to phone-app.
8+
9+ -- Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> Wed, 20 Mar 2013 23:12:11 -0300
10+
11 indicators-client (0.27) quantal; urgency=low
12
13 * Fixed Slider and Switch alignment inside of the menu. (LP: #1127658)
14
15=== modified file 'debian/control'
16--- debian/control 2013-03-20 19:35:45 +0000
17+++ debian/control 2013-03-21 02:17:22 +0000
18@@ -78,7 +78,7 @@
19 python-gi,
20 gir1.2-glib-2.0,
21 gir1.2-messagingmenu-1.0,
22- telephony-app,
23+ phone-app,
24 indicators-client (= ${binary:Version}),
25 Description: Indicators and system settings example application
26 This package contains the example applications for the indicators and system
27
28=== modified file 'examples/chewie_messaging_populate_menu'
29--- examples/chewie_messaging_populate_menu 2013-01-17 21:26:33 +0000
30+++ examples/chewie_messaging_populate_menu 2013-03-21 02:17:22 +0000
31@@ -63,10 +63,10 @@
32 return True
33
34
35-textMsg = MessagingMenu.App(desktop_id='telephony-app-sms.desktop')
36+textMsg = MessagingMenu.App(desktop_id='phone-app-sms.desktop')
37 textMsg.register()
38
39-phoneCall = MessagingMenu.App(desktop_id='telephony-app-phone.desktop')
40+phoneCall = MessagingMenu.App(desktop_id='phone-app-phone.desktop')
41 phoneCall.register()
42
43 facebook = MessagingMenu.App(desktop_id='facebook-webapp.desktop')
44@@ -228,8 +228,8 @@
45 },
46 ]
47
48-def run_telephony_app():
49- subprocess.call(['/usr/bin/telephony-app', '--fullscreen'])
50+def run_phone_app():
51+ subprocess.call(['/usr/bin/phone-app', '--fullscreen'])
52
53 def calculate_date(currentDay, dayOffset, timeStr):
54 prevDay = currentDay.add_days(dayOffset)

Subscribers

People subscribed via source and target branches

to all changes: