platform-api

Merge lp:~mir-team/platform-api/expose-mir-connection into lp:platform-api

  1. expose-mir-connection
  2. Merge into trunk
Proposed by Robert Carr on 2014-12-17
Status: Merged
Approved by: Gerry Boland on 2015-02-05
Approved revision: 300
Merged at revision: 296
Proposed branch: lp:~mir-team/platform-api/expose-mir-connection
Merge into: lp:platform-api
Diff against target: 619 lines (+166/-32)
23 files modified
CMakeLists.txt (+5/-2)
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/libubuntu-application-api2.symbols (+2/-1)
include/ubuntu/application/instance.h (+15/-0)
include/ubuntu/application/ui/clipboard.h (+7/-0)
include/ubuntu/application/ui/form_factor.h (+5/-0)
include/ubuntu/application/ui/options.h (+9/-2)
include/ubuntu/application/ui/session.h (+12/-3)
include/ubuntu/application/ui/stage.h (+5/-0)
include/ubuntu/application/ui/window.h (+22/-4)
include/ubuntu/application/ui/window_orientation.h (+5/-0)
include/ubuntu/application/ui/window_parent.h (+19/-7)
include/ubuntu/application/ui/window_properties.h (+19/-5)
include/ubuntu/application/ui/window_state.h (+5/-0)
include/ubuntu/application/ui/window_type.h (+5/-0)
src/ubuntu/application/base_module.h (+2/-2)
src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp (+7/-0)
src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp (+7/-0)
src/ubuntu/application/desktop/module_version.h (+2/-2)
src/ubuntu/application/testbackend/module_version.h (+2/-2)
src/ubuntu/application/touch/module_version.h (+2/-2)
src/ubuntu/application/ubuntu_application_api.cpp (+1/-0)
To merge this branch: bzr merge lp:~mir-team/platform-api/expose-mir-connection
Reviewer Review Type Date Requested Status
Gerry Boland 2014-12-17 Approve on 2015-02-05
PS Jenkins bot continuous-integration Approve on 2015-02-04
Alberto Aguirre Approve on 2015-02-04
Albert Astals Cid (community) Abstain on 2015-02-02
Review via email: mp+245054@code.launchpad.net

Commit Message

Expose MirConnection form UApplicationIntance and deprecate the ua_ui namespace.

Description of the Change

Hi! This is the first step of a transition plan to move QtUbuntu to the Mir Client API and remove the usage of platform API as an intermediate layer insulating MirClient. This has been discussed with the Mir team and tvoss and I won't recount the entire discussion here. In short, significant Mir API changes/additions are required for desktop functionality and replicating them all in PAPI has been deemed costly/unnecessary.

This branch exposes MirConnection from u_application_instance this allows the platform API to remain in control of acquiring the connection and the life cycle delegates without having it in the way of functionality QtUbuntu requires. The ua_ui_ namespace is noted as deprecated.

I dont think there are any downstream users of the ua_ui namespace besides QtUbuntu but I'm not sure.

QtUbuntu branch incoming before holidays...

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

Typo in commit message.

I've no problem with the API addition, but we need a more concrete deprecation strategy. Just adding comment to the relevant header files is not enough IMO.

review: Needs Fixing
lp:~mir-team/platform-api/expose-mir-connection updated on 2015-01-22
291. By Robert Carr on 2015-01-22

Use deprecated attribute

Robert Carr (robertcarr) wrote :

Hi I've updated things to use the actual deprecated attribute...I didn't do this initially out of fear of breaking downstream but forgot we can release this at the same time as the qtubuntu port easily and nothing else in the silos using platform-api.

Out of consideration for potential unknown consumers I've left the methods in with deprecation notice though. They should be removed after one release. It's not as if they are particularly high burden (look at bzr log to see how much they change ;)).

Thanks,
Robert

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

LGTM

review: Approve
Gerry Boland (gerboland) wrote :

though we should bump the package version

review: Needs Fixing
Gerry Boland (gerboland) wrote :

Shouldn't libubuntu-application-api-dev depend now on libmirclient-dev

lp:~mir-team/platform-api/expose-mir-connection updated on 2015-01-26
292. By Robert Carr on 2015-01-26

Update minor version, package version and add mirclient dependency to devpackage

293. By Robert Carr on 2015-01-26

Merge trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~mir-team/platform-api/expose-mir-connection updated on 2015-01-26
294. By Robert Carr on 2015-01-26

Correct version bump

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~mir-team/platform-api/expose-mir-connection updated on 2015-01-26
295. By Robert Carr on 2015-01-26

Again

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

I think with the train, you just need to specify the major package version "2.8.0" - not the whole "2.8.0+15.04.20141126-0ubuntu1"
Looks ok otherwise

lp:~mir-team/platform-api/expose-mir-connection updated on 2015-01-28
296. By Robert Carr on 2015-01-28

Fix changelog version

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Albert Astals Cid (aacid) wrote :

The debian/changelog file seems to have a broken merge?

review: Needs Fixing
lp:~mir-team/platform-api/expose-mir-connection updated on 2015-02-02
297. By Robert Carr <racarr@ocelot> on 2015-02-02

Merge lp:papi

Robert Carr (robertcarr) wrote :

Should be ok now?

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Albert Astals Cid (aacid) :
review: Abstain
Gerry Boland (gerboland) wrote :

dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see diff output below
dpkg-gensymbols: warning: debian/libubuntu-application-api2/DEBIAN/symbols doesn't match completely debian/libubuntu-application-api2.symbols

Please update debian/libubuntu-application-api2.symbols

review: Needs Fixing
lp:~mir-team/platform-api/expose-mir-connection updated on 2015-02-04
298. By Alberto Aguirre on 2015-02-04

update symbols

299. By Alberto Aguirre on 2015-02-04

merge lp:platform-api, fix changelog conflict

300. By Alberto Aguirre on 2015-02-04

update versions

Alberto Aguirre (albaguirre) wrote :

> dpkg-gensymbols: warning: some new symbols appeared in the symbols file: see
> diff output below
> dpkg-gensymbols: warning: debian/libubuntu-application-api2/DEBIAN/symbols
> doesn't match completely debian/libubuntu-application-api2.symbols
>
> Please update debian/libubuntu-application-api2.symbols

Fixed.

Robert Carr (robertcarr) wrote :

:) Thanks

Alberto Aguirre (albaguirre) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Gerry Boland (gerboland) wrote :

LGTM

review: Approve
Michał Sawicz (saviq) :
Michał Sawicz (saviq) :
lp:~mir-team/platform-api/expose-mir-connection updated on 2015-03-18
301. By Michał Sawicz on 2015-03-18

Merge lp:platform-api

Oliver Grawert (ogra) wrote :

if you want this acked by a core dev, pretty please mention the package dependency change in the changelog or commit message.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-03-06 13:04:05 +0000
3+++ CMakeLists.txt 2015-03-18 10:04:03 +0000
4@@ -3,8 +3,8 @@
5 project(ubuntu-platform-api)
6
7 set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
8-set(UBUNTU_PLATFORM_API_VERSION_MINOR 8)
9-set(UBUNTU_PLATFORM_API_VERSION_PATCH 1)
10+set(UBUNTU_PLATFORM_API_VERSION_MINOR 9)
11+set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
12
13 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
14
15@@ -72,6 +72,9 @@
16
17 include_directories(include)
18 include_directories(android/include)
19+include_directories(
20+ ${MIRCLIENT_INCLUDE_DIRS}
21+)
22
23 add_subdirectory(data/)
24 add_subdirectory(doc/)
25
26=== modified file 'debian/changelog'
27--- debian/changelog 2015-03-06 14:30:10 +0000
28+++ debian/changelog 2015-03-18 10:04:03 +0000
29@@ -1,3 +1,10 @@
30+platform-api (2.9.0) UNRELEASED; urgency=medium
31+
32+ * Deprecate windowing system abstraction layer in favor of directly
33+ exposing MirConnection.
34+
35+ -- Robert Carr <robert.carr@canonical.com> Wed, 04 Feb 2015 17:51:58 +0100
36+
37 platform-api (2.8.1+15.04.20150306-0ubuntu1) vivid; urgency=medium
38
39 [ Ricardo Mendoza ]
40
41=== modified file 'debian/control'
42--- debian/control 2015-02-02 11:46:55 +0000
43+++ debian/control 2015-03-18 10:04:03 +0000
44@@ -73,6 +73,7 @@
45 libubuntu-application-api2,
46 ubuntu-application-api2-touch (= ${binary:Version}),
47 ubuntu-application-api2-desktop (= ${binary:Version}),
48+ libmirclient-dev,
49 ${misc:Depends},
50 Suggests: libubuntu-application-api-doc,
51 Description: Ubuntu Application API for system level capabilities (development)
52
53=== modified file 'debian/libubuntu-application-api2.symbols'
54--- debian/libubuntu-application-api2.symbols 2014-10-01 17:55:57 +0000
55+++ debian/libubuntu-application-api2.symbols 2015-03-18 10:04:03 +0000
56@@ -8,6 +8,7 @@
57 u_application_id_destroy@Base 0.18.1daily13.06.21
58 u_application_id_new_from_stringn@Base 0.18.1daily13.06.21
59 u_application_init@Base 2.0.0+14.10.20140612
60+ u_application_instance_get_mir_connection@Base 2.8.0
61 u_application_instance_new_from_description_with_options@Base 0.18.1daily13.06.21
62 u_application_lifecycle_delegate_new@Base 0.18.1daily13.06.21
63 u_application_lifecycle_delegate_ref@Base 0.18.1daily13.06.21
64@@ -127,8 +128,8 @@
65 ua_ui_window_properties_get_title@Base 0.18.1daily13.06.21
66 ua_ui_window_properties_new_for_normal_window@Base 0.18.1daily13.06.21
67 ua_ui_window_properties_set_dimensions@Base 2.0.0+14.10.20140612
68+ ua_ui_window_properties_set_event_cb_and_ctx@Base 2.2.0+14.10.20140728
69 ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.1daily13.06.21
70- ua_ui_window_properties_set_event_cb_and_ctx@Base 2.2.0+14.10.20140728
71 ua_ui_window_properties_set_role@Base 0.18.1daily13.06.21
72 ua_ui_window_properties_set_titlen@Base 0.18.1daily13.06.21
73 ua_ui_window_request_fullscreen@Base 0.18.1daily13.06.21
74
75=== modified file 'include/ubuntu/application/instance.h'
76--- include/ubuntu/application/instance.h 2013-08-22 06:32:14 +0000
77+++ include/ubuntu/application/instance.h 2015-03-18 10:04:03 +0000
78@@ -25,6 +25,8 @@
79 #include <ubuntu/application/description.h>
80 #include <ubuntu/application/options.h>
81
82+#include <mir_toolkit/mir_client_library.h>
83+
84 #ifdef __cplusplus
85 extern "C" {
86 #endif
87@@ -49,6 +51,19 @@
88 u_application_instance_new_from_description_with_options(
89 UApplicationDescription *desc,
90 UApplicationOptions *options);
91+
92+ /**
93+ * \brief Return the MirConnection associated with an application instance.
94+ * Use of MirConnection with the mir client API is now the preferred
95+ * way to create and use application surfaces. The ua_ui_ namespace
96+ * is now deprecated.
97+ * \ingroup application_support
98+ * \param[in] instance The instance from which to retreive the MirConnection
99+ */
100+ UBUNTU_DLL_PUBLIC MirConnection*
101+ u_application_instance_get_mir_connection(
102+ UApplicationInstance *instance);
103+
104
105 /**
106 * \brief Increments the reference count of an application instance.
107
108=== modified file 'include/ubuntu/application/ui/clipboard.h'
109--- include/ubuntu/application/ui/clipboard.h 2014-09-22 18:04:53 +0000
110+++ include/ubuntu/application/ui/clipboard.h 2015-03-18 10:04:03 +0000
111@@ -17,6 +17,11 @@
112 * Thomas Voß <thomas.voss@canonical.com>
113 */
114
115+/*
116+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
117+ * and the mir client library
118+ */
119+
120 #ifndef UBUNTU_APPLICATION_UI_CLIPBOARD_H_
121 #define UBUNTU_APPLICATION_UI_CLIPBOARD_H_
122
123@@ -29,6 +34,7 @@
124 /*
125 FIXME: See ua_ui_get_clipboard_content
126 */
127+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
128 UBUNTU_DLL_PUBLIC void
129 ua_ui_set_clipboard_content(
130 void* data,
131@@ -45,6 +51,7 @@
132 contains. It should provide a mapping between mime types (as plain ascii strings)
133 and their respective data so the user is able to interpret the contents properly.
134 */
135+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
136 UBUNTU_DLL_PUBLIC void
137 ua_ui_get_clipboard_content(
138 void** data,
139
140=== modified file 'include/ubuntu/application/ui/form_factor.h'
141--- include/ubuntu/application/ui/form_factor.h 2013-05-27 22:14:00 +0000
142+++ include/ubuntu/application/ui/form_factor.h 2015-03-18 10:04:03 +0000
143@@ -17,6 +17,11 @@
144 * Thomas Voß <thomas.voss@canonical.com>
145 */
146
147+/*
148+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
149+ * and the mir client library
150+ */
151+
152 #ifndef UBUNTU_APPLICATION_UI_FORM_FACTOR_H_
153 #define UBUNTU_APPLICATION_UI_FORM_FACTOR_H_
154
155
156=== modified file 'include/ubuntu/application/ui/options.h'
157--- include/ubuntu/application/ui/options.h 2013-08-22 06:32:14 +0000
158+++ include/ubuntu/application/ui/options.h 2015-03-18 10:04:03 +0000
159@@ -17,6 +17,11 @@
160 * Thomas Voß <thomas.voss@canonical.com>
161 */
162
163+/*
164+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
165+ * and the mir client library
166+ */
167+
168 #ifndef UBUNTU_APPLICATION_UI_OPTIONS_H_
169 #define UBUNTU_APPLICATION_UI_OPTIONS_H_
170
171@@ -29,11 +34,13 @@
172 #ifdef __cplusplus
173 extern "C" {
174 #endif
175-
176+
177+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
178 UBUNTU_DLL_PUBLIC UAUiFormFactor
179 u_application_options_get_form_factor(
180 UApplicationOptions* options);
181-
182+
183+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
184 UBUNTU_DLL_PUBLIC UAUiStage
185 u_application_options_get_stage(
186 UApplicationOptions* options);
187
188=== modified file 'include/ubuntu/application/ui/session.h'
189--- include/ubuntu/application/ui/session.h 2013-08-22 06:32:14 +0000
190+++ include/ubuntu/application/ui/session.h 2015-03-18 10:04:03 +0000
191@@ -17,6 +17,11 @@
192 * Thomas Voß <thomas.voss@canonical.com>
193 */
194
195+/*
196+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
197+ * and the mir client library
198+ */
199+
200 #ifndef UBUNTU_APPLICATION_UI_SESSION_H_
201 #define UBUNTU_APPLICATION_UI_SESSION_H_
202
203@@ -36,19 +41,23 @@
204 U_USER_SESSION = 0,
205 U_SYSTEM_SESSION = 1
206 } UAUiSessionType;
207-
208+
209+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
210 UBUNTU_DLL_PUBLIC UAUiSession*
211 ua_ui_session_new_with_properties(
212 UAUiSessionProperties *properties);
213-
214+
215+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
216 UBUNTU_DLL_PUBLIC UAUiSessionProperties*
217 ua_ui_session_properties_new();
218-
219+
220+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
221 UBUNTU_DLL_PUBLIC void
222 ua_ui_session_properties_set_type(
223 UAUiSessionProperties* properties,
224 UAUiSessionType type);
225
226+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
227 UBUNTU_DLL_PUBLIC void
228 ua_ui_session_properties_set_remote_pid(
229 UAUiSessionProperties* properties,
230
231=== modified file 'include/ubuntu/application/ui/stage.h'
232--- include/ubuntu/application/ui/stage.h 2013-05-27 22:14:00 +0000
233+++ include/ubuntu/application/ui/stage.h 2015-03-18 10:04:03 +0000
234@@ -17,6 +17,11 @@
235 * Thomas Voß <thomas.voss@canonical.com>
236 */
237
238+/*
239+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
240+ * and the mir client library
241+ */
242+
243 #ifndef UBUNTU_APPLICATION_UI_STAGE_H_
244 #define UBUNTU_APPLICATION_UI_STAGE_H_
245
246
247=== modified file 'include/ubuntu/application/ui/window.h'
248--- include/ubuntu/application/ui/window.h 2014-10-01 00:08:19 +0000
249+++ include/ubuntu/application/ui/window.h 2015-03-18 10:04:03 +0000
250@@ -17,6 +17,11 @@
251 * Thomas Voß <thomas.voss@canonical.com>
252 */
253
254+/*
255+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
256+ * and the mir client library
257+ */
258+
259 #ifndef UBUNTU_APPLICATION_UI_WINDOW_H_
260 #define UBUNTU_APPLICATION_UI_WINDOW_H_
261
262@@ -40,62 +45,75 @@
263 /*
264 Ownership of properties is given to the returned UAUiWindow
265 */
266+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
267 UBUNTU_DLL_PUBLIC UAUiWindow*
268 ua_ui_window_new_for_application_with_properties(
269 UApplicationInstance *instance,
270 UAUiWindowProperties *properties);
271-
272+
273+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
274 UBUNTU_DLL_PUBLIC void
275 ua_ui_window_destroy(
276 UAUiWindow *window);
277-
278+
279+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
280 UBUNTU_DLL_PUBLIC UAUiWindowId
281 ua_ui_window_get_id(
282 UAUiWindow *window);
283-
284+
285+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
286 UBUNTU_DLL_PUBLIC void
287 ua_ui_window_get_size(
288 UAUiWindow *window,
289 uint32_t *width,
290 uint32_t *height);
291
292+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
293 UBUNTU_DLL_PUBLIC UStatus
294 ua_ui_window_move(
295 UAUiWindow *window,
296 uint32_t new_x,
297 uint32_t new_y);
298
299+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
300 UBUNTU_DLL_PUBLIC UStatus
301 ua_ui_window_resize(
302 UAUiWindow *window,
303 uint32_t new_width,
304 uint32_t new_height);
305
306+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
307 UBUNTU_DLL_PUBLIC UStatus
308 ua_ui_window_hide(
309 UAUiWindow *window);
310
311+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
312 UBUNTU_DLL_PUBLIC UStatus
313 ua_ui_window_show(
314 UAUiWindow *window);
315
316 // Deprecated. Prefer ua_ui_window_request_state.
317+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
318 UBUNTU_DLL_PUBLIC void
319 ua_ui_window_request_fullscreen(
320 UAUiWindow *window);
321
322+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
323 UBUNTU_DLL_PUBLIC EGLNativeWindowType
324 ua_ui_window_get_native_type(
325 UAUiWindow *window);
326
327+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
328 UBUNTU_DLL_PUBLIC int
329 ua_ui_window_is_focused(
330 UAUiWindow *window);
331-
332+
333+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
334 UBUNTU_DLL_PUBLIC void
335 ua_ui_window_request_state(
336 UAUiWindow *window, UApplicationUiWindowState state);
337
338+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
339 UBUNTU_DLL_PUBLIC UApplicationUiWindowOrientation
340 ua_ui_window_get_orientation(
341 UAUiWindow *window);
342
343=== modified file 'include/ubuntu/application/ui/window_orientation.h'
344--- include/ubuntu/application/ui/window_orientation.h 2014-08-20 17:13:47 +0000
345+++ include/ubuntu/application/ui/window_orientation.h 2015-03-18 10:04:03 +0000
346@@ -14,6 +14,11 @@
347 * along with this program. If not, see <http://www.gnu.org/licenses/>.
348 */
349
350+/*
351+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
352+ * and the mir client library
353+ */
354+
355 #ifndef UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H
356 #define UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H
357
358
359=== modified file 'include/ubuntu/application/ui/window_parent.h'
360--- include/ubuntu/application/ui/window_parent.h 2013-08-22 06:32:14 +0000
361+++ include/ubuntu/application/ui/window_parent.h 2015-03-18 10:04:03 +0000
362@@ -17,6 +17,11 @@
363 * Thomas Voß <thomas.voss@canonical.com>
364 */
365
366+/*
367+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
368+ * and the mir client library
369+ */
370+
371 #ifndef UBUNTU_APPLICATION_UI_WINDOW_PARENT_H_
372 #define UBUNTU_APPLICATION_UI_WINDOW_PARENT_H_
373
374@@ -35,29 +40,36 @@
375 } UApplicationUiWindowParentType;
376
377 typedef struct UApplicationUiWindowParent;
378-
379+
380+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
381 UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
382 u_application_ui_window_parent_new_with_window(
383 UApplicationUiWindow *window);
384-
385+
386+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
387 UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
388 u_application_ui_window_parent_new_with_application(
389 UApplicationInstance *instance);
390-
391+
392+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
393 UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
394 u_application_ui_window_parent_new_for_session();
395-
396+
397+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
398 UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
399 u_application_ui_window_parent_new_for_system();
400-
401+
402+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
403 UBUNTU_DLL_PUBLIC void
404 u_application_ui_window_parent_destroy(
405 UApplicationUiWindowParent *parent);
406-
407+
408+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
409 UBUNTU_DLL_PUBLIC UApplicationUiWindowParentType
410 u_application_ui_window_parent_get_type(
411 UApplicationUiWindowParent *parent);
412-
413+
414+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
415 UBUNTU_DLL_PUBLIC UApplicationUiWindow*
416 u_application_ui_window_parent_get_parent_window(
417 UApplicationUiWindowParent *parent);
418
419=== modified file 'include/ubuntu/application/ui/window_properties.h'
420--- include/ubuntu/application/ui/window_properties.h 2014-07-15 12:41:35 +0000
421+++ include/ubuntu/application/ui/window_properties.h 2015-03-18 10:04:03 +0000
422@@ -17,6 +17,11 @@
423 * Thomas Voß <thomas.voss@canonical.com>
424 */
425
426+/*
427+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
428+ * and the mir client library
429+ */
430+
431 #ifndef UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_H_
432 #define UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_H_
433
434@@ -47,34 +52,41 @@
435 typedef event_cb UAUiWindowEventCb;
436
437 typedef void UAUiWindowProperties;
438-
439+
440+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
441 UBUNTU_DLL_PUBLIC UAUiWindowProperties*
442 ua_ui_window_properties_new_for_normal_window();
443-
444+
445+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
446 UBUNTU_DLL_PUBLIC void
447 ua_ui_window_properties_destroy(
448 UAUiWindowProperties *properties);
449-
450+
451+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
452 UBUNTU_DLL_PUBLIC void
453 ua_ui_window_properties_set_titlen(
454 UAUiWindowProperties *properties,
455 const char *title,
456 size_t size);
457-
458+
459+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
460 UBUNTU_DLL_PUBLIC const char*
461 ua_ui_window_properties_get_title(
462 UAUiWindowProperties *properties);
463-
464+
465+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
466 UBUNTU_DLL_PUBLIC void
467 ua_ui_window_properties_set_role(
468 UAUiWindowProperties *properties,
469 UAUiWindowRole role);
470
471+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
472 UBUNTU_DLL_PUBLIC UAUiWindowRole
473 ua_ui_window_properties_get_role(
474 UAUiWindowProperties *properties);
475
476 // Deprecated! Use ua_ui_window_properties_set_event_cb_and_ctx instead.
477+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
478 UBUNTU_DLL_PUBLIC void
479 ua_ui_window_properties_set_input_cb_and_ctx(
480 UAUiWindowProperties *properties,
481@@ -82,12 +94,14 @@
482 void *ctx);
483
484 UBUNTU_DLL_PUBLIC void
485+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
486 ua_ui_window_properties_set_event_cb_and_ctx(
487 UAUiWindowProperties *properties,
488 UAUiWindowEventCb cb,
489 void *ctx);
490
491 UBUNTU_DLL_PUBLIC void
492+ __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
493 ua_ui_window_properties_set_dimensions(
494 UAUiWindowProperties *properties,
495 uint32_t width,
496
497=== modified file 'include/ubuntu/application/ui/window_state.h'
498--- include/ubuntu/application/ui/window_state.h 2013-08-18 20:33:22 +0000
499+++ include/ubuntu/application/ui/window_state.h 2015-03-18 10:04:03 +0000
500@@ -16,6 +16,11 @@
501 * Authored by: Gerry Boland <gerry.boland@canonical.com>
502 */
503
504+/*
505+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
506+ * and the mir client library
507+ */
508+
509 #ifndef UBUNTU_APPLICATION_UI_WINDOW_STATE_H_
510 #define UBUNTU_APPLICATION_UI_WINDOW_STATE_H_
511
512
513=== modified file 'include/ubuntu/application/ui/window_type.h'
514--- include/ubuntu/application/ui/window_type.h 2013-08-18 19:40:35 +0000
515+++ include/ubuntu/application/ui/window_type.h 2015-03-18 10:04:03 +0000
516@@ -17,6 +17,11 @@
517 * Thomas Voß <thomas.voss@canonical.com>
518 */
519
520+/*
521+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
522+ * and the mir client library
523+ */
524+
525 #ifndef UBUNTU_APPLICATION_UI_WINDOW_TYPE_H_
526 #define UBUNTU_APPLICATION_UI_WINDOW_TYPE_H_
527
528
529=== modified file 'src/ubuntu/application/base_module.h'
530--- src/ubuntu/application/base_module.h 2015-03-06 13:04:05 +0000
531+++ src/ubuntu/application/base_module.h 2015-03-18 10:04:03 +0000
532@@ -28,8 +28,8 @@
533 */
534
535 #define API_VERSION_MAJOR "2"
536-#define API_VERSION_MINOR "8"
537-#define API_VERSION_PATCH "1"
538+#define API_VERSION_MINOR "9"
539+#define API_VERSION_PATCH "0"
540 #define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
541
542 namespace internal
543
544=== modified file 'src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp'
545--- src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp 2014-10-15 13:29:15 +0000
546+++ src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp 2015-03-18 10:04:03 +0000
547@@ -141,6 +141,13 @@
548 (void) instance;
549 }
550
551+MirConnection*
552+u_application_instance_get_mir_connection(UApplicationInstance *u_instance)
553+{
554+ auto instance = uamc::Instance::from_u_application_instance(u_instance);
555+ return instance->connection();
556+}
557+
558 void ua_ui_set_clipboard_content(void* /*content*/, size_t /*content_size*/)
559 {
560 // TODO<papi>: Fix API and implement it
561
562=== modified file 'src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp'
563--- src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp 2014-11-14 15:30:22 +0000
564+++ src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp 2015-03-18 10:04:03 +0000
565@@ -65,6 +65,13 @@
566 (void) instance;
567 }
568
569+MirConnection*
570+u_application_instance_get_mir_connection(UApplicationInstance *instance)
571+{
572+ (void) instance;
573+ return nullptr;
574+}
575+
576 void ua_ui_set_clipboard_content(void* content, size_t content_size)
577 {
578 // TODO<mir,papi>: Implement. Probably need more arguments?
579
580=== modified file 'src/ubuntu/application/desktop/module_version.h'
581--- src/ubuntu/application/desktop/module_version.h 2015-03-06 13:04:05 +0000
582+++ src/ubuntu/application/desktop/module_version.h 2015-03-18 10:04:03 +0000
583@@ -1,3 +1,3 @@
584 #define MODULE_VERSION_MAJOR 2
585-#define MODULE_VERSION_MINOR 8
586-#define MODULE_VERSION_PATCH 1
587+#define MODULE_VERSION_MINOR 9
588+#define MODULE_VERSION_PATCH 0
589
590=== modified file 'src/ubuntu/application/testbackend/module_version.h'
591--- src/ubuntu/application/testbackend/module_version.h 2015-03-06 13:04:05 +0000
592+++ src/ubuntu/application/testbackend/module_version.h 2015-03-18 10:04:03 +0000
593@@ -1,3 +1,3 @@
594 #define MODULE_VERSION_MAJOR 2
595-#define MODULE_VERSION_MINOR 8
596-#define MODULE_VERSION_PATCH 1
597+#define MODULE_VERSION_MINOR 9
598+#define MODULE_VERSION_PATCH 0
599
600=== modified file 'src/ubuntu/application/touch/module_version.h'
601--- src/ubuntu/application/touch/module_version.h 2015-03-06 13:04:05 +0000
602+++ src/ubuntu/application/touch/module_version.h 2015-03-18 10:04:03 +0000
603@@ -1,3 +1,3 @@
604 #define MODULE_VERSION_MAJOR 2
605-#define MODULE_VERSION_MINOR 8
606-#define MODULE_VERSION_PATCH 1
607+#define MODULE_VERSION_MINOR 9
608+#define MODULE_VERSION_PATCH 0
609
610=== modified file 'src/ubuntu/application/ubuntu_application_api.cpp'
611--- src/ubuntu/application/ubuntu_application_api.cpp 2015-01-22 19:37:40 +0000
612+++ src/ubuntu/application/ubuntu_application_api.cpp 2015-03-18 10:04:03 +0000
613@@ -85,6 +85,7 @@
614
615 // UApplicationInstance
616 IMPLEMENT_FUNCTION2(instance, UApplicationInstance*, u_application_instance_new_from_description_with_options, UApplicationDescription*, UApplicationOptions*);
617+IMPLEMENT_FUNCTION1(connection, MirConnection*, u_application_instance_get_mir_connection, UApplicationInstance*);
618
619 // Application Ui Helpers
620

Subscribers

People subscribed via source and target branches