Merge lp:~rsalveti/notify-osd/phablet_platform_api_changes into lp:notify-osd/phablet

Proposed by Ricardo Salveti
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 664
Merged at revision: 664
Proposed branch: lp:~rsalveti/notify-osd/phablet_platform_api_changes
Merge into: lp:notify-osd/phablet
Diff against target: 27 lines (+5/-5)
1 file modified
src/main.cpp (+5/-5)
To merge this branch: bzr merge lp:~rsalveti/notify-osd/phablet_platform_api_changes
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ricardo Mendoza (community) Approve
Review via email: mp+166413@code.launchpad.net

Commit message

src/main.cpp: updating platform-api with the latest api changes

Description of the change

src/main.cpp: updating platform-api with the latest api changes

To post a comment you must log in.
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 :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/notify-osd-phablet-autolanding/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/notify-osd-phablet-raring-armhf-autolanding/2/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 'src/main.cpp'
2--- src/main.cpp 2013-02-07 01:32:55 +0000
3+++ src/main.cpp 2013-05-30 00:21:29 +0000
4@@ -41,7 +41,7 @@
5 #include <Nux/CairoWrapper.h>
6 #include <NuxCore/Logger.h>
7
8-#include <ubuntu/application/ui/ubuntu_application_ui.h>
9+#include <ubuntu/application/ui/display.h>
10
11 #include "defaults.h"
12 #include "stack.h"
13@@ -92,10 +92,10 @@
14 int y = 0;
15 int width = 0;
16 int height = 0;
17- ubuntu_application_ui_physical_display_info display_info_;
18- ubuntu_application_ui_create_display_info(&display_info_, 0);
19- int screenWidth = ubuntu_application_ui_query_horizontal_resolution(display_info_);
20- ubuntu_application_ui_destroy_display_info(display_info_);
21+
22+ UAUiDisplay* display = ua_ui_display_new_with_index(0);
23+ int screenWidth = ua_ui_display_query_horizontal_res(display);
24+ ua_ui_display_destroy(display);
25
26 Units* units = Units::getInstance ();
27 int gu = units->getGU ();

Subscribers

People subscribed via source and target branches