[Merge] lp:~mir-team/platform-api/expose-mir-connection into lp:platform-api
Michał Sawicz
michal.sawicz at canonical.com
Mon Mar 2 15:10:29 UTC 2015
Diff comments:
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt 2015-02-03 11:58:47 +0000
> +++ CMakeLists.txt 2015-02-04 17:10:28 +0000
> @@ -3,7 +3,7 @@
> project(ubuntu-platform-api)
>
> set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
> -set(UBUNTU_PLATFORM_API_VERSION_MINOR 8)
> +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-02-03 11:59:30 +0000
> +++ debian/changelog 2015-02-04 17:10:28 +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 <robert.carr at canonical.com> Wed, 04 Feb 2015 17:51:58 +0100
> +
> platform-api (2.8.0+15.04.20150203-0ubuntu1) vivid; urgency=medium
>
> [ Ricardo Mendoza ]
>
> === modified file 'debian/control'
> --- debian/control 2015-02-02 11:46:55 +0000
> +++ debian/control 2015-02-04 17:10:28 +0000
> @@ -73,6 +73,7 @@
> libubuntu-application-api2,
> ubuntu-application-api2-touch (= ${binary:Version}),
> ubuntu-application-api2-desktop (= ${binary:Version}),
> + libmirclient-dev,
Ah, and please comment on the new dependency in the commit message.
> ${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-02-04 17:10:28 +0000
> @@ -8,6 +8,7 @@
> u_application_id_destroy at Base 0.18.1daily13.06.21
> u_application_id_new_from_stringn at Base 0.18.1daily13.06.21
> u_application_init at Base 2.0.0+14.10.20140612
> + u_application_instance_get_mir_connection at Base 2.8.0
> u_application_instance_new_from_description_with_options at Base 0.18.1daily13.06.21
> u_application_lifecycle_delegate_new at Base 0.18.1daily13.06.21
> u_application_lifecycle_delegate_ref at Base 0.18.1daily13.06.21
> @@ -127,8 +128,8 @@
> ua_ui_window_properties_get_title at Base 0.18.1daily13.06.21
> ua_ui_window_properties_new_for_normal_window at Base 0.18.1daily13.06.21
> ua_ui_window_properties_set_dimensions at Base 2.0.0+14.10.20140612
> + ua_ui_window_properties_set_event_cb_and_ctx at Base 2.2.0+14.10.20140728
> ua_ui_window_properties_set_input_cb_and_ctx at Base 0.18.1daily13.06.21
> - ua_ui_window_properties_set_event_cb_and_ctx at Base 2.2.0+14.10.20140728
> ua_ui_window_properties_set_role at Base 0.18.1daily13.06.21
> ua_ui_window_properties_set_titlen at Base 0.18.1daily13.06.21
> ua_ui_window_request_fullscreen at 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-02-04 17:10:28 +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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -16,6 +16,11 @@
> * Authored by: Gerry Boland <gerry.boland at canonical.com>
> */
>
> +/*
> + * 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-02-04 17:10:28 +0000
> @@ -17,6 +17,11 @@
> * Thomas Voß <thomas.voss at canonical.com>
> */
>
> +/*
> + * 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-02-03 11:58:47 +0000
> +++ src/ubuntu/application/base_module.h 2015-02-04 17:10:28 +0000
> @@ -28,7 +28,7 @@
> */
>
> #define API_VERSION_MAJOR "2"
> -#define API_VERSION_MINOR "8"
> +#define API_VERSION_MINOR "9"
> #define API_VERSION_PATCH "0"
> #define SO_SUFFIX ".so." API_VERSION_MAJOR "." API_VERSION_MINOR "." API_VERSION_PATCH
>
>
> === 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-02-04 17:10:28 +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-02-04 17:10:28 +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-02-03 11:58:47 +0000
> +++ src/ubuntu/application/desktop/module_version.h 2015-02-04 17:10:28 +0000
> @@ -1,3 +1,3 @@
> #define MODULE_VERSION_MAJOR 2
> -#define MODULE_VERSION_MINOR 8
> +#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-02-03 11:58:47 +0000
> +++ src/ubuntu/application/testbackend/module_version.h 2015-02-04 17:10:28 +0000
> @@ -1,3 +1,3 @@
> #define MODULE_VERSION_MAJOR 2
> -#define MODULE_VERSION_MINOR 8
> +#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-02-03 11:58:47 +0000
> +++ src/ubuntu/application/touch/module_version.h 2015-02-04 17:10:28 +0000
> @@ -1,3 +1,3 @@
> #define MODULE_VERSION_MAJOR 2
> -#define MODULE_VERSION_MINOR 8
> +#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-02-04 17:10:28 +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
>
>
--
https://code.launchpad.net/~mir-team/platform-api/expose-mir-connection/+merge/245054
Your team Ubuntu Phablet Team is subscribed to branch lp:platform-api.
More information about the Ubuntu-reviews
mailing list