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
=== modified file 'debian/changelog'
--- debian/changelog 2013-02-18 20:51:30 +0000
+++ debian/changelog 2013-03-21 02:17:22 +0000
@@ -1,3 +1,9 @@
1indicators-client (0.28) quantal; urgency=low
2
3 * Rename entries from telephony-app to phone-app.
4
5 -- Gustavo Pichorim Boiko <gustavo.boiko@canonical.com> Wed, 20 Mar 2013 23:12:11 -0300
6
1indicators-client (0.27) quantal; urgency=low7indicators-client (0.27) quantal; urgency=low
28
3 * Fixed Slider and Switch alignment inside of the menu. (LP: #1127658)9 * Fixed Slider and Switch alignment inside of the menu. (LP: #1127658)
410
=== modified file 'debian/control'
--- debian/control 2013-03-20 19:35:45 +0000
+++ debian/control 2013-03-21 02:17:22 +0000
@@ -78,7 +78,7 @@
78 python-gi,78 python-gi,
79 gir1.2-glib-2.0,79 gir1.2-glib-2.0,
80 gir1.2-messagingmenu-1.0,80 gir1.2-messagingmenu-1.0,
81 telephony-app,81 phone-app,
82 indicators-client (= ${binary:Version}),82 indicators-client (= ${binary:Version}),
83Description: Indicators and system settings example application83Description: Indicators and system settings example application
84 This package contains the example applications for the indicators and system84 This package contains the example applications for the indicators and system
8585
=== modified file 'examples/chewie_messaging_populate_menu'
--- examples/chewie_messaging_populate_menu 2013-01-17 21:26:33 +0000
+++ examples/chewie_messaging_populate_menu 2013-03-21 02:17:22 +0000
@@ -63,10 +63,10 @@
63 return True63 return True
6464
6565
66textMsg = MessagingMenu.App(desktop_id='telephony-app-sms.desktop')66textMsg = MessagingMenu.App(desktop_id='phone-app-sms.desktop')
67textMsg.register()67textMsg.register()
6868
69phoneCall = MessagingMenu.App(desktop_id='telephony-app-phone.desktop')69phoneCall = MessagingMenu.App(desktop_id='phone-app-phone.desktop')
70phoneCall.register()70phoneCall.register()
7171
72facebook = MessagingMenu.App(desktop_id='facebook-webapp.desktop')72facebook = MessagingMenu.App(desktop_id='facebook-webapp.desktop')
@@ -228,8 +228,8 @@
228 },228 },
229 ]229 ]
230230
231def run_telephony_app():231def run_phone_app():
232 subprocess.call(['/usr/bin/telephony-app', '--fullscreen'])232 subprocess.call(['/usr/bin/phone-app', '--fullscreen'])
233233
234def calculate_date(currentDay, dayOffset, timeStr):234def calculate_date(currentDay, dayOffset, timeStr):
235 prevDay = currentDay.add_days(dayOffset)235 prevDay = currentDay.add_days(dayOffset)

Subscribers

People subscribed via source and target branches

to all changes: