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

[Robert Carr]

Expose MirConnection form UApplicationIntance and deprecate the ua_ui namespace.

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...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:290
http://jenkins.qa.ubuntu.com/job/platform-api-ci/400/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/13

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

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]

291. By Robert Carr on 2015-01-22

Use deprecated attribute

[Robert Carr (robertcarr)]

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)]

PASSED: Continuous integration, rev:291
http://jenkins.qa.ubuntu.com/job/platform-api-ci/403/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/16

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

[Gerry Boland (gerboland)]

though we should bump the package version

review: Needs Fixing

[Gerry Boland (gerboland)]

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

[lp:~mir-team/platform-api/expose-mir-connection]

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)]

FAILED: Continuous integration, rev:293
http://jenkins.qa.ubuntu.com/job/platform-api-ci/404/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/17/console

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

review: Needs Fixing (continuous-integration)

[lp:~mir-team/platform-api/expose-mir-connection]

294. By Robert Carr on 2015-01-26

Correct version bump

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/platform-api-ci/405/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/18/console

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

review: Needs Fixing (continuous-integration)

[lp:~mir-team/platform-api/expose-mir-connection]

295. By Robert Carr on 2015-01-26

Again

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:295
http://jenkins.qa.ubuntu.com/job/platform-api-ci/406/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/19
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/19/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/19

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

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]

296. By Robert Carr on 2015-01-28

Fix changelog version

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:296
http://jenkins.qa.ubuntu.com/job/platform-api-ci/407/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/20

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

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

review: Needs Fixing

[lp:~mir-team/platform-api/expose-mir-connection]

297. By Robert Carr <racarr@ocelot> on 2015-02-02

Merge lp:papi

[Robert Carr (robertcarr)]

Should be ok now?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:297
http://jenkins.qa.ubuntu.com/job/platform-api-ci/408/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/21

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

review: Abstain

[Gerry Boland (gerboland)]

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]

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)]

> 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)]

:) Thanks

[Alberto Aguirre (albaguirre)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:298
http://jenkins.qa.ubuntu.com/job/platform-api-ci/411/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/24

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/platform-api-ci/412/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-vivid-i386-ci/25

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

[lp:~mir-team/platform-api/expose-mir-connection]

301. By Michał Sawicz on 2015-03-18

Merge lp:platform-api

[Oliver Grawert (ogra)]

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-06 13:04:05 +0000
+++ CMakeLists.txt	2015-03-18 10:04:03 +0000
@@ -3,8 +3,8 @@
 project(ubuntu-platform-api)
 
 set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
-set(UBUNTU_PLATFORM_API_VERSION_MINOR 8)
-set(UBUNTU_PLATFORM_API_VERSION_PATCH 1)
+set(UBUNTU_PLATFORM_API_VERSION_MINOR 9)
+set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
 
@@ -72,6 +72,9 @@
 
 include_directories(include)
 include_directories(android/include)
+include_directories(
+  ${MIRCLIENT_INCLUDE_DIRS}
+)
 
 add_subdirectory(data/)
 add_subdirectory(doc/)

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-06 14:30:10 +0000
+++ debian/changelog	2015-03-18 10:04:03 +0000
@@ -1,3 +1,10 @@
+platform-api (2.9.0) UNRELEASED; urgency=medium
+
+  *  Deprecate windowing system abstraction layer in favor of directly
+     exposing MirConnection.
+
+ -- Robert Carr <[e-mail]>  Wed, 04 Feb 2015 17:51:58 +0100
+
 platform-api (2.8.1+15.04.20150306-0ubuntu1) vivid; urgency=medium
 
   [ Ricardo Mendoza ]

=== modified file 'debian/control'
--- debian/control	2015-02-02 11:46:55 +0000
+++ debian/control	2015-03-18 10:04:03 +0000
@@ -73,6 +73,7 @@
          libubuntu-application-api2,
          ubuntu-application-api2-touch (= ${binary:Version}),
          ubuntu-application-api2-desktop (= ${binary:Version}),
+         libmirclient-dev,
          ${misc:Depends},
 Suggests: libubuntu-application-api-doc,
 Description: Ubuntu Application API for system level capabilities (development)

=== modified file 'debian/libubuntu-application-api2.symbols'
--- debian/libubuntu-application-api2.symbols	2014-10-01 17:55:57 +0000
+++ debian/libubuntu-application-api2.symbols	2015-03-18 10:04:03 +0000
@@ -8,6 +8,7 @@
  u_application_id_destroy@Base 0.18.1daily13.06.21
  u_application_id_new_from_stringn@Base 0.18.1daily13.06.21
  u_application_init@Base 2.0.0+14.10.20140612
+ u_application_instance_get_mir_connection@Base 2.8.0
  u_application_instance_new_from_description_with_options@Base 0.18.1daily13.06.21
  u_application_lifecycle_delegate_new@Base 0.18.1daily13.06.21
  u_application_lifecycle_delegate_ref@Base 0.18.1daily13.06.21
@@ -127,8 +128,8 @@
  ua_ui_window_properties_get_title@Base 0.18.1daily13.06.21
  ua_ui_window_properties_new_for_normal_window@Base 0.18.1daily13.06.21
  ua_ui_window_properties_set_dimensions@Base 2.0.0+14.10.20140612
+ ua_ui_window_properties_set_event_cb_and_ctx@Base 2.2.0+14.10.20140728
  ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.1daily13.06.21
- ua_ui_window_properties_set_event_cb_and_ctx@Base 2.2.0+14.10.20140728
  ua_ui_window_properties_set_role@Base 0.18.1daily13.06.21
  ua_ui_window_properties_set_titlen@Base 0.18.1daily13.06.21
  ua_ui_window_request_fullscreen@Base 0.18.1daily13.06.21

=== modified file 'include/ubuntu/application/instance.h'
--- include/ubuntu/application/instance.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/instance.h	2015-03-18 10:04:03 +0000
@@ -25,6 +25,8 @@
 #include <ubuntu/application/description.h>
 #include <ubuntu/application/options.h>
 
+#include <mir_toolkit/mir_client_library.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -49,6 +51,19 @@
     u_application_instance_new_from_description_with_options(
         UApplicationDescription *desc,
         UApplicationOptions *options);
+    
+    /**
+     * \brief Return the MirConnection associated with an application instance.
+     *        Use of MirConnection with the mir client API is now the preferred
+     *        way to create and use application surfaces. The ua_ui_ namespace
+     *        is now deprecated.
+     * \ingroup application_support
+     * \param[in] instance The instance from which to retreive the MirConnection
+     */
+    UBUNTU_DLL_PUBLIC MirConnection*
+    u_application_instance_get_mir_connection(
+        UApplicationInstance *instance);
+
 
     /**
      * \brief Increments the reference count of an application instance.

=== modified file 'include/ubuntu/application/ui/clipboard.h'
--- include/ubuntu/application/ui/clipboard.h	2014-09-22 18:04:53 +0000
+++ include/ubuntu/application/ui/clipboard.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_CLIPBOARD_H_
 #define UBUNTU_APPLICATION_UI_CLIPBOARD_H_
 
@@ -29,6 +34,7 @@
     /*
         FIXME: See ua_ui_get_clipboard_content
     */
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_set_clipboard_content(
         void* data,
@@ -45,6 +51,7 @@
         contains. It should provide a mapping between mime types (as plain ascii strings)
         and their respective data so the user is able to interpret the contents properly.
     */
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_get_clipboard_content(
         void** data,

=== modified file 'include/ubuntu/application/ui/form_factor.h'
--- include/ubuntu/application/ui/form_factor.h	2013-05-27 22:14:00 +0000
+++ include/ubuntu/application/ui/form_factor.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_FORM_FACTOR_H_
 #define UBUNTU_APPLICATION_UI_FORM_FACTOR_H_
 

=== modified file 'include/ubuntu/application/ui/options.h'
--- include/ubuntu/application/ui/options.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/ui/options.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_OPTIONS_H_
 #define UBUNTU_APPLICATION_UI_OPTIONS_H_
 
@@ -29,11 +34,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-   
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiFormFactor
     u_application_options_get_form_factor(
     	UApplicationOptions* options);
-   
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiStage
     u_application_options_get_stage(
     	UApplicationOptions* options);

=== modified file 'include/ubuntu/application/ui/session.h'
--- include/ubuntu/application/ui/session.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/ui/session.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_SESSION_H_
 #define UBUNTU_APPLICATION_UI_SESSION_H_
 
@@ -36,19 +41,23 @@
         U_USER_SESSION = 0,
         U_SYSTEM_SESSION = 1
     } UAUiSessionType;
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiSession*
     ua_ui_session_new_with_properties(
     	UAUiSessionProperties *properties);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiSessionProperties*
     ua_ui_session_properties_new();
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_session_properties_set_type(
         UAUiSessionProperties* properties,
         UAUiSessionType type);
 
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_session_properties_set_remote_pid(
         UAUiSessionProperties* properties,

=== modified file 'include/ubuntu/application/ui/stage.h'
--- include/ubuntu/application/ui/stage.h	2013-05-27 22:14:00 +0000
+++ include/ubuntu/application/ui/stage.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_STAGE_H_
 #define UBUNTU_APPLICATION_UI_STAGE_H_
 

=== modified file 'include/ubuntu/application/ui/window.h'
--- include/ubuntu/application/ui/window.h	2014-10-01 00:08:19 +0000
+++ include/ubuntu/application/ui/window.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_WINDOW_H_
 #define UBUNTU_APPLICATION_UI_WINDOW_H_
 
@@ -40,62 +45,75 @@
     /*
         Ownership of properties is given to the returned UAUiWindow
     */
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiWindow*
     ua_ui_window_new_for_application_with_properties(
     	UApplicationInstance *instance,
     	UAUiWindowProperties *properties);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_destroy(
     	UAUiWindow *window);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiWindowId
     ua_ui_window_get_id(
     	UAUiWindow *window);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))    
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_get_size(
         UAUiWindow *window,
         uint32_t *width,
         uint32_t *height);
 
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UStatus
     ua_ui_window_move(
         UAUiWindow *window,
         uint32_t new_x,
         uint32_t new_y);
 
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UStatus
     ua_ui_window_resize(
     	UAUiWindow *window,
     	uint32_t new_width,
     	uint32_t new_height);
     
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UStatus
     ua_ui_window_hide(
     	UAUiWindow *window);
     
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UStatus
     ua_ui_window_show(
     	UAUiWindow *window);
 
     // Deprecated. Prefer ua_ui_window_request_state.
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_request_fullscreen(
         UAUiWindow *window);
 
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC EGLNativeWindowType
     ua_ui_window_get_native_type(
         UAUiWindow *window);
 
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC int
     ua_ui_window_is_focused(
         UAUiWindow *window);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_request_state(
         UAUiWindow *window, UApplicationUiWindowState state);
 
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UApplicationUiWindowOrientation
     ua_ui_window_get_orientation(
         UAUiWindow *window);

=== modified file 'include/ubuntu/application/ui/window_orientation.h'
--- include/ubuntu/application/ui/window_orientation.h	2014-08-20 17:13:47 +0000
+++ include/ubuntu/application/ui/window_orientation.h	2015-03-18 10:04:03 +0000
@@ -14,6 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H
 #define UBUNTU_APPLICATION_UI_WINDOW_ORIENTATION_H
 

=== modified file 'include/ubuntu/application/ui/window_parent.h'
--- include/ubuntu/application/ui/window_parent.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/ui/window_parent.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_WINDOW_PARENT_H_
 #define UBUNTU_APPLICATION_UI_WINDOW_PARENT_H_
 
@@ -35,29 +40,36 @@
     } UApplicationUiWindowParentType;
     
     typedef struct UApplicationUiWindowParent;
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
     u_application_ui_window_parent_new_with_window(
     	UApplicationUiWindow *window);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
     u_application_ui_window_parent_new_with_application(
     	UApplicationInstance *instance);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
     u_application_ui_window_parent_new_for_session();
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UApplicationUiWindowParent*
     u_application_ui_window_parent_new_for_system();
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     u_application_ui_window_parent_destroy(
     	UApplicationUiWindowParent *parent);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UApplicationUiWindowParentType
     u_application_ui_window_parent_get_type(
     	UApplicationUiWindowParent *parent);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UApplicationUiWindow*
     u_application_ui_window_parent_get_parent_window(
     	UApplicationUiWindowParent *parent);

=== modified file 'include/ubuntu/application/ui/window_properties.h'
--- include/ubuntu/application/ui/window_properties.h	2014-07-15 12:41:35 +0000
+++ include/ubuntu/application/ui/window_properties.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_H_
 #define UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_H_
 
@@ -47,34 +52,41 @@
     typedef event_cb UAUiWindowEventCb;
 
     typedef void UAUiWindowProperties;
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiWindowProperties*
     ua_ui_window_properties_new_for_normal_window();
-   
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_destroy(
     	UAUiWindowProperties *properties);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_set_titlen(
     	UAUiWindowProperties *properties,
     	const char *title,
         size_t size);
-    
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC const char*
     ua_ui_window_properties_get_title(
     	UAUiWindowProperties *properties);
-  
+
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_set_role(
         UAUiWindowProperties *properties,
         UAUiWindowRole role);
 
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC UAUiWindowRole
     ua_ui_window_properties_get_role(
         UAUiWindowProperties *properties);
 
     // Deprecated! Use ua_ui_window_properties_set_event_cb_and_ctx instead.
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     UBUNTU_DLL_PUBLIC void
     ua_ui_window_properties_set_input_cb_and_ctx(
         UAUiWindowProperties *properties,
@@ -82,12 +94,14 @@
         void *ctx);
 
     UBUNTU_DLL_PUBLIC void
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     ua_ui_window_properties_set_event_cb_and_ctx(
         UAUiWindowProperties *properties,
         UAUiWindowEventCb cb,
         void *ctx);
 
     UBUNTU_DLL_PUBLIC void
+    __attribute__((__deprecated__("Use u_application_instance_get_mir_connection and the mir client library")))
     ua_ui_window_properties_set_dimensions(
         UAUiWindowProperties *properties,
         uint32_t width,

=== modified file 'include/ubuntu/application/ui/window_state.h'
--- include/ubuntu/application/ui/window_state.h	2013-08-18 20:33:22 +0000
+++ include/ubuntu/application/ui/window_state.h	2015-03-18 10:04:03 +0000
@@ -16,6 +16,11 @@
  * Authored by: Gerry Boland <[e-mail]>
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_WINDOW_STATE_H_
 #define UBUNTU_APPLICATION_UI_WINDOW_STATE_H_
 

=== modified file 'include/ubuntu/application/ui/window_type.h'
--- include/ubuntu/application/ui/window_type.h	2013-08-18 19:40:35 +0000
+++ include/ubuntu/application/ui/window_type.h	2015-03-18 10:04:03 +0000
@@ -17,6 +17,11 @@
  *              Thomas Voß <[e-mail]>           
  */
 
+/*
+ * DEPRECATED: In favor of u_application_instance_get_mir_connection
+ * and the mir client library
+ */
+
 #ifndef UBUNTU_APPLICATION_UI_WINDOW_TYPE_H_
 #define UBUNTU_APPLICATION_UI_WINDOW_TYPE_H_
 

=== modified file 'src/ubuntu/application/base_module.h'
--- src/ubuntu/application/base_module.h	2015-03-06 13:04:05 +0000
+++ src/ubuntu/application/base_module.h	2015-03-18 10:04:03 +0000
@@ -28,8 +28,8 @@
  */
 
 #define API_VERSION_MAJOR   "2"
-#define API_VERSION_MINOR   "8"
-#define API_VERSION_PATCH   "1"
+#define API_VERSION_MINOR   "9"
+#define API_VERSION_PATCH   "0"
 #define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
 
 namespace internal

=== modified file 'src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2014-10-15 13:29:15 +0000
+++ src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp	2015-03-18 10:04:03 +0000
@@ -141,6 +141,13 @@
     (void) instance;
 }
 
+MirConnection*
+u_application_instance_get_mir_connection(UApplicationInstance *u_instance)
+{
+    auto instance = uamc::Instance::from_u_application_instance(u_instance);
+    return instance->connection();
+}
+
 void ua_ui_set_clipboard_content(void* /*content*/, size_t /*content_size*/)
 {
     // TODO<papi>: Fix API and implement it

=== modified file 'src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	2014-11-14 15:30:22 +0000
+++ src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp	2015-03-18 10:04:03 +0000
@@ -65,6 +65,13 @@
     (void) instance;
 }
 
+MirConnection*
+u_application_instance_get_mir_connection(UApplicationInstance *instance)
+{
+    (void) instance;
+    return nullptr;
+}
+
 void ua_ui_set_clipboard_content(void* content, size_t content_size)
 {
     // TODO<mir,papi>: Implement. Probably need more arguments?

=== modified file 'src/ubuntu/application/desktop/module_version.h'
--- src/ubuntu/application/desktop/module_version.h	2015-03-06 13:04:05 +0000
+++ src/ubuntu/application/desktop/module_version.h	2015-03-18 10:04:03 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  8
-#define MODULE_VERSION_PATCH  1
+#define MODULE_VERSION_MINOR  9
+#define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/testbackend/module_version.h'
--- src/ubuntu/application/testbackend/module_version.h	2015-03-06 13:04:05 +0000
+++ src/ubuntu/application/testbackend/module_version.h	2015-03-18 10:04:03 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  8
-#define MODULE_VERSION_PATCH  1
+#define MODULE_VERSION_MINOR  9
+#define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/touch/module_version.h'
--- src/ubuntu/application/touch/module_version.h	2015-03-06 13:04:05 +0000
+++ src/ubuntu/application/touch/module_version.h	2015-03-18 10:04:03 +0000
@@ -1,3 +1,3 @@
 #define MODULE_VERSION_MAJOR  2
-#define MODULE_VERSION_MINOR  8
-#define MODULE_VERSION_PATCH  1
+#define MODULE_VERSION_MINOR  9
+#define MODULE_VERSION_PATCH  0

=== modified file 'src/ubuntu/application/ubuntu_application_api.cpp'
--- src/ubuntu/application/ubuntu_application_api.cpp	2015-01-22 19:37:40 +0000
+++ src/ubuntu/application/ubuntu_application_api.cpp	2015-03-18 10:04:03 +0000
@@ -85,6 +85,7 @@
 
 // UApplicationInstance
 IMPLEMENT_FUNCTION2(instance, UApplicationInstance*, u_application_instance_new_from_description_with_options, UApplicationDescription*, UApplicationOptions*);
+IMPLEMENT_FUNCTION1(connection, MirConnection*, u_application_instance_get_mir_connection, UApplicationInstance*);
 
 // Application Ui Helpers