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

[Gustavo Pichorim Boiko]

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

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

[Ricardo Salveti (rsalveti)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/platform-api-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/13/rebuild

review: Needs Fixing (continuous-integration)

[Ricardo Mendoza (ricmm)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:52
http://jenkins.qa.ubuntu.com/job/platform-api-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/14/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/platform-api-autolanding/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-amd64-autolanding/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-autolanding/4
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-raring-armhf-autolanding/4/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-raring-i386-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== 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 @@
         GALLERY_APP = 1,
         BROWSER_APP = 2,
         SHARE_APP = 3,
-        PHONE_APP = 4
+        PHONE_APP = 4,
+        MESSAGES_APP = 5,
+        CONTACTS_APP= 6
     } ubuntu_ui_well_known_application;
 
     typedef const void* ubuntu_ui_session_properties;

=== 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 @@
     camera_app = GALLERY_APP,
     browser_app = BROWSER_APP,
     share_app = SHARE_APP,
-    phone_app = PHONE_APP
+    phone_app = PHONE_APP,
+    messages_app = MESSAGES_APP,
+    contacts_app = CONTACTS_APP
 };
 }
 }