Merge lp:~boiko/platform-api/new_apps into lp:platform-api

Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Gustavo Pichorim Boiko
Approved revision: 52
Merged at revision: 52
Proposed branch: lp:~boiko/platform-api/new_apps
Merge into: lp:platform-api
Diff against target: 29 lines (+6/-2)
2 files modified
include/ubuntu/ui/ubuntu_ui_session_service.h (+3/-1)
include/ubuntu/ui/well_known_applications.h (+3/-1)
To merge this branch: bzr merge lp:~boiko/platform-api/new_apps
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ricardo Mendoza (community) Approve
Ricardo Salveti (community) Approve
Review via email: mp+163548@code.launchpad.net

Commit message

Now that phone-app is being separate into phone, messages and contacts, we need to have a messages and contacts app listed too.

Description of the change

Now that phone-app is being separate into phone, messages and contacts, we need to have a messages and contacts app listed too.

To post a comment you must log in.
Revision history for this message
Ricardo Salveti (rsalveti) wrote :

LGTM.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ricardo Mendoza (ricmm) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
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
=== modified file 'include/ubuntu/ui/ubuntu_ui_session_service.h'
--- include/ubuntu/ui/ubuntu_ui_session_service.h 2013-04-10 14:42:09 +0000
+++ include/ubuntu/ui/ubuntu_ui_session_service.h 2013-05-13 14:40:29 +0000
@@ -39,7 +39,9 @@
39 GALLERY_APP = 1,39 GALLERY_APP = 1,
40 BROWSER_APP = 2,40 BROWSER_APP = 2,
41 SHARE_APP = 3,41 SHARE_APP = 3,
42 PHONE_APP = 442 PHONE_APP = 4,
43 MESSAGES_APP = 5,
44 CONTACTS_APP= 6
43 } ubuntu_ui_well_known_application;45 } ubuntu_ui_well_known_application;
4446
45 typedef const void* ubuntu_ui_session_properties;47 typedef const void* ubuntu_ui_session_properties;
4648
=== modified file 'include/ubuntu/ui/well_known_applications.h'
--- include/ubuntu/ui/well_known_applications.h 2013-03-15 17:55:30 +0000
+++ include/ubuntu/ui/well_known_applications.h 2013-05-13 14:40:29 +0000
@@ -31,7 +31,9 @@
31 camera_app = GALLERY_APP,31 camera_app = GALLERY_APP,
32 browser_app = BROWSER_APP,32 browser_app = BROWSER_APP,
33 share_app = SHARE_APP,33 share_app = SHARE_APP,
34 phone_app = PHONE_APP34 phone_app = PHONE_APP,
35 messages_app = MESSAGES_APP,
36 contacts_app = CONTACTS_APP
35};37};
36}38}
37}39}

Subscribers

People subscribed via source and target branches