Merge lp:~ricmm/platform-api/add-location-service-api-take-2 into lp:platform-api

[Ricardo Mendoza]

Add the location service API together with respective documentation.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:96
http://jenkins.qa.ubuntu.com/job/platform-api-ci/102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/72

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Over a year old, think this can die no? If not, please resubmit

review: Needs Resubmitting

Unmerged revisions

96. By Ricardo Mendoza on 2013-07-29

Merge trunk

95. By Thomas Voß on 2013-07-22

Merged trunk.

94. By Thomas Voß on 2013-07-14

Merged trunk.

93. By Thomas Voß on 2013-07-09

Fix lintian warnings for the doc-base package.

92. By Thomas Voß on 2013-07-09

Fix line-length in debian/control.

91. By Thomas Voß on 2013-07-09

[ Thomas Voß ]
[ Ubuntu daily release ]
* debian/*symbols: auto-update new symbols to released version
[ Thomas Voß ]
* Add first wave of doxygen documentation and make the documentation
  known to the packaging setup.
[ Ubuntu daily release ]
* Automatic snapshot from revision 87

90. By Thomas Voß on 2013-07-08

Update symbols file to account for removed symbols.

89. By Thomas Voß on 2013-07-08

 * Do not include full-paths in documentation.

88. By Thomas Voß on 2013-07-08

Add documentation for the location service.

87. By Thomas Voß on 2013-07-06

 * Refactored the src folder
 * Added the location service API

=== modified file 'debian/control'
--- debian/control	2013-07-18 23:55:59 +0000
+++ debian/control	2013-07-29 20:25:28 +0000
@@ -38,7 +38,8 @@
 Depends: ${misc:Depends},
 	 libplatform-api-headers,
 Description: Platform API for system level capabilities (API headers)
- This package provides the library headers for the hw-access parts of the Platform API.
+ This package provides the library headers for the hw-access parts
+ of the Platform API.
  .
  Unless a new backend for the Platform API is developed, packages
  should build depend on the libplatform-hardware-api-dev package instead, which
@@ -91,7 +92,8 @@
          ${shlibs:Depends},
          libhybris,
 Description: Hybris implementation of the hw-access parts of the Platform API (runtime)
- This package provides the hybris implementation of the hw-access parts of the Platform API.
+ This package provides the hybris implementation of the hw-access parts
+ of the Platform API.
  .
  The produced library should be used via libhybris, to communicate with the
  Android userspace, which is where the device drivers live.

=== modified file 'debian/libplatform-api1-doc.doc-base'
--- debian/libplatform-api1-doc.doc-base	2013-07-05 16:34:47 +0000
+++ debian/libplatform-api1-doc.doc-base	2013-07-29 20:25:28 +0000
@@ -1,8 +1,9 @@
-Document: ubuntu-platform-api 
+Document: ubuntu-platform-api
 Title: Ubuntu Platform API Reference Documentation
 Author: Thomas Voß
 Abstract: This is the reference documentation for the Ubuntu Platform API
 Section: Debian
+
 Format: HTML
 Index: /usr/share/doc/ubuntu-platform-api/html/index.html
 Files: /usr/share/doc/ubuntu-platform-api/html/*.html

=== modified file 'debian/libubuntu-application-api1.symbols'
--- debian/libubuntu-application-api1.symbols	2013-07-17 14:29:04 +0000
+++ debian/libubuntu-application-api1.symbols	2013-07-29 20:25:28 +0000
@@ -17,6 +17,34 @@
  u_application_options_get_form_factor@Base 0.18.1daily13.06.21
  u_application_options_get_stage@Base 0.18.1daily13.06.21
  u_application_options_new_from_cmd_line@Base 0.18.1daily13.06.21
+ ua_location_heading_update_get_timestamp@Base 0replaceme
+ ua_location_heading_update_ref@Base 0replaceme
+ ua_location_heading_update_unref@Base 0replaceme
+ ua_location_position_update_get_altitude_in_meter@Base 0replaceme
+ ua_location_position_update_get_heading_in_degree@Base 0replaceme
+ ua_location_position_update_get_latitude_in_degree@Base 0replaceme
+ ua_location_position_update_get_longitude_in_degree@Base 0replaceme
+ ua_location_position_update_get_timestamp@Base 0replaceme
+ ua_location_position_update_has_altitude@Base 0replaceme
+ ua_location_position_update_ref@Base 0replaceme
+ ua_location_position_update_unref@Base 0replaceme
+ ua_location_service_create_session_for_high_accuracy@Base 0replaceme
+ ua_location_service_create_session_for_low_accuracy@Base 0replaceme
+ ua_location_service_session_ref@Base 0replaceme
+ ua_location_service_session_set_heading_updates_handler@Base 0replaceme
+ ua_location_service_session_set_position_updates_handler@Base 0replaceme
+ ua_location_service_session_set_velocity_updates_handler@Base 0replaceme
+ ua_location_service_session_start_heading_updates@Base 0replaceme
+ ua_location_service_session_start_position_updates@Base 0replaceme
+ ua_location_service_session_start_velocity_updates@Base 0replaceme
+ ua_location_service_session_stop_heading_updates@Base 0replaceme
+ ua_location_service_session_stop_position_updates@Base 0replaceme
+ ua_location_service_session_stop_velocity_updates@Base 0replaceme
+ ua_location_service_session_unref@Base 0replaceme
+ ua_location_velocity_update_get_timestamp@Base 0replaceme
+ ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0replaceme
+ ua_location_velocity_update_ref@Base 0replaceme
+ ua_location_velocity_update_unref@Base 0replaceme
  ua_sensors_accelerometer_disable@Base 0.18.1daily13.06.21
  ua_sensors_accelerometer_enable@Base 0.18.1daily13.06.21
  ua_sensors_accelerometer_get_max_value@Base 0.18.1daily13.06.21

=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2013-07-05 09:13:31 +0000
+++ doc/Doxyfile.in	2013-07-29 20:25:28 +0000
@@ -119,7 +119,7 @@
 # path before files name in the file list and in the header files. If set
 # to NO the shortest path that makes the file name unique will be used.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO 
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
 # can be used to strip a user-defined part of the path. Stripping is
@@ -1293,7 +1293,7 @@
 # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
 # generate Latex output.
 
-GENERATE_LATEX         = NO
+GENERATE_LATEX         = YES
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1319,7 +1319,7 @@
 # LaTeX documents. This may be useful for small projects and may help to
 # save some trees in general.
 
-COMPACT_LATEX          = NO
+COMPACT_LATEX          = YES
 
 # The PAPER_TYPE tag can be used to set the paper type that is used
 # by the printer. Possible values are: a4, letter, legal and
@@ -1364,20 +1364,20 @@
 # running if errors occur, instead of asking the user for help.
 # This option is also used when generating formulas in HTML.
 
-LATEX_BATCHMODE        = NO
+LATEX_BATCHMODE        = YES
 
 # If LATEX_HIDE_INDICES is set to YES then doxygen will not
 # include the index chapters (such as File Index, Compound Index, etc.)
 # in the output.
 
-LATEX_HIDE_INDICES     = NO
+LATEX_HIDE_INDICES     = YES
 
 # If LATEX_SOURCE_CODE is set to YES then doxygen will include
 # source code with syntax highlighting in the LaTeX output.
 # Note that which sources are shown also depends on other settings
 # such as SOURCE_BROWSER.
 
-LATEX_SOURCE_CODE      = NO
+LATEX_SOURCE_CODE      = YES
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See

=== modified file 'include/ubuntu/application/CMakeLists.txt'
--- include/ubuntu/application/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ include/ubuntu/application/CMakeLists.txt	2013-07-29 20:25:28 +0000
@@ -14,5 +14,6 @@
   DESTINATION include/ubuntu/application
 )
 
+add_subdirectory(location)
 add_subdirectory(sensors)
 add_subdirectory(ui)

=== added directory 'include/ubuntu/application/location'
=== added file 'include/ubuntu/application/location/CMakeLists.txt'
--- include/ubuntu/application/location/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/location/CMakeLists.txt	2013-07-29 20:25:28 +0000
@@ -0,0 +1,14 @@
+set(
+  UBUNTU_APPLICATION_SENSORS_HEADERS
+
+  heading_update.h
+  position_update.h
+  service.h
+  session.h
+  velocity_update.h
+)
+
+install(
+  FILES ${UBUNTU_APPLICATION_SENSORS_HEADERS}
+  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/location
+)
\ No newline at end of file

=== added file 'include/ubuntu/application/location/heading_update.h'
--- include/ubuntu/application/location/heading_update.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/location/heading_update.h	2013-07-29 20:25:28 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_LOCATION_HEADING_UPDATE_H_
+#define UBUNTU_APPLICATION_LOCATION_HEADING_UPDATE_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /**
+     * \brief Opaque type encapsulating a heading update.
+     * \ingroup location_service
+     */
+    typedef struct UbuntuApplicationLocationHeadingUpdate UALocationHeadingUpdate;
+
+    /**
+     * \brief Increments the reference count of the heading update instance.
+     * \ingroup location_service
+     * \param[in] update The heading update instance to increment the reference count for.
+     */
+    void
+    ua_location_heading_update_ref(
+        UALocationHeadingUpdate *update);
+
+    /**
+     * \brief Decrements the reference count of the heading update instance.
+     * \ingroup location_service
+     * \param[in] update The heading update instance to decrement the reference count for.
+     */
+    void
+    ua_location_heading_update_unref(
+        UALocationHeadingUpdate *update);
+
+    /**
+     * \brief Queries the timestamp of the heading update.
+     * \ingroup location_service
+     * \returns The timestamp of the heading update in [µs].
+     * \param[in] update The heading update instance to be queried.
+     */
+    uint64_t
+    ua_location_heading_update_get_timestamp(
+        UALocationHeadingUpdate *update);
+
+    /**
+     * \brief Queries the new heading from the update.
+     * \ingroup location_service
+     * \returns The new heading from the update in [°].
+     * \param[in] update The heading update instance to be queried.
+     */
+    double
+    ua_location_position_update_get_heading_in_degree(
+        UALocationHeadingUpdate *update);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_LOCATION_HEADING_UPDATE_H_

=== added file 'include/ubuntu/application/location/position_update.h'
--- include/ubuntu/application/location/position_update.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/location/position_update.h	2013-07-29 20:25:28 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_LOCATION_POSITION_UPDATE_H_
+#define UBUNTU_APPLICATION_LOCATION_POSITION_UPDATE_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /**
+     * \brief Opaque type encapsulating a location update.
+     * \ingroup location_service
+     */
+    typedef struct UbuntuApplicationLocationPositionUpdate UALocationPositionUpdate;
+
+    /**
+     * \brief Increments the reference count of the position update instance.
+     * \ingroup location_service
+     * \param[in] update The position update instance to increment the reference count for.
+     */
+    void
+    ua_location_position_update_ref(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Decrements the reference count of the position update instance.
+     * \ingroup location_service
+     * \param[in] update The position update instance to decrement the reference count for.
+     */
+    void
+    ua_location_position_update_unref(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Queries the timestamp of the position update.
+     * \ingroup location_service
+     * \returns The timestamp of the position update in [µs].
+     * \param[in] update The position update instance to be queried.
+     */
+    uint64_t
+    ua_location_position_update_get_timestamp(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Queries the latitude contained in the position update.
+     * \ingroup location_service
+     * \returns The latitude of the position update in [°].
+     * \param[in] update The position update instance to be queried.
+     */
+    double
+    ua_location_position_update_get_latitude_in_degree(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Queries the longitude contained in the position update.
+     * \ingroup location_service
+     * \returns The longitude of the position update in [°].
+     * \param[in] update The position update instance to be queried.
+     */
+    double
+    ua_location_position_update_get_longitude_in_degree(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Checks if the position update contains an altitude.
+     * \ingroup location_service
+     * \returns TRUE if the update contains an altitude, else FALSE.
+     * \param[in] update The position update instance to be queried.
+     */
+    bool
+    ua_location_position_update_has_altitude(
+        UALocationPositionUpdate *update);
+
+    /**
+     * \brief Queries the altitude contained in the position update.
+     * \ingroup location_service
+     * \returns The altitude of the position update in [m].
+     * \param[in] update The position update instance to be queried.
+     */
+    double
+    ua_location_position_update_get_altitude_in_meter(
+        UALocationPositionUpdate *update);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_LOCATION_POSITION_UPDATE_H_

=== added file 'include/ubuntu/application/location/service.h'
--- include/ubuntu/application/location/service.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/location/service.h	2013-07-29 20:25:28 +0000
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_LOCATION_SERVICE_H_
+#define UBUNTU_APPLICATION_LOCATION_SERVICE_H_
+
+#include "ubuntu/application/location/session.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+    /**
+     * \defgroup location_service Functions and types to provide location services to applications.
+     *
+     *  Applications in Ubuntu do not access positioning hardware
+     *  directly but instead rely on a system-wide location service to
+     *  be provided with position, heading and velocity updates. An
+     *  application that wants to receive position, heading or
+     *  velocity updates needs to start a session with the location
+     *  service and specify its requirements with the help
+     *  UALocationServiceRequirementsFlags. After the session has been
+     *  created, position, heading and velocity updates need to be
+     *  started by the application for its session. The actual updates
+     *  are delivered via callbacks. Please note that the location
+     *  service caches updates as good as possible. That is, if an
+     *  application is only interested in a single position fix, and a
+     *  reasonable fix is already known to the service, the
+     *  information is immediately delivered to the application when
+     *  the respecitve updates are started.
+     *
+     */
+
+    /**
+     * \brief Application-specific requirements.
+     * \ingroup location_service
+     */
+    typedef enum
+    {
+        UA_LOCATION_SERVICE_REQUIRE_ALTITUDE = 1 << 0, /**< The application requires altitude updates. */
+        UA_LOCATION_SERVICE_REQUIRE_HEADING = 1 << 1, /**< The application requires heading updates. */
+        UA_LOCATION_SERVICE_REQUIRE_VELOCITY = 1 << 2 /**< The application requires velocity updates. */
+    } UbuntuApplicationLocationServiceRequirement;
+
+    typedef UbuntuApplicationLocationServiceRequirement UALocationServiceRequirement;
+
+    /**
+     * \brief Bitfield type for summarizing an application's requirements.
+     * \ingroup location_service
+     */
+    typedef unsigned int UALocationServiceRequirementsFlags;
+
+    /**
+     * \brief Creates a new session with the location service for low positional accuracy requirements.
+     * \returns A new session or NULL if the requirements cannot be
+     * satisfied or if the app lacks permissions to access the
+     * location service.
+     * \param[in] Bitfield describing the application's requirements.
+     */
+    UALocationServiceSession*
+    ua_location_service_create_session_for_low_accuracy(
+        UALocationServiceRequirementsFlags flags);
+
+    /**
+     * \brief Creates a new session with the location service for high positional accuracy requirements.
+     * \returns A new session or NULL if the requirements cannot be
+     * satisfied or if the app lacks permissions to access the
+     * location service.
+     * \param[in] Bitfield describing the application's requirements.
+     */
+    UALocationServiceSession*
+    ua_location_service_create_session_for_high_accuracy(
+        UALocationServiceRequirementsFlags flags);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_LOCATION_SERVICE_H_

=== added file 'include/ubuntu/application/location/session.h'
--- include/ubuntu/application/location/session.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/location/session.h	2013-07-29 20:25:28 +0000
@@ -0,0 +1,169 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_LOCATION_SESSION_H_
+#define UBUNTU_APPLICATION_LOCATION_SESSION_H_
+
+#include "ubuntu/status.h"
+#include "ubuntu/application/location/heading_update.h"
+#include "ubuntu/application/location/position_update.h"
+#include "ubuntu/application/location/velocity_update.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /**
+     * \brief Opaque type encapsulating a session with the location service.
+     * \ingroup location_service
+     */
+    typedef struct UbuntuApplicationLocationServiceSession UALocationServiceSession;
+
+    /**
+     * \brief Callback type that is invoked for position updates.
+     * \ingroup location_service
+     */
+
+    typedef void (*UALocationServiceSessionPositionUpdatesHandler)(UALocationPositionUpdate *position);
+
+    /**
+     * \brief Callback type that is invoked for heading updates.
+     * \ingroup location_service
+     */
+    typedef void (*UALocationServiceSessionHeadingUpdatesHandler)(UALocationHeadingUpdate *heading);
+
+    /**
+     * \brief Callback type that is invoked for velocity updates.
+     * \ingroup location_service
+     */
+    typedef void (*UALocationServiceSessionVelocityUpdatesHandler)(UALocationVelocityUpdate *heading);
+
+    /**
+     * \brief Increments the reference count of the session instance.
+     * \ingroup location_service
+     * \param[in] session The session instance to increment the reference count for.
+     */
+    void
+    ua_location_service_session_ref(
+        UALocationServiceSession *session);
+
+    /**
+     * \brief Decrements the reference count of the session instance.
+     * \ingroup location_service
+     * \param[in] session The session instance to decrement the reference count for.
+     */
+    void
+    ua_location_service_session_unref(
+        UALocationServiceSession *session);
+
+    /**
+     * \brief Installs an app-specific position update handler for the session.
+     * \ingroup location_service
+     * \param[in] session The session instance to install the handler for.
+     * \param[in] handler The position update handler.
+     */
+    void
+    ua_location_service_session_set_position_updates_handler(
+        UALocationServiceSession *session,
+        UALocationServiceSessionPositionUpdatesHandler *handler);
+
+    /**
+     * \brief Installs an app-specific heading update handler for the session.
+     * \ingroup location_service
+     * \param[in] session The session instance to install the handler for.
+     * \param[in] handler The heading update handler.
+     */
+    void
+    ua_location_service_session_set_heading_updates_handler(
+        UALocationServiceSession *session,
+        UALocationServiceSessionHeadingUpdatesHandler *handler);
+
+    /**
+     * \brief Installs an app-specific velocity update handler for the session.
+     * \ingroup location_service
+     * \param[in] session The session instance to install the handler for.
+     * \param[in] handler The velocity update handler.
+     */
+    void
+    ua_location_service_session_set_velocity_updates_handler(
+        UALocationServiceSession *session,
+        UALocationServiceSessionVelocityUpdatesHandler *handler);
+
+    /**
+     * \brief Starts position updates for the supplied session.
+     * \ingroup location_service
+     * \returns U_STATUS_SUCCESS if the updates were successfully started on the service side, else U_STATUS_ERROR.
+     * \param[in] session The session instance to start position updates for.
+     */
+    UStatus
+    ua_location_service_session_start_position_updates(
+        UALocationServiceSession *session);
+
+    /**
+     * \brief Stops position updates for the supplied session.
+     * \ingroup location_service
+     * \param[in] session The session instance to stop position updates for.
+     */
+    void
+    ua_location_service_session_stop_position_updates(
+        UALocationServiceSession *session);
+
+    /**
+     * \brief Starts heading updates for the supplied session.
+     * \ingroup location_service
+     * \returns U_STATUS_SUCCESS if the updates were successfully started on the service side, else U_STATUS_ERROR.
+     * \param[in] session The session instance to start heading updates for.
+     */
+    UStatus
+    ua_location_service_session_start_heading_updates(
+        UALocationServiceSession *session);
+
+    /**
+     * \brief Stops heading updates for the supplied session.
+     * \ingroup location_service
+     * \param[in] session The session instance to stop heading updates for.
+     */
+    void
+    ua_location_service_session_stop_heading_updates(
+        UALocationServiceSession *session);
+
+    /**
+     * \brief Starts velocity updates for the supplied session.
+     * \ingroup location_service
+     * \returns U_STATUS_SUCCESS if the updates were successfully started on the service side, else U_STATUS_ERROR.
+     * \param[in] session The session instance to start velocity updates for.
+     */
+    UStatus
+    ua_location_service_session_start_velocity_updates(
+        UALocationServiceSession *session);
+
+    /**
+     * \brief Stops velocity updates for the supplied session.
+     * \ingroup location_service
+     * \param[in] session The session instance to stop velocity updates for.
+     */
+    void
+    ua_location_service_session_stop_velocity_updates(
+        UALocationServiceSession *session);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_LOCATION_SESSION_H_

=== added file 'include/ubuntu/application/location/velocity_update.h'
--- include/ubuntu/application/location/velocity_update.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/application/location/velocity_update.h	2013-07-29 20:25:28 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#ifndef UBUNTU_APPLICATION_LOCATION_VELOCITY_UPDATE_H_
+#define UBUNTU_APPLICATION_LOCATION_VELOCITY_UPDATE_H_
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+    /**
+     * \brief Opaque type encapsulating a velocity update.
+     * \ingroup location_service
+     */
+    typedef struct UbuntuApplicationLocationVelocityUpdate UALocationVelocityUpdate;
+
+    /**
+     * \brief Increments the reference count of the velocity update instance.
+     * \ingroup location_service
+     * \param[in] update The velocity update instance to increment the reference count for.
+     */
+    void
+    ua_location_velocity_update_ref(
+        UALocationVelocityUpdate *update);
+
+    /**
+     * \brief Decrements the reference count of the velocity update instance.
+     * \ingroup location_service
+     * \param[in] update The velocity update instance to decrement the reference count for.
+     */
+    void
+    ua_location_velocity_update_unref(
+        UALocationVelocityUpdate *update);
+
+    /**
+     * \brief Queries the timestamp of the velocity update.
+     * \ingroup location_service
+     * \returns The timestamp of the position update in [µs].
+     * \param[in] update The velocity update instance to be queried.
+     */
+    uint64_t
+    ua_location_velocity_update_get_timestamp(
+        UALocationVelocityUpdate *update);
+
+    /**
+     * \brief Queries the velocity contained in the position update.
+     * \ingroup location_service
+     * \returns The velocity in the position update in [m/s].
+     * \param[in] update The velocity update instance to be queried.
+     */
+    double
+    ua_location_velocity_update_get_velocity_in_meters_per_second(
+        UALocationVelocityUpdate *update);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // UBUNTU_APPLICATION_LOCATION_VELOCITY_UPDATE_H_

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-06-17 23:37:58 +0000
+++ src/CMakeLists.txt	2013-07-29 20:25:28 +0000
@@ -2,18 +2,4 @@
   ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-if(ENABLE_HYBRIS_IMPLEMENTATION)
-  add_subdirectory(hybris/)
-endif()
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION OR ENABLE_MIRCLIENT_IMPLEMENTATION)
-  add_subdirectory(mircommon/)
-endif()
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION)
-  add_subdirectory(mirserver/)
-endif()
-
-if(ENABLE_MIRCLIENT_IMPLEMENTATION)
-  add_subdirectory(mirclient/)
-endif()
+add_subdirectory(ubuntu)
\ No newline at end of file

=== removed directory 'src/hybris'
=== removed file 'src/hybris/CMakeLists.txt'
--- src/hybris/CMakeLists.txt	2013-06-20 12:37:44 +0000
+++ src/hybris/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x")
-
-add_library(
-  ubuntu_application_api SHARED
-
-  ubuntu_application_api_hybris.cpp
-  ubuntu_application_sensors_hybris.cpp
-)
-
-add_library(
-  ubuntu_platform_hardware_api SHARED
-  ubuntu_platform_hardware_api.cpp
-)
-
-include_directories(
-  ${CMAKE_BINARY_DIR}/include
-)
-
-target_link_libraries(
-  ubuntu_application_api
-  hybris-common
-)
-
-target_link_libraries(
-  ubuntu_platform_hardware_api
-  hybris-common
-)
-
-set_target_properties(
-  ubuntu_application_api
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
-
-set_target_properties(
-  ubuntu_platform_hardware_api
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
-
-install(
-  TARGETS ubuntu_application_api  
-  ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-install(
-  TARGETS ubuntu_platform_hardware_api
-  ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-add_subdirectory(tests/)

=== removed file 'src/hybris/bridge.h'
--- src/hybris/bridge.h	2013-07-05 10:30:08 +0000
+++ src/hybris/bridge.h	1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voss <[e-mail]>
- *              Ricardo Mendoza <[e-mail]>
- */
-#ifndef BRIDGE_H_
-#define BRIDGE_H_
-
-#include <assert.h>
-#include <dlfcn.h>
-#include <stddef.h>
-
-#define HIDDEN_SYMBOL __attribute__ ((visibility ("hidden")))
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void *android_dlopen(const char *filename, int flag);
-extern void *android_dlsym(void *handle, const char *symbol);
-
-#ifdef __cplusplus
-}
-#endif
-
-namespace internal
-{
-
-struct HIDDEN_SYMBOL ToApplication
-{
-    static const char* path()
-    {
-        return "/system/lib/libubuntu_application_api.so";
-    }
-};
-
-struct HIDDEN_SYMBOL ToHardware
-{
-    static const char* path()
-    {
-        return "/system/lib/libubuntu_platform_hardware_api.so";
-    }
-};
-
-template<typename Scope = ToApplication>
-class HIDDEN_SYMBOL Bridge
-{
-  public:
-    static Bridge<Scope>& instance()
-    { 
-        static Bridge<Scope> bridge; 
-        return bridge; 
-    }
-
-    void* resolve_symbol(const char* symbol) const
-    {
-        return android_dlsym(lib_handle, symbol);
-    }
-
-  protected:
-    Bridge() : lib_handle(android_dlopen(Scope::path(), RTLD_LAZY))
-    {
-        assert(lib_handle && "Error loading ubuntu_application_api");
-    }
-
-    ~Bridge()
-    {
-        // TODO android_dlclose(libcamera_handle);
-    }
-
-    void* lib_handle;
-};
-
-}
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**********************************************************/
-/*********** Implementation starts here *******************/
-/**********************************************************/
-
-#define DLSYM(fptr, sym) if (*(fptr) == NULL) { *((void**)fptr) = (void *) internal::Bridge<>::instance().resolve_symbol(sym); }
-    
-#define IMPLEMENT_FUNCTION0(return_type, symbol)  \
-    return_type symbol()                          \
-    {                                             \
-        static return_type (*f)() = NULL;         \
-        DLSYM(&f, #symbol);                       \
-        return f();}
-
-#define IMPLEMENT_VOID_FUNCTION0(symbol)          \
-    void symbol()                                 \
-    {                                             \
-        static void (*f)() = NULL;                \
-        DLSYM(&f, #symbol);                       \
-        f();}
-    
-#define IMPLEMENT_FUNCTION1(return_type, symbol, arg1) \
-    return_type symbol(arg1 _1)                        \
-    {                                                  \
-        static return_type (*f)(arg1) = NULL;          \
-        DLSYM(&f, #symbol);                     \
-        return f(_1); }
-
-#define IMPLEMENT_SF_FUNCTION1(return_type, symbol, arg1) \
-    return_type symbol(arg1 _1)                        \
-    {                                                  \
-        static return_type (*f)(arg1) __attribute__((pcs("aapcs"))) = NULL; \
-        DLSYM(&f, #symbol);                     \
-        return f(_1); }
-
-
-#define IMPLEMENT_VOID_FUNCTION1(symbol, arg1)               \
-    void symbol(arg1 _1)                                     \
-    {                                                        \
-        static void (*f)(arg1) = NULL;                       \
-        DLSYM(&f, #symbol);                           \
-        f(_1); }
-
-#define IMPLEMENT_FUNCTION2(return_type, symbol, arg1, arg2)    \
-    return_type symbol(arg1 _1, arg2 _2)                        \
-    {                                                           \
-        static return_type (*f)(arg1, arg2) = NULL;             \
-        DLSYM(&f, #symbol);                              \
-        return f(_1, _2); }
-
-#define IMPLEMENT_VOID_FUNCTION2(symbol, arg1, arg2)            \
-    void symbol(arg1 _1, arg2 _2)                               \
-    {                                                           \
-        static void (*f)(arg1, arg2) = NULL;                    \
-        DLSYM(&f, #symbol);                              \
-        f(_1, _2); }
-
-#define IMPLEMENT_FUNCTION3(return_type, symbol, arg1, arg2, arg3)    \
-    return_type symbol(arg1 _1, arg2 _2, arg3 _3)                     \
-    {                                                                 \
-        static return_type (*f)(arg1, arg2, arg3) = NULL;             \
-        DLSYM(&f, #symbol);                                           \
-        return f(_1, _2, _3); } 
-
-#define IMPLEMENT_VOID_FUNCTION3(symbol, arg1, arg2, arg3)      \
-    void symbol(arg1 _1, arg2 _2, arg3 _3)                      \
-    {                                                           \
-        static void (*f)(arg1, arg2, arg3) = NULL;              \
-        DLSYM(&f, #symbol);                                     \
-        f(_1, _2, _3); }
-
-#define IMPLEMENT_VOID_FUNCTION4(symbol, arg1, arg2, arg3, arg4) \
-    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)              \
-    {                                                            \
-        static void (*f)(arg1, arg2, arg3, arg4) = NULL;         \
-        DLSYM(&f, #symbol);                                      \
-        f(_1, _2, _3, _4); }
-
-#define IMPLEMENT_FUNCTION4(return_type, symbol, arg1, arg2, arg3, arg4) \
-    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4)               \
-    {                                                                    \
-        static return_type (*f)(arg1, arg2, arg3, arg4) = NULL;          \
-        DLSYM(&f, #symbol);                                              \
-        return f(_1, _2, _3, _4); }
-
-#define IMPLEMENT_FUNCTION6(return_type, symbol, arg1, arg2, arg3, arg4, arg5, arg6) \
-    return_type symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6)         \
-    {                                                                                \
-        static return_type (*f)(arg1, arg2, arg3, arg4, arg5, arg6) = NULL;          \
-        DLSYM(&f, #symbol);                                                          \
-        return f(_1, _2, _3, _4, _5, _6); }
-
-#define IMPLEMENT_VOID_FUNCTION7(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7) \
-    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7) \
-    {                                                                   \
-        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7) = NULL; \
-        DLSYM(&f, #symbol);                                             \
-        f(_1, _2, _3, _4, _5, _6, _7); }
-
-#define IMPLEMENT_VOID_FUNCTION8(symbol, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) \
-    void symbol(arg1 _1, arg2 _2, arg3 _3, arg4 _4, arg5 _5, arg6 _6, arg7 _7, arg8 _8) \
-    {                                                                   \
-        static void (*f)(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8) = NULL; \
-        DLSYM(&f, #symbol);                                             \
-        f(_1, _2, _3, _4, _5, _6, _7, _8); }
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // BRIDGE_H_

=== removed directory 'src/hybris/tests'
=== removed file 'src/hybris/tests/CMakeLists.txt'
--- src/hybris/tests/CMakeLists.txt	2013-06-20 12:37:44 +0000
+++ src/hybris/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-set(SOURCES ubuntu_application_api_hybris.cpp)
-
-add_executable(test_android_ubuntu_app_api test_c_api.cpp)
-target_link_libraries(test_android_ubuntu_app_api ubuntu_application_api EGL GLESv2)
-
-add_executable(test_android_gps_api test_gps_api.cpp)
-target_link_libraries(test_android_gps_api ubuntu_platform_hardware_api)
-
-add_executable(test_android_ubuntu_app_api_multiple_surfaces test_multiple_surfaces_event_delivery.cpp)
-target_link_libraries(test_android_ubuntu_app_api_multiple_surfaces ubuntu_application_api EGL GLESv2)
-
-add_executable(test_android_sensors_api test_sensors_api.cpp)
-target_link_libraries(test_android_sensors_api ubuntu_application_api)
-
-add_executable(test_android_ubuntu_session_api test_session_c_api.cpp)
-target_link_libraries(test_android_ubuntu_session_api ubuntu_application_api)
-
-install(TARGETS
-	test_android_ubuntu_app_api
-	test_android_gps_api
-	test_android_ubuntu_app_api_multiple_surfaces
-	test_android_sensors_api
-	test_android_ubuntu_session_api
-	DESTINATION bin
-)

=== removed file 'src/hybris/tests/test_c_api.cpp'
--- src/hybris/tests/test_c_api.cpp	2013-05-21 22:14:40 +0000
+++ src/hybris/tests/test_c_api.cpp	1970-01-01 00:00:00 +0000
@@ -1,329 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/display.h>
-#include <ubuntu/application/ui/session.h>
-
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-
-struct View
-{
-    static const char* vertex_shader();
-    static const char* fragment_shader();
-
-    static GLuint load_shader(GLenum shaderType, const char* pSource);
-    static GLuint create_program(const char* pVertexSource, const char* pFragmentSource);
-    
-    static const GLfloat* triangle() 
-    { 
-        static const GLfloat result[] = 
-        {
-            -0.125f, -0.125f, 0.0f, 0.5f,
-            0.0f,  0.125f, 0.0f, 0.5f,
-            0.125f, -0.125f, 0.0f, 0.5f 
-        };
-
-        return result;
-    }
-    
-    static const GLfloat* color_triangle()
-    {
-        static const GLfloat result[] = 
-        {   
-            0.0f, 0.0f, 1.0f, 1.0f,
-            0.0f, 1.0f, 0.0f, 1.0f,
-            1.0f, 0.0f, 0.0f, 0.0f 
-        };
-
-        return result;
-    }
-
-    View(UAUiWindow* surface);
-
-    void render();
-    void step();    
-    
-    UAUiWindow* surface;
-    EGLDisplay egl_display;
-    EGLSurface egl_surface;
-    EGLConfig egl_config;
-    EGLContext egl_context;
-    
-    GLfloat rotation_angle;
-
-    GLuint gProgram;
-    GLuint gvPositionHandle, gvColorHandle;
-    GLuint rotation_uniform;
-    GLint num_vertex;
-    const GLfloat * vertex_data;
-    const GLfloat * color_data;
-};
-
-void on_new_event(void* ctx, const Event* ev)
-{
-}
-
-int main(int argc, char** argv)
-{
-    UApplicationOptions* options = u_application_options_new_from_cmd_line(argc, argv);
-
-    UApplicationDescription* desc = u_application_description_new();
-    UApplicationId* id = u_application_id_new_from_stringn("UbuntuApplicationCAPI", 21);
-    u_application_description_set_application_id(desc, id);
-    UApplicationInstance* instance = u_application_instance_new_from_description_with_options(desc, options);
-
-    UAUiSessionProperties* props = ua_ui_session_properties_new();
-    ua_ui_session_properties_set_type(props, U_USER_SESSION);
-
-    UAUiSession* ua_ui_session_new_with_properties(props);
-
-    UAUiDisplay* display = ua_ui_display_new_with_index(0);
-
-    printf("Display resolution: (x,y) = (%d,%d)\n",
-           ua_ui_display_query_horizontal_res(display),
-           ua_ui_display_query_vertical_res(display));
-   
-    UAUiWindowProperties* wprops = ua_ui_window_properties_new_for_normal_window();
-    ua_ui_window_properties_set_titlen(wprops, "Window 1", 8);
-    ua_ui_window_properties_set_role(wprops, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops, on_new_event, NULL);
-   
-    UAUiWindow* surface = ua_ui_window_new_for_application_with_properties(instance, wprops);
-    
-    View view(surface);
-    while(true)
-    {
-        view.render();
-        view.step();
-    }   
-}
-
-const char* View::vertex_shader()
-{
-    static const char shader[] =
-            "attribute vec4 vPosition;\n"
-            "attribute vec4 vColor;\n"
-            "uniform float angle;\n"
-            "varying vec4 colorinfo;\n"
-            "void main() {\n"
-            "  mat3 rot_z = mat3( vec3( cos(angle),  sin(angle), 0.0),\n"
-            "                     vec3(-sin(angle),  cos(angle), 0.0),\n"
-            "                     vec3(       0.0,         0.0, 1.0));\n"
-            "  gl_Position = vec4(rot_z * vPosition.xyz, 1.0);\n"
-            "  colorinfo = vColor;\n"
-            "}\n";
-
-    return shader;
-}
-
-const char* View::fragment_shader()
-{
-    static const char shader[] = 
-            "precision mediump float;\n"
-            "varying vec4 colorinfo;\n"
-            "void main() {\n"
-            "  gl_FragColor = colorinfo;\n"
-            "}\n";
-
-    return shader;
-}
-
-GLuint View::load_shader(GLenum shaderType, const char* pSource) {
-    GLuint shader = glCreateShader(shaderType);
-    if (shader) {
-        glShaderSource(shader, 1, &pSource, NULL);
-        glCompileShader(shader);
-        GLint compiled = 0;
-        glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
-        if (!compiled) {
-            GLint infoLen = 0;
-            glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
-            if (infoLen) {
-                char* buf = (char*) malloc(infoLen);
-                if (buf) {
-                    glGetShaderInfoLog(shader, infoLen, NULL, buf);
-                    fprintf(stderr, "Could not compile shader %d:\n%s\n",
-                            shaderType, buf);
-                    free(buf);
-                }
-                glDeleteShader(shader);
-                shader = 0;
-            }
-        }
-    } else
-    {
-        printf("Error, during shader creation: %i\n", glGetError());
-    }
-    return shader;
-}
-
-GLuint View::create_program(const char* pVertexSource, const char* pFragmentSource) {
-	GLuint vertexShader = load_shader(GL_VERTEX_SHADER, pVertexSource);
-	if (!vertexShader) {
-		printf("vertex shader not compiled\n");
-		return 0;
-	}
-
-	GLuint pixelShader = load_shader(GL_FRAGMENT_SHADER, pFragmentSource);
-	if (!pixelShader) {
-		printf("frag shader not compiled\n");
-		return 0;
-	}
-
-	GLuint program = glCreateProgram();
-	if (program) {
-		glAttachShader(program, vertexShader);
-		glAttachShader(program, pixelShader);
-		glLinkProgram(program);
-		GLint linkStatus = GL_FALSE;
-		glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
-		if (linkStatus != GL_TRUE) {
-			GLint bufLength = 0;
-			glGetProgramiv(program, GL_INFO_LOG_LENGTH, &bufLength);
-			if (bufLength) {
-				char* buf = (char*) malloc(bufLength);
-				if (buf) {
-					glGetProgramInfoLog(program, bufLength, NULL, buf);
-					fprintf(stderr, "Could not link program:\n%s\n", buf);
-					free(buf);
-				}
-			}
-			glDeleteProgram(program);
-			program = 0;
-		}
-	}
-	return program;
-}
-
-View::View(UAUiWindow* surface) 
-        : surface(surface),
-          rotation_angle(0.f),
-          num_vertex(3)
-{
-    // assert(eglBindAPI(EGL_OPENGL_ES_API) == EGL_TRUE);
-    egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    assert(egl_display != EGL_NO_DISPLAY);
-    EGLint major, minor;
-    if (EGL_FALSE == eglInitialize(egl_display, &major, &minor))
-    {
-        printf("egl error: problem initializing.\n");
-        exit(1);
-    }
-        
-    EGLint attribs[] = 
-            {
-                EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-                EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-                EGL_NONE 
-            };
-    EGLint n;
-    if (EGL_FALSE == eglChooseConfig(
-        egl_display,
-        attribs, 
-        &egl_config,
-        1, 
-        &n))
-    {
-        printf("egl error: Cannot choose configuration.\n");
-    }
-    
-    EGLint context_attribs[] = 
-            { 
-                EGL_CONTEXT_CLIENT_VERSION, 2, 
-                EGL_NONE
-            };
-
-    egl_context = eglCreateContext(
-        egl_display, 
-        egl_config, 
-        EGL_NO_CONTEXT, 
-        context_attribs);
-
-    assert(EGL_NO_CONTEXT != egl_context);
-
-    EGLNativeWindowType nativeWindow = ua_ui_window_get_native_type(surface);
-    egl_surface = eglCreateWindowSurface(egl_display, egl_config, nativeWindow, NULL);
-
-    eglMakeCurrent(
-        egl_display,
-        egl_surface,
-        egl_surface,
-        egl_context);
-
-    vertex_data = triangle();
-    color_data = color_triangle();
-    
-    gProgram = create_program(vertex_shader(), fragment_shader());
-    if (!gProgram)
-    {
-        printf("error making program\n");
-        return;
-    }
-    
-    gvPositionHandle = glGetAttribLocation(gProgram, "vPosition");
-    gvColorHandle = glGetAttribLocation(gProgram, "vColor");
-    
-    rotation_uniform = glGetUniformLocation(gProgram, "angle");
-    
-    return;
-}
-
-void View::render()
-{
-    glUseProgram(gProgram); 
-    
-    glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-    
-    glUniform1fv(rotation_uniform, 1, &rotation_angle);
-    
-    glVertexAttribPointer(
-        gvColorHandle,
-        num_vertex, 
-        GL_FLOAT, 
-        GL_FALSE, 
-        sizeof(GLfloat)*4, color_data);  
-    glVertexAttribPointer(
-        gvPositionHandle, 
-        num_vertex, 
-        GL_FLOAT, 
-        GL_FALSE, 
-        0, 
-        vertex_data);  
-    glEnableVertexAttribArray(gvPositionHandle);
-    glEnableVertexAttribArray(gvColorHandle);
-    
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, num_vertex); 
-    glDisableVertexAttribArray(gvPositionHandle);
-    glDisableVertexAttribArray(gvColorHandle);
-    
-    eglSwapBuffers(egl_display, egl_surface);
-}
-
-void View::step()
-{
-    rotation_angle += 0.01;
-}

=== removed file 'src/hybris/tests/test_gps_api.cpp'
--- src/hybris/tests/test_gps_api.cpp	2013-06-13 08:07:21 +0000
+++ src/hybris/tests/test_gps_api.cpp	1970-01-01 00:00:00 +0000
@@ -1,252 +0,0 @@
-/*
- * Copyright © 2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Daniel d'Andrada <[e-mail]>
- */
-#include <ubuntu/hardware/gps.h>
-
-#include <ctime>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-namespace ubuntu
-{
-class GPSTest
-{
-  public:
-    GPSTest();
-    ~GPSTest();
-    bool init_and_start();
-    bool stop();
-    void inject_time();
-
-    UHardwareGps u_hardware_gps;
-};
-
-void gps_location_cb(UHardwareGpsLocation* location, void* context)
-{
-    printf("gps_location_cb() called.\n");
-}
-
-void gps_status_cb(uint16_t status, void* context)
-{
-    switch(status)
-    {
-    case U_HARDWARE_GPS_STATUS_NONE:
-        printf("status: None\n");
-        break;
-    case U_HARDWARE_GPS_STATUS_SESSION_BEGIN:
-        printf("status: Session Begin\n");
-        break;
-    case U_HARDWARE_GPS_STATUS_SESSION_END:
-        printf("status: Session End\n");
-        break;
-    case U_HARDWARE_GPS_STATUS_ENGINE_ON:
-        printf("status: Engine On\n");
-        break;
-    case U_HARDWARE_GPS_STATUS_ENGINE_OFF:
-        printf("status: Engine Off\n");
-    default:
-        break;
-    };
-}
-
-void gps_sb_status_cb(UHardwareGpsSvStatus* sv_info, void* context)
-{
-    printf("gps_sb_status_cb() called, listing %d space vehicles\n", sv_info->num_svs);
-}
-
-void gps_nmea_cb(int64_t timestamp, const char* nmea, int length, void* context)
-{
-    char str[length+1];
-    memcpy(str, nmea, length);
-    str[length] = 0;
-    printf("gps_nmea_cb() - %s\n", str);
-}
-
-void gps_set_cabapilities_cb(uint32_t capabilities, void* context)
-{
-    printf("gps_set_cabapilities_cb() -");
-
-    if (capabilities & U_HARDWARE_GPS_CAPABILITY_SCHEDULING)
-        printf(" scheduling");
-    if (capabilities & U_HARDWARE_GPS_CAPABILITY_MSB)
-        printf(" MSB");
-    if (capabilities & U_HARDWARE_GPS_CAPABILITY_MSA)
-        printf(" MSA");
-    if (capabilities & U_HARDWARE_GPS_CAPABILITY_SINGLE_SHOT)
-        printf(" 'single shot'");
-    if (capabilities & U_HARDWARE_GPS_CAPABILITY_ON_DEMAND_TIME)
-        printf(" 'on demand time'");
-
-    printf("\n");
-}
-
-void gps_request_utc_time_cb(void* context)
-{
-    printf("gps_request_utc_time_cb() called.\n");
-    ((GPSTest*)context)->inject_time();
-}
-
-void gps_xtra_download_request_cb(void* context)
-{
-    printf("gps_xtra_download_request_cb() called.\n");
-}
-
-void agps_status_cb(UHardwareGpsAGpsStatus* status, void* context)
-{
-    printf("agps status -");
-
-    if (status->type == U_HARDWARE_GPS_AGPS_TYPE_SUPL)
-        printf(" SUPL");
-    else
-        printf(" C2K");
-
-    switch (status->status)
-    {
-    case U_HARDWARE_GPS_REQUEST_AGPS_DATA_CONN:
-        printf(", request AGPS data connection");
-        break;
-    case U_HARDWARE_GPS_RELEASE_AGPS_DATA_CONN:
-        printf(", release AGPS data connection");
-        break;
-    case U_HARDWARE_GPS_AGPS_DATA_CONNECTED:
-        printf(", request AGPS data connected");
-        break;
-    case U_HARDWARE_GPS_AGPS_DATA_CONN_DONE:
-        printf(", AGPS data connection done");
-        break;
-    default:
-    case U_HARDWARE_GPS_AGPS_DATA_CONN_FAILED:
-        printf(", AGPS data connection failed");
-        break;
-    }
-
-    printf(" ipaddr=%u\n", status->ipaddr);
-}
-
-void gps_notify_cb(UHardwareGpsNiNotification *notification, void* context)
-{
-    printf("gps_notify_cb() called.\n");
-}
-
-void agps_ril_request_set_id_cb(uint32_t flags, void* context)
-{
-    printf("agps_ril_request_set_id_cb() called.\n");
-}
-
-void agps_ril_request_refloc_cb(uint32_t flags, void* context)
-{
-    printf("agps_ril_request_refloc_cb() called.\n");
-}
-
-GPSTest::GPSTest()
-    : u_hardware_gps(NULL)
-{
-}
-
-GPSTest::~GPSTest()
-{
-    if (u_hardware_gps)
-        u_hardware_gps_delete(u_hardware_gps);
-}
-
-void GPSTest::inject_time()
-{
-    // A real implementation would inject time from some NTP server.
-    time_t t = time(0);
-    int64_t time_millis = (int64_t)t * (int64_t)1000;
-    u_hardware_gps_inject_time(u_hardware_gps,
-                           time_millis /*NTP time would go here*/,
-                           time_millis /*internal time when that NTP time was taken*/,
-                           10 /* possible deviation, in milliseconds*/);
-}
-
-bool GPSTest::init_and_start()
-{
-    UHardwareGpsParams gps_params;
-
-    gps_params.location_cb = gps_location_cb;
-    gps_params.status_cb = gps_status_cb;
-    gps_params.sv_status_cb = gps_sb_status_cb;
-    gps_params.nmea_cb = gps_nmea_cb;
-    gps_params.set_capabilities_cb = gps_set_cabapilities_cb;
-    gps_params.request_utc_time_cb = gps_request_utc_time_cb;
-    gps_params.xtra_download_request_cb = gps_xtra_download_request_cb;
-    gps_params.agps_status_cb = agps_status_cb;
-    gps_params.gps_ni_notify_cb = gps_notify_cb;
-    gps_params.request_setid_cb = agps_ril_request_set_id_cb;
-    gps_params.request_refloc_cb = agps_ril_request_refloc_cb;
-    gps_params.context = this;
-
-    UHardwareGps u_hardware_gps = u_hardware_gps_new(&gps_params);
-    if (!u_hardware_gps)
-    {
-        printf("GPS creation failed!\n");
-        return false;
-    }
-
-    bool ok = u_hardware_gps_start(u_hardware_gps);
-    if (!ok)
-    {
-        printf("GPS start up failed!\n");
-        return false;
-    }
-
-    return true;
-}
-
-bool GPSTest::stop()
-{
-    bool ok = u_hardware_gps_stop(u_hardware_gps);
-    if (!ok)
-        printf("failed when stopping GPS!\n");
-
-    return ok;
-}
-}
-
-void wait_for_sigint()
-{
-    sigset_t signals;
-    sigemptyset(&signals);
-    sigaddset(&signals, SIGINT);
-
-    int sig;
-    int result = sigwait(&signals, &sig);
-    if (result != 0)
-        printf("sigwait failed!\n");
-}
-
-int main(int argc, char** argv)
-{
-    int return_value = 0;
-    ubuntu::GPSTest test;
-
-    if (!test.init_and_start())
-        return 1;
-
-    printf("GPS initialized and started. Now waiting for callbacks or SIGINT (to quit).\n");
-    wait_for_sigint();
-    printf("Exiting...\n");
-
-    if (!test.stop())
-        return 1;
-
-    printf("GPS stopped.\n");
-    return 0;
-}

=== removed file 'src/hybris/tests/test_multiple_surfaces_event_delivery.cpp'
--- src/hybris/tests/test_multiple_surfaces_event_delivery.cpp	2013-05-21 22:14:40 +0000
+++ src/hybris/tests/test_multiple_surfaces_event_delivery.cpp	1970-01-01 00:00:00 +0000
@@ -1,351 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/display.h>
-#include <ubuntu/application/ui/session.h>
-
-#include <EGL/egl.h>
-#include <GLES2/gl2.h>
-#include <GLES2/gl2ext.h>
-
-#include <cassert>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-
-struct View
-{
-    static const char* vertex_shader();
-    static const char* fragment_shader();
-
-    static GLuint load_shader(GLenum shaderType, const char* pSource);
-    static GLuint create_program(const char* pVertexSource, const char* pFragmentSource);
-    
-    static const GLfloat* triangle() 
-    { 
-        static const GLfloat result[] = 
-        {
-            -0.125f, -0.125f, 0.0f, 0.5f,
-            0.0f,  0.125f, 0.0f, 0.5f,
-            0.125f, -0.125f, 0.0f, 0.5f 
-        };
-
-        return result;
-    }
-    
-    static const GLfloat* color_triangle()
-    {
-        static const GLfloat result[] = 
-        {   
-            0.0f, 0.0f, 1.0f, 1.0f,
-            0.0f, 1.0f, 0.0f, 1.0f,
-            1.0f, 0.0f, 0.0f, 0.0f 
-        };
-
-        return result;
-    }
-
-    View(UAUiWindow* surface);
-
-    void render();
-    void step();    
-    
-    UAUiWindow* surface;
-    EGLDisplay egl_display;
-    EGLSurface egl_surface;
-    EGLConfig egl_config;
-    EGLContext egl_context;
-    
-    GLfloat rotation_angle;
-
-    GLuint gProgram;
-    GLuint gvPositionHandle, gvColorHandle;
-    GLuint rotation_uniform;
-    GLint num_vertex;
-    const GLfloat * vertex_data;
-    const GLfloat * color_data;
-};
-
-void on_new_event(void* ctx, const Event* ev)
-{
-    int* surface = (int*) ctx;
-
-    printf("%s for surface: %d \n", __PRETTY_FUNCTION__, *surface);
-}
-
-int main(int argc, char** argv)
-{
-    UApplicationOptions* options = u_application_options_new_from_cmd_line(argc, argv);
-
-    UApplicationDescription* desc = u_application_description_new();
-    UApplicationId* id = u_application_id_new_from_stringn("UbuntuApplicationCAPI", 21);
-    u_application_description_set_application_id(desc, id);
-    UApplicationInstance* instance = u_application_instance_new_from_description_with_options(desc, options);
-
-    UAUiSessionProperties* props = ua_ui_session_properties_new();
-    ua_ui_session_properties_set_type(props, U_USER_SESSION);
-
-    UAUiSession* ua_ui_session_new_with_properties(props);
-
-    UAUiDisplay* display = ua_ui_display_new_with_index(0);
-
-    printf("Display resolution: (x,y) = (%d,%d)\n",
-           ua_ui_display_query_horizontal_res(display),
-           ua_ui_display_query_vertical_res(display));
-   
-    int i = 1, j = 2;
-
-    UAUiWindowProperties* wprops1 = ua_ui_window_properties_new_for_normal_window();
-    ua_ui_window_properties_set_titlen(wprops1, "Window 1", 8);
-    ua_ui_window_properties_set_role(wprops1, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops1, on_new_event, &i);
-   
-    UAUiWindow* surface1 = ua_ui_window_new_for_application_with_properties(instance, wprops1);
- 
-    UAUiWindowProperties* wprops2 = ua_ui_window_properties_new_for_normal_window();
-    ua_ui_window_properties_set_titlen(wprops2, "Window 2", 8);
-    ua_ui_window_properties_set_role(wprops2, U_MAIN_ROLE);
-    ua_ui_window_properties_set_input_cb_and_ctx(wprops2, on_new_event, &j);
-   
-    UAUiWindow* surface2 = ua_ui_window_new_for_application_with_properties(instance, wprops2);
-
-    View view1(surface1);
-    View view2(surface2);
-    while(true)
-    {
-        view1.render();
-        view2.render();
-        
-        view1.step();
-        view2.step();
-    }   
-}
-
-const char* View::vertex_shader()
-{
-    static const char shader[] =
-            "attribute vec4 vPosition;\n"
-            "attribute vec4 vColor;\n"
-            "uniform float angle;\n"
-            "varying vec4 colorinfo;\n"
-            "void main() {\n"
-            "  mat3 rot_z = mat3( vec3( cos(angle),  sin(angle), 0.0),\n"
-            "                     vec3(-sin(angle),  cos(angle), 0.0),\n"
-            "                     vec3(       0.0,         0.0, 1.0));\n"
-            "  gl_Position = vec4(rot_z * vPosition.xyz, 1.0);\n"
-            "  colorinfo = vColor;\n"
-            "}\n";
-
-    return shader;
-}
-
-const char* View::fragment_shader()
-{
-    static const char shader[] = 
-            "precision mediump float;\n"
-            "varying vec4 colorinfo;\n"
-            "void main() {\n"
-            "  gl_FragColor = colorinfo;\n"
-            "}\n";
-
-    return shader;
-}
-
-GLuint View::load_shader(GLenum shaderType, const char* pSource) {
-    GLuint shader = glCreateShader(shaderType);
-    if (shader) {
-        glShaderSource(shader, 1, &pSource, NULL);
-        glCompileShader(shader);
-        GLint compiled = 0;
-        glGetShaderiv(shader, GL_COMPILE_STATUS, &compiled);
-        if (!compiled) {
-            GLint infoLen = 0;
-            glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLen);
-            if (infoLen) {
-                char* buf = (char*) malloc(infoLen);
-                if (buf) {
-                    glGetShaderInfoLog(shader, infoLen, NULL, buf);
-                    fprintf(stderr, "Could not compile shader %d:\n%s\n",
-                            shaderType, buf);
-                    free(buf);
-                }
-                glDeleteShader(shader);
-                shader = 0;
-            }
-        }
-    } else
-    {
-        printf("Error, during shader creation: %i\n", glGetError());
-    }
-    return shader;
-}
-
-GLuint View::create_program(const char* pVertexSource, const char* pFragmentSource) {
-	GLuint vertexShader = load_shader(GL_VERTEX_SHADER, pVertexSource);
-	if (!vertexShader) {
-		printf("vertex shader not compiled\n");
-		return 0;
-	}
-
-	GLuint pixelShader = load_shader(GL_FRAGMENT_SHADER, pFragmentSource);
-	if (!pixelShader) {
-		printf("frag shader not compiled\n");
-		return 0;
-	}
-
-	GLuint program = glCreateProgram();
-	if (program) {
-		glAttachShader(program, vertexShader);
-		glAttachShader(program, pixelShader);
-		glLinkProgram(program);
-		GLint linkStatus = GL_FALSE;
-		glGetProgramiv(program, GL_LINK_STATUS, &linkStatus);
-		if (linkStatus != GL_TRUE) {
-			GLint bufLength = 0;
-			glGetProgramiv(program, GL_INFO_LOG_LENGTH, &bufLength);
-			if (bufLength) {
-				char* buf = (char*) malloc(bufLength);
-				if (buf) {
-					glGetProgramInfoLog(program, bufLength, NULL, buf);
-					fprintf(stderr, "Could not link program:\n%s\n", buf);
-					free(buf);
-				}
-			}
-			glDeleteProgram(program);
-			program = 0;
-		}
-	}
-	return program;
-}
-
-View::View(UAUiWindow* surface) 
-        : surface(surface),
-          rotation_angle(0.f),
-          num_vertex(3)
-{
-    // assert(eglBindAPI(EGL_OPENGL_ES_API) == EGL_TRUE);
-    egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    assert(egl_display != EGL_NO_DISPLAY);
-    EGLint major, minor;
-    if (EGL_FALSE == eglInitialize(egl_display, &major, &minor))
-    {
-        printf("egl error: problem initializing.\n");
-        exit(1);
-    }
-        
-    EGLint attribs[] = 
-            {
-                EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
-                EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-                EGL_NONE 
-            };
-    EGLint n;
-    if (EGL_FALSE == eglChooseConfig(
-        egl_display,
-        attribs, 
-        &egl_config,
-        1, 
-        &n))
-    {
-        printf("egl error: Cannot choose configuration.\n");
-    }
-    
-    EGLint context_attribs[] = 
-            { 
-                EGL_CONTEXT_CLIENT_VERSION, 2, 
-                EGL_NONE
-            };
-
-    egl_context = eglCreateContext(
-        egl_display, 
-        egl_config, 
-        EGL_NO_CONTEXT, 
-        context_attribs);
-
-    assert(EGL_NO_CONTEXT != egl_context);
-
-    EGLNativeWindowType nativeWindow = ua_ui_window_get_native_type(surface);
-    egl_surface = eglCreateWindowSurface(egl_display, egl_config, nativeWindow, NULL);
-
-    eglMakeCurrent(
-        egl_display,
-        egl_surface,
-        egl_surface,
-        egl_context);
-
-    vertex_data = triangle();
-    color_data = color_triangle();
-    
-    gProgram = create_program(vertex_shader(), fragment_shader());
-    if (!gProgram)
-    {
-        printf("error making program\n");
-        return;
-    }
-    
-    gvPositionHandle = glGetAttribLocation(gProgram, "vPosition");
-    gvColorHandle = glGetAttribLocation(gProgram, "vColor");
-    
-    rotation_uniform = glGetUniformLocation(gProgram, "angle");
-    
-    return;
-}
-
-void View::render()
-{
-    eglMakeCurrent(
-        egl_display,
-        egl_surface,
-        egl_surface,
-        egl_context);
-    
-    glUseProgram(gProgram); 
-    
-    glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-    
-    glUniform1fv(rotation_uniform, 1, &rotation_angle);
-    
-    glVertexAttribPointer(
-        gvColorHandle,
-        num_vertex, 
-        GL_FLOAT, 
-        GL_FALSE, 
-        sizeof(GLfloat)*4, color_data);  
-    glVertexAttribPointer(
-        gvPositionHandle, 
-        num_vertex, 
-        GL_FLOAT, 
-        GL_FALSE, 
-        0, 
-        vertex_data);  
-    glEnableVertexAttribArray(gvPositionHandle);
-    glEnableVertexAttribArray(gvColorHandle);
-    
-    glDrawArrays(GL_TRIANGLE_STRIP, 0, num_vertex); 
-    glDisableVertexAttribArray(gvPositionHandle);
-    glDisableVertexAttribArray(gvColorHandle);
-    
-    eglSwapBuffers(egl_display, egl_surface);
-}
-
-void View::step()
-{
-    rotation_angle += 0.01;
-}

=== removed file 'src/hybris/tests/test_sensors_api.cpp'
--- src/hybris/tests/test_sensors_api.cpp	2013-05-30 02:03:42 +0000
+++ src/hybris/tests/test_sensors_api.cpp	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Ricardo Mendoza <[e-mail]>
- */
-
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-
-void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context)
-{
-    printf("%s \n", __PRETTY_FUNCTION__);
-    printf("\ttime: %llu\n", uas_accelerometer_event_get_timestamp(event));
-    printf("\tx: %f\n", uas_accelerometer_event_get_acceleration_x(event));
-    printf("\ty: %f\n", uas_accelerometer_event_get_acceleration_y(event));
-    printf("\tz: %f\n", uas_accelerometer_event_get_acceleration_z(event));
-}
-
-void on_new_proximity_event(UASProximityEvent* event, void* context)
-{
-    printf("%s \n", __PRETTY_FUNCTION__);
-    printf("\ttime: %llu\n", uas_proximity_event_get_timestamp(event));
-
-    switch (uas_proximity_event_get_distance(event))
-    {
-        case U_PROXIMITY_NEAR:
-        {   
-            printf("\tdistance: NEAR\n");
-            break;
-        }
-        case U_PROXIMITY_FAR:
-        {
-            printf("\tdistance: FAR\n");
-            break;
-        }
-    }
-}
-
-void on_new_light_event(UASLightEvent* event, void* context)
-{
-    printf("%s \n", __PRETTY_FUNCTION__);
-    printf("\ttime: %llu\n", uas_light_event_get_timestamp(event));
-    printf("\tlight: %f\n", uas_light_event_get_light(event));
-}
-
-int main(int argc, char** argv)
-{
-    UASensorsAccelerometer* accelerometer = ua_sensors_accelerometer_new();
-    UASensorsProximity* proximity = ua_sensors_proximity_new();
-    UASensorsLight* ambientlight = ua_sensors_light_new();
-
-    ua_sensors_accelerometer_set_reading_cb(accelerometer,
-                                            on_new_accelerometer_event,
-                                            NULL);
-
-    ua_sensors_proximity_set_reading_cb(proximity,
-                                        on_new_proximity_event,
-                                        NULL);
-  
-    ua_sensors_light_set_reading_cb(ambientlight,
-                                    on_new_light_event,
-                                    NULL);
-
-    ua_sensors_accelerometer_enable(accelerometer);
-    ua_sensors_proximity_enable(proximity);
-    ua_sensors_light_enable(ambientlight);
-
-    while(true)
-    {
-    }
-}

=== removed file 'src/hybris/tests/test_session_c_api.cpp'
--- src/hybris/tests/test_session_c_api.cpp	2013-02-13 23:09:01 +0000
+++ src/hybris/tests/test_session_c_api.cpp	1970-01-01 00:00:00 +0000
@@ -1,229 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voß <[e-mail]>
- */
-
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-
-#include <getopt.h>
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <time.h>
-
-typedef union
-{
-    struct Components
-    {
-        uint8_t r;
-        uint8_t g;
-        uint8_t b;
-        uint8_t a;
-    } components;
-    uint32_t value;
-} Pixel;
-
-struct Config
-{
-    Config() : take_screencast_flag(0),
-               take_screenshot_flag(0)
-    {
-    }
-    
-    int take_screencast_flag;
-    int take_screenshot_flag;
-};
-
-void on_snapshot_completed(const void* pixel_data, unsigned int width, unsigned int height, unsigned int x, unsigned int y, unsigned int source_width, unsigned int source_height, unsigned int stride, void* context)
-{
-    static unsigned int counter = 0;
-    
-    printf("%s: (%p, %d, %d, %d) \n",
-           __PRETTY_FUNCTION__,
-           pixel_data,
-           width,
-           height,
-           stride);
-
-    static const char snapshot_pattern[] = "./snapshot_%I_%M_%S.ppm";
-    static const char frame_pattern[] = "./frame_%I_%M_%S.raw";
-  
-    char fn[256];
-
-    int take_screenshot = 1;
-    int take_screencast = 0;
-
-    if (context != NULL)
-    {
-        Config* config = (Config*) context;
-
-        take_screenshot = config->take_screenshot_flag;
-        take_screencast = config->take_screencast_flag;
-    }
-    
-    time_t curtime;
-    struct tm *loctime;
-    
-    curtime = time (NULL);        
-    loctime = localtime (&curtime);    
-    
-    static const char screenshot_file_mode[] = "w+";
-    static const char screencast_file_mode[] = "wb+";
-    
-    FILE* f = NULL;
-    if (take_screenshot)
-    {
-        strftime(fn, 256, snapshot_pattern, loctime);
-        f = fopen(fn, screenshot_file_mode);
-    } else if (take_screencast)
-    {
-        strftime(fn, 256, frame_pattern, loctime);
-        f = fopen(fn, screencast_file_mode);
-    }
-
-    if (!f)
-    {
-        printf("Problem opening file: %s \n", fn);
-        return;
-    }
-     
-    if (take_screenshot)
-    {
-        const unsigned int* p = static_cast<const unsigned int*>(pixel_data);
-        
-        fprintf(f, "P3\n%d %d\n%d\n\n", width, height, 255);
-        for(unsigned int i = 0; i < height; i++)
-        {
-            for(unsigned int j = 0; j < width; j++)
-            {
-                Pixel pixel; pixel.value = *p; ++p;
-                fprintf(
-                    f, "%d %d %d\t", 
-                    pixel.components.r,
-                    pixel.components.g,
-                    pixel.components.b);
-            }
-        }
-    }
-    else if (take_screencast)
-    {
-        fwrite(pixel_data, sizeof(unsigned int), width*height, f);
-        ubuntu_ui_session_snapshot_running_session_with_id(
-            -1,
-            on_snapshot_completed,
-            context);
-    }
-}
-
-void on_session_born(ubuntu_ui_session_properties props, void*)
-{
-    printf("%s:\n\t Id: %d \n\t Desktop file hint: %s \n",
-           __PRETTY_FUNCTION__,
-           ubuntu_ui_session_properties_get_application_instance_id(props),
-           ubuntu_ui_session_properties_get_desktop_file_hint(props));
-
-    ubuntu_ui_session_snapshot_running_session_with_id(
-        ubuntu_ui_session_properties_get_application_instance_id(props),
-        on_snapshot_completed,
-        NULL);
-}
-
-void on_session_focused(ubuntu_ui_session_properties props, void*)
-{
-    printf("%s:\n\t Id: %d \n\t Desktop file hint: %s \n",
-           __PRETTY_FUNCTION__,
-           ubuntu_ui_session_properties_get_application_instance_id(props),
-           ubuntu_ui_session_properties_get_desktop_file_hint(props));
-}
-
-void on_session_died(ubuntu_ui_session_properties props, void*)
-{
-    printf("%s:\n\t Id: %d \n\t Desktop file hint: %s \n",
-           __PRETTY_FUNCTION__,
-           ubuntu_ui_session_properties_get_application_instance_id(props),
-           ubuntu_ui_session_properties_get_desktop_file_hint(props));
-}
-
-
-
-Config parse_cmd_line(int argc, char** argv)
-{
-    Config config;
-    static struct option long_options[] = {
-        {"take-screencast", no_argument, &config.take_screencast_flag, 1},
-        {"take-screenshot", no_argument, &config.take_screenshot_flag, 1}
-    };
-
-    while (true)
-    {
-        int option_index = 0;
-        
-        int c = getopt_long(
-            argc, 
-            argv, 
-            "",
-            long_options, 
-            &option_index);
-
-        if (c == -1)
-            break;
-
-        switch (c)
-        {
-            case 0:
-                // No need to do anything here: Flag is set automatically.
-                break;
-            default:
-                break;
-        }
-    }
-
-    return config;
-}
-
-int main(int argc, char** argv)
-{
-    static const int complete_session_id = -1;
-
-    Config config = parse_cmd_line(argc, argv);
-
-    if (config.take_screenshot_flag || config.take_screencast_flag)
-    {
-        ubuntu_ui_session_snapshot_running_session_with_id(
-            complete_session_id,
-            on_snapshot_completed,
-            &config);
-
-        return 0;
-    }
-
-    ubuntu_ui_session_lifecycle_observer observer;
-
-    memset(&observer, 0, sizeof(observer));
-    observer.on_session_born = on_session_born;
-    observer.on_session_focused = on_session_focused;
-    observer.on_session_died = on_session_died;
-
-    ubuntu_ui_session_install_session_lifecycle_observer(&observer);
-
-    while(true)
-    {
-    }
-
-    return 0;
-}
-

=== removed file 'src/hybris/ubuntu_application_api_hybris.cpp'
--- src/hybris/ubuntu_application_api_hybris.cpp	2013-06-20 12:37:44 +0000
+++ src/hybris/ubuntu_application_api_hybris.cpp	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voss <[e-mail]>
- *              Ricardo Mendoza <[e-mail]>
- */
-
-#include <private/application/ui/ubuntu_application_ui.h>
-
-#include <ubuntu/ui/ubuntu_ui_session_service.h>
-
-// C APIs
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/clipboard.h>
-#include <ubuntu/application/ui/display.h>
-
-#include "bridge.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Session helpers
-IMPLEMENT_FUNCTION0(UAUiSessionProperties*, ua_ui_session_properties_new);
-IMPLEMENT_VOID_FUNCTION2(ua_ui_session_properties_set_type, UAUiSessionProperties*, UAUiSessionType);
-IMPLEMENT_VOID_FUNCTION2(ua_ui_session_properties_set_remote_pid, UAUiSessionProperties*, uint32_t);
-IMPLEMENT_FUNCTION1(UAUiSession*, ua_ui_session_new_with_properties, UAUiSessionProperties*);
-
-// Lifecycle helpers
-IMPLEMENT_FUNCTION0(UApplicationLifecycleDelegate*, u_application_lifecycle_delegate_new);
-IMPLEMENT_VOID_FUNCTION2(u_application_lifecycle_delegate_set_context, UApplicationLifecycleDelegate*, void*);
-IMPLEMENT_VOID_FUNCTION1(u_application_lifecycle_delegate_ref, UApplicationLifecycleDelegate*);
-IMPLEMENT_VOID_FUNCTION1(u_application_lifecycle_delegate_unref, UApplicationLifecycleDelegate*);
-IMPLEMENT_VOID_FUNCTION2(u_application_lifecycle_delegate_set_application_resumed_cb, UApplicationLifecycleDelegate*, u_on_application_resumed);
-IMPLEMENT_VOID_FUNCTION2(u_application_lifecycle_delegate_set_application_about_to_stop_cb, UApplicationLifecycleDelegate*, u_on_application_about_to_stop);
-
-// Application Helpers
-
-// UApplicationId
-IMPLEMENT_FUNCTION2(UApplicationId*, u_application_id_new_from_stringn, const char*, size_t);
-IMPLEMENT_VOID_FUNCTION1(u_application_id_destroy, UApplicationId*);
-IMPLEMENT_FUNCTION2(int, u_application_id_compare, UApplicationId*, UApplicationId*);
-
-// UApplicationDescription
-IMPLEMENT_FUNCTION0(UApplicationDescription*, u_application_description_new);
-IMPLEMENT_VOID_FUNCTION1(u_application_description_destroy, UApplicationDescription*);
-IMPLEMENT_VOID_FUNCTION2(u_application_description_set_application_id, UApplicationDescription*, UApplicationId*);
-IMPLEMENT_VOID_FUNCTION2(u_application_description_set_application_lifecycle_delegate, UApplicationDescription*, UApplicationLifecycleDelegate*);
-
-// UApplicationOptions
-IMPLEMENT_FUNCTION2(UApplicationOptions*, u_application_options_new_from_cmd_line, int, char**);
-IMPLEMENT_VOID_FUNCTION1(u_application_options_destroy, UApplicationOptions*);
-IMPLEMENT_FUNCTION1(UAUiFormFactor, u_application_options_get_form_factor, UApplicationOptions*);
-IMPLEMENT_FUNCTION1(UAUiStage, u_application_options_get_stage, UApplicationOptions*);
-
-// UApplicationInstance
-IMPLEMENT_FUNCTION2(UApplicationInstance*, u_application_instance_new_from_description_with_options, UApplicationDescription*, UApplicationOptions*);
-
-// Application Ui Helpers
-
-// Clipboard
-IMPLEMENT_VOID_FUNCTION2(ua_ui_set_clipboard_content, void*, size_t);
-IMPLEMENT_VOID_FUNCTION2(ua_ui_get_clipboard_content, void**, size_t*);
-
-// UAUiDisplay
-IMPLEMENT_FUNCTION1(UAUiDisplay*, ua_ui_display_new_with_index, size_t);
-IMPLEMENT_VOID_FUNCTION1(ua_ui_display_destroy, UAUiDisplay*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_ui_display_query_horizontal_res, UAUiDisplay*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_ui_display_query_vertical_res, UAUiDisplay*);
-IMPLEMENT_FUNCTION1(EGLNativeDisplayType, ua_ui_display_get_native_type, UAUiDisplay*);
-
-
-// UAUiWindowProperties
-IMPLEMENT_FUNCTION0(UAUiWindowProperties*, ua_ui_window_properties_new_for_normal_window);
-IMPLEMENT_VOID_FUNCTION1(ua_ui_window_properties_destroy, UAUiWindowProperties*);
-IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_titlen, UAUiWindowProperties*, const char*, size_t);
-IMPLEMENT_FUNCTION1(const char*, ua_ui_window_properties_get_title, UAUiWindowProperties*);
-IMPLEMENT_VOID_FUNCTION2(ua_ui_window_properties_set_role, UAUiWindowProperties*, UAUiWindowRole);
-IMPLEMENT_VOID_FUNCTION3(ua_ui_window_properties_set_input_cb_and_ctx, UAUiWindowProperties*, UAUiWindowInputEventCb, void*);
-
-// UAUiWindow
-IMPLEMENT_FUNCTION2(UAUiWindow*, ua_ui_window_new_for_application_with_properties, UApplicationInstance*, UAUiWindowProperties*);
-IMPLEMENT_VOID_FUNCTION1(ua_ui_window_destroy, UAUiWindow*);
-IMPLEMENT_FUNCTION3(UStatus, ua_ui_window_move, UAUiWindow*, uint32_t, uint32_t);
-IMPLEMENT_FUNCTION3(UStatus, ua_ui_window_resize, UAUiWindow*, uint32_t, uint32_t);
-IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_hide, UAUiWindow*);
-IMPLEMENT_FUNCTION1(UStatus, ua_ui_window_show, UAUiWindow*);
-IMPLEMENT_VOID_FUNCTION1(ua_ui_window_request_fullscreen, UAUiWindow*);
-IMPLEMENT_FUNCTION1(EGLNativeWindowType, ua_ui_window_get_native_type, UAUiWindow*);
-
-/* -------------------------------------------------------------------------- *
- * * * * * * * * * * * * * * * Deprecated API * * * * * * * * * * * * * * * * *
- * -------------------------------------------------------------------------- *
- */
-
-// Session service
-IMPLEMENT_FUNCTION1(int, ubuntu_ui_session_properties_get_application_instance_id, ubuntu_ui_session_properties);
-IMPLEMENT_FUNCTION1(int, ubuntu_ui_session_properties_get_application_stage_hint, ubuntu_ui_session_properties);
-IMPLEMENT_FUNCTION1(const char*, ubuntu_ui_session_properties_get_desktop_file_hint, ubuntu_ui_session_properties);
-IMPLEMENT_VOID_FUNCTION1(ubuntu_ui_session_install_session_lifecycle_observer, ubuntu_ui_session_lifecycle_observer*);
-IMPLEMENT_VOID_FUNCTION0(ubuntu_ui_session_unfocus_running_sessions);
-IMPLEMENT_VOID_FUNCTION1(ubuntu_ui_session_focus_running_session_with_id, int);
-IMPLEMENT_VOID_FUNCTION3(ubuntu_ui_session_snapshot_running_session_with_id, int, ubuntu_ui_session_service_snapshot_cb, void*); 
-IMPLEMENT_VOID_FUNCTION1(ubuntu_ui_session_trigger_switch_to_well_known_application, ubuntu_ui_well_known_application);
-IMPLEMENT_FUNCTION4(int32_t, ubuntu_ui_set_surface_trap, int, int, int, int);
-IMPLEMENT_VOID_FUNCTION1(ubuntu_ui_unset_surface_trap, int);
-IMPLEMENT_VOID_FUNCTION4(ubuntu_ui_report_osk_visible, int, int, int, int);
-IMPLEMENT_VOID_FUNCTION0(ubuntu_ui_report_osk_invisible);
-IMPLEMENT_VOID_FUNCTION0(ubuntu_ui_report_notification_visible);
-IMPLEMENT_VOID_FUNCTION0(ubuntu_ui_report_notification_invisible);
-IMPLEMENT_VOID_FUNCTION1(ubuntu_ui_install_task_controller, ubuntu_ui_task_controller*);
-
-#ifdef __cplusplus
-}
-#endif

=== removed file 'src/hybris/ubuntu_application_sensors_hybris.cpp'
--- src/hybris/ubuntu_application_sensors_hybris.cpp	2013-06-20 12:37:44 +0000
+++ src/hybris/ubuntu_application_sensors_hybris.cpp	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voss <[e-mail]>
- *              Ricardo Mendoza <[e-mail]>
- */
-
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-
-#include "bridge.h"
-
-// Ubuntu Application Sensors
-
-// Acceleration Sensor
-IMPLEMENT_FUNCTION0(UASensorsAccelerometer*, ua_sensors_accelerometer_new);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_enable, UASensorsAccelerometer*);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_disable, UASensorsAccelerometer*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_accelerometer_get_min_delay, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_min_value, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_max_value, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_resolution, UASensorsAccelerometer*);
-IMPLEMENT_VOID_FUNCTION3(ua_sensors_accelerometer_set_reading_cb, UASensorsAccelerometer*, on_accelerometer_event_cb, void*);
-
-// Acceleration Sensor Event
-IMPLEMENT_FUNCTION1(uint64_t, uas_accelerometer_event_get_timestamp, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_x, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_y, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_z, UASAccelerometerEvent*);
-
-// Proximity Sensor
-IMPLEMENT_FUNCTION0(UASensorsProximity*, ua_sensors_proximity_new);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_enable, UASensorsProximity*);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_disable, UASensorsProximity*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_proximity_get_min_delay, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_min_value, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_max_value, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_resolution, UASensorsProximity*);
-IMPLEMENT_VOID_FUNCTION3(ua_sensors_proximity_set_reading_cb, UASensorsProximity*, on_proximity_event_cb, void*);
-
-// Proximity Sensor Event
-IMPLEMENT_FUNCTION1(uint64_t, uas_proximity_event_get_timestamp, UASProximityEvent*);
-IMPLEMENT_FUNCTION1(UASProximityDistance, uas_proximity_event_get_distance, UASProximityEvent*);
-
-// Ambient Light Sensor
-IMPLEMENT_FUNCTION0(UASensorsLight*, ua_sensors_light_new);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_enable, UASensorsLight*);
-IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_disable, UASensorsLight*);
-IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_light_get_min_delay, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_min_value, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_max_value, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_resolution, UASensorsLight*);
-IMPLEMENT_VOID_FUNCTION3(ua_sensors_light_set_reading_cb, UASensorsLight*, on_light_event_cb, void*);
-
-// Ambient Light Sensor Event
-IMPLEMENT_FUNCTION1(uint64_t, uas_light_event_get_timestamp, UASLightEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_light_event_get_light, UASLightEvent*);

=== removed file 'src/hybris/ubuntu_platform_hardware_api.cpp'
--- src/hybris/ubuntu_platform_hardware_api.cpp	2013-06-13 08:37:52 +0000
+++ src/hybris/ubuntu_platform_hardware_api.cpp	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voss <[e-mail]>
- *              Ricardo Mendoza <[e-mail]>
- */
-
-// C APIs
-#include <ubuntu/hardware/gps.h>
-
-#include "bridge.h"
-
-// Hardware - GPS
-IMPLEMENT_FUNCTION1(
-UHardwareGps, 
-u_hardware_gps_new, 
-UHardwareGpsParams*);
-
-IMPLEMENT_VOID_FUNCTION1(
-u_hardware_gps_delete, 
-UHardwareGps);
-
-IMPLEMENT_FUNCTION1(
-bool, 
-u_hardware_gps_start, 
-UHardwareGps);
-
-IMPLEMENT_FUNCTION1(
-bool, 
-u_hardware_gps_stop, 
-UHardwareGps);
-
-IMPLEMENT_VOID_FUNCTION4(
-u_hardware_gps_inject_time, 
-UHardwareGps, 
-int64_t, 
-int64_t, 
-int);
-
-IMPLEMENT_VOID_FUNCTION4(
-u_hardware_gps_inject_location, 
-UHardwareGps, 
-double, 
-double, 
-float);
-
-IMPLEMENT_VOID_FUNCTION2(
-u_hardware_gps_delete_aiding_data, 
-UHardwareGps, 
-uint16_t);
-
-IMPLEMENT_FUNCTION6(
-bool, 
-u_hardware_gps_set_position_mode, 
-UHardwareGps, 
-uint32_t, 
-uint32_t,
-uint32_t, 
-uint32_t, 
-uint32_t);
-
-IMPLEMENT_VOID_FUNCTION3(
-u_hardware_gps_inject_xtra_data, 
-UHardwareGps, 
-char*, 
-int);

=== removed directory 'src/mirclient'
=== removed file 'src/mirclient/CMakeLists.txt'
--- src/mirclient/CMakeLists.txt	2013-06-07 23:27:45 +0000
+++ src/mirclient/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-set(SOURCES 
-  ubuntu_application_api_mirclient.cpp
-  application_instance_mirclient.cpp
-  window_properties_mirclient.cpp
-  window_mirclient.cpp
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
-
-add_library(
-	ubuntu_application_api_mirclient SHARED
-	${SOURCES}
-)
-
-include_directories(
-    ${CMAKE_BINARY_DIR}/include
-    ${MIRCLIENT_INCLUDE_DIRS}
-)
-
-target_link_libraries(
-	ubuntu_application_api_mirclient
-        ${MIRCLIENT_LDFLAGS} ${MIRCLIENT_LIBRARIES}
-        -Wl,--whole-archive ubuntu_application_api_mircommon
-        -Wl,--no-whole-archive
-)
-
-set_target_properties(
-	ubuntu_application_api_mirclient
-	PROPERTIES
-	VERSION 1.0
-	SOVERSION 1
-)
-
-install(TARGETS ubuntu_application_api_mirclient ${INSTALL_TARGETS_DEFAULT_ARGS})

=== removed file 'src/mirclient/application_instance_mirclient.cpp'
--- src/mirclient/application_instance_mirclient.cpp	2013-06-07 20:56:22 +0000
+++ src/mirclient/application_instance_mirclient.cpp	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_instance_mirclient_priv.h"
-
-namespace uamc = ubuntu::application::mir::client;
-
-uamc::Instance::Instance()
-    : con(nullptr),
-      ref_count(1)
-{
-    
-}
-
-UApplicationInstance* uamc::Instance::as_u_application_instance()
-{
-    return static_cast<UApplicationInstance*>(this);
-}
-
-uamc::Instance* uamc::Instance::from_u_application_instance(UApplicationInstance* u_instance)
-{
-    return static_cast<uamc::Instance*>(u_instance);
-}
-
-void uamc::Instance::ref()
-{
-    ref_count++;
-}
-
-void uamc::Instance::unref()
-{
-    ref_count--;
-    if (ref_count == 0)
-        delete this;
-}
-
-MirConnection* uamc::Instance::connection() const
-{
-    return con.get();
-}
-
-bool uamc::Instance::connect(std::string const& application_name)
-{
-    auto mir_connection = mir_connect_sync(NULL, application_name.c_str());
-    if (mir_connection == nullptr)
-        return false;
-    con = ConnectionPtr(mir_connection,
-        [](MirConnection *c)
-        {
-            mir_connection_release(c);
-        });
-    return true;
-}

=== removed file 'src/mirclient/application_instance_mirclient_priv.h'
--- src/mirclient/application_instance_mirclient_priv.h	2013-06-09 21:52:56 +0000
+++ src/mirclient/application_instance_mirclient_priv.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_INSTANCE_MIRCLIENT_PRIV_H_
-#define UBUNTU_APPLICATION_INSTANCE_MIRCLIENT_PRIV_H_
-
-#include <ubuntu/application/instance.h>
-
-#include <memory>
-#include <string>
-
-#include <mir_toolkit/mir_client_library.h>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-namespace client
-{
-
-class Instance
-{
-public:
-    Instance();
-    ~Instance() = default;
-    
-    UApplicationInstance* as_u_application_instance();
-    static Instance* from_u_application_instance(UApplicationInstance* u_instance);
-    
-    void ref();
-    void unref();
-    
-    MirConnection* connection() const;
-    bool connect(std::string const& application_name);
-    
-protected:
-    Instance(Instance const&) = delete;
-    Instance& operator=(Instance const&) = delete;
-
-private:
-    typedef std::unique_ptr<MirConnection, std::function<void(MirConnection*)>> ConnectionPtr;
-    ConnectionPtr con;
-    int ref_count;
-};
-
-}
-}
-}
-} // namespace ubuntu
-
-#endif // UBUNTU_APPLICATION_INSTANCE_MIRCLIENT_PRIV_H_

=== removed file 'src/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/mirclient/ubuntu_application_api_mirclient.cpp	2013-06-12 21:20:38 +0000
+++ src/mirclient/ubuntu_application_api_mirclient.cpp	1970-01-01 00:00:00 +0000
@@ -1,279 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_instance_mirclient_priv.h"
-#include "window_properties_mirclient_priv.h"
-#include "window_mirclient_priv.h"
-
-#include "mircommon/application_id_mir_priv.h"
-
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/clipboard.h>
-#include <ubuntu/application/ui/display.h>
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-
-#include <mir_toolkit/mir_client_library.h>
-
-#include <stdlib.h>
-#include <assert.h>
-#include <string.h>
-
-namespace uam = ubuntu::application::mir;
-namespace uamc = uam::client;
-
-namespace
-{
-
-// We use a global instance as some platform-api functions, i.e. display_new_with_index
-// do not supply dependencies, but a MirConnection is required for all queries.
-static uamc::Instance*
-global_mir_instance()
-{
-    // Obviously ref counting is whacky here...
-    static uamc::Instance instance;
-    instance.ref(); // We leak a reference, this object can't be destroyed
-    return &instance;
-}
-
-// Display info
-static MirDisplayInfo*
-u_display_mir_display(UAUiDisplay *display)
-{
-    return static_cast<MirDisplayInfo*>(display);
-}
-
-static UAUiDisplay*
-mir_display_u_display(MirDisplayInfo *display)
-{
-    return static_cast<UAUiDisplay*>(display);
-}
-
-};
-
-extern "C"
-{
-
-// TODO<papi>: Eliminate global instance by adding Instance to some functions (i.e. display queries)
-// TODO: We can't take ownership of description and options until we get rid of the global instance
-// so we leak them.
-UApplicationInstance* u_application_instance_new_from_description_with_options(UApplicationDescription* description, UApplicationOptions* options)
-{
-    auto instance = global_mir_instance();
-
-    auto id = uam::Id::from_u_application_id(u_application_description_get_application_id(description));
-    auto connect_suceeded = instance->connect(id->name);
-    assert(connect_suceeded);
-
-    return instance->as_u_application_instance();
-}
-
-void
-u_application_instance_ref(UApplicationInstance *u_instance)
-{
-    auto instance = uamc::Instance::from_u_application_instance(u_instance);
-    instance->ref();
-}
-    
-void
-u_application_instance_unref(UApplicationInstance *u_instance)
-{
-    auto instance = uamc::Instance::from_u_application_instance(u_instance);
-    instance->unref();
-}
-    
-void
-u_application_instance_destroy(UApplicationInstance *u_instance)
-{
-    // TODO<papi>: What are the proper semantics here.
-    u_application_instance_unref(u_instance);
-}
-    
-void
-u_application_instance_run(UApplicationInstance *instance)
-{
-    // TODO<papi>: What is this supposed to do? Seems to be no-op on hybris.
-    (void) instance;
-}
-
-void ua_ui_set_clipboard_content(void* content, size_t content_size)
-{
-    // TODO<papi,mir>: Implement. We will need a MirConnection
-    (void) content;
-    (void) content_size;
-}
-
-void ua_ui_get_clipboard_content(void** out_content, size_t* out_content_size)
-{
-    // TODO<papi,mir>: Implement, see get_clipboard_comment.
-    *out_content = NULL;
-    *out_content_size = 0;
-}
-
-//
-// TODO <papi>: We need to expose the EGLNativeDisplay somehow
-//
-
-// TODO <papi>: This function should take an application instance so we can eliminate the global mir instance.
-// TODO <mir>: Perhaps this should be noop for Mir as there is no need to construct
-// a display object, the connection already has everything we need, as it receives
-// the display info at connect time.
-UAUiDisplay* ua_ui_display_new_with_index(size_t index)
-{
-    // TODO<papi,mir>: What are the semantics of index. How should we use it?
-    (void) index;
-    auto instance = global_mir_instance();
-
-    auto display = new MirDisplayInfo;
-    mir_connection_get_display_info(instance->connection(), display);
-
-    return mir_display_u_display(display);
-}
-
-void ua_ui_display_destroy(UAUiDisplay* display)
-{
-    auto mir_display = u_display_mir_display(display);
-    delete mir_display;
-}
-
-uint32_t ua_ui_display_query_horizontal_res(UAUiDisplay* display)
-{
-    auto mir_display = u_display_mir_display(display);
-
-    // TODO<mir>: Line up return types from mirclient
-    return static_cast<uint32_t>(mir_display->width);
-}
-
-uint32_t ua_ui_display_query_vertical_res(UAUiDisplay* display)
-{
-    auto mir_display = u_display_mir_display(display);
-
-    // TODO<mir>: Line up return types from mirclient
-    return static_cast<uint32_t>(mir_display->height);
-}
-
-EGLNativeDisplayType ua_ui_display_get_native_type(UAUiDisplay* display)
-{
-    auto instance = global_mir_instance();
-
-    // TODO<mir>: Careful with this cast
-    return reinterpret_cast<EGLNativeDisplayType>(mir_connection_get_egl_native_display(instance->connection()));
-}
-
-UAUiWindowProperties* ua_ui_window_properties_new_for_normal_window()
-{
-    return (new uamc::WindowProperties)->as_u_window_properties();
-}
-
-void ua_ui_window_properties_destroy(UAUiWindowProperties* u_properties)
-{
-    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
-    delete properties;
-}
-
-void ua_ui_window_properties_set_titlen(UAUiWindowProperties* u_properties, const char* title, size_t title_length)
-{
-    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
-
-    properties->set_title(title, title_length);
-}
-
-const char* ua_ui_window_properties_get_title(UAUiWindowProperties* u_properties)
-{
-    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
-    return properties->surface_parameters().name;
-}
-
-void ua_ui_window_properties_set_role(UAUiWindowProperties* properties, UAUiWindowRole role)
-{
-    // TODO<papi>: Doesn't seem like this is meaningful for mirclient. Perhaps it should leave platform-api.
-    (void) properties;
-    (void) role;
-}
-
-void ua_ui_window_properties_set_input_cb_and_ctx(UAUiWindowProperties* u_properties, UAUiWindowInputEventCb cb, void* ctx)
-{
-    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
-    properties->set_input_cb_and_ctx(cb, ctx);
-}
-
-UAUiWindow* ua_ui_window_new_for_application_with_properties(UApplicationInstance* u_instance, UAUiWindowProperties* u_properties)
-{
-    auto instance = uamc::Instance::from_u_application_instance(u_instance);
-    auto properties = uamc::WindowProperties::from_u_window_properties(u_properties);
-
-    auto window = new uamc::Window(*instance, properties);
-    return window->as_u_window();
-}
-
-void ua_ui_window_destroy(UAUiWindow* u_window)
-{
-    auto window = uamc::Window::from_u_window(u_window);
-    delete window;
-}
-
-UStatus ua_ui_window_move(UAUiWindow* u_window, uint32_t x, uint32_t y)
-{
-    // TODO<papi,mir>: Implement. Assuming this should exist on mirclient?
-    (void) u_window;
-    (void) x;
-    (void) y;
-    return (UStatus) 0;
-}
-
-UStatus ua_ui_window_resize(UAUiWindow* u_window, uint32_t width, uint32_t height)
-{
-    // TODO<mir>: Implement
-    (void) u_window;
-    (void) width;
-    (void) height;
-    return (UStatus) 0;
-}
-
-UStatus ua_ui_window_hide(UAUiWindow* u_window)
-{
-    // TODO<mir>: Implement
-    (void) u_window;
-    return (UStatus) 0;
-}
-
-UStatus ua_ui_window_show(UAUiWindow* u_window)
-{
-    // TODO<mir>: Implement
-    (void) u_window;
-    return (UStatus) 0;
-}
-
-void ua_ui_window_request_fullscreen(UAUiWindow* u_window)
-{
-    // TODO<mir>: Implement
-    (void) u_window;
-}
-
-EGLNativeWindowType ua_ui_window_get_native_type(UAUiWindow* u_window)
-{
-    auto window = uamc::Window::from_u_window(u_window);
-    return window->get_native_type();
-}
-
-// TODO: Sensors
-}

=== removed file 'src/mirclient/window_mirclient.cpp'
--- src/mirclient/window_mirclient.cpp	2013-06-07 23:27:45 +0000
+++ src/mirclient/window_mirclient.cpp	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "window_mirclient_priv.h"
-#include "application_instance_mirclient_priv.h"
-#include "window_properties_mirclient_priv.h"
-#include "window_mirclient_priv.h"
-
-#include "mircommon/event_helpers_mir.h"
-
-namespace uamc = ubuntu::application::mir::client;
-namespace uaum = ubuntu::application::ui::mir;
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-namespace client
-{
-
-struct InputContext
-{
-    UAUiWindowInputEventCb cb;
-    void *ctx;
-};
-
-static void
-ua_ui_window_mir_handle_event(MirSurface* surface, MirEvent const* mir_ev, void* ctx)
-{
-    // TODO<mir>: Perhaps this indicates that mirclient library should not pass a surface argument here.
-    (void) surface;
-
-    Event ubuntu_ev;
-    uaum::event_to_ubuntu_event(mir_ev, ubuntu_ev);
-    auto mir_ctx = static_cast<uamc::InputContext*>(ctx);
-    mir_ctx->cb(mir_ctx->ctx, &ubuntu_ev);
-}
-
-}
-}
-}
-}
-
-namespace
-{
-
-static MirPixelFormat
-mir_choose_default_pixel_format(MirConnection *connection)
-{
-    MirDisplayInfo info;
-    mir_connection_get_display_info(connection, &info);
-    return info.supported_pixel_format[0];
-}
-
-static MirSurface*
-create_surface_with_parameters(MirConnection *connection,
-                               MirSurfaceParameters parameters)
-{
-}
-
-}
-
-uamc::Window::Window(uamc::Instance& instance,
-                     uamc::WindowProperties* properties)
-    : instance(instance)
-{
-    window_properties = WindowPropertiesPtr(properties,
-        [](uamc::WindowProperties *p)
-        {
-            ua_ui_window_properties_destroy(p->as_u_window_properties());
-        });
-
-    MirSurfaceParameters parameters = properties->surface_parameters();
-    auto connection = instance.connection();
-    parameters.pixel_format = mir_choose_default_pixel_format(connection);
-
-    auto mir_surface = mir_connection_create_surface_sync(connection, &parameters);
-    // TODO: create_surface_sync is unsafe as there is a race between setting the event handler and receiving surfaces
-    input_ctx = InputContextPtr(new uamc::InputContext{properties->input_cb(), properties->input_context()},
-        [](InputContext *c)
-        {
-            delete c;
-        });
-    
-    MirEventDelegate delegate = 
-        { 
-            uamc::ua_ui_window_mir_handle_event,
-            input_ctx.get()
-        };
-    mir_surface_set_event_handler(mir_surface, &delegate);
-    surface = SurfacePtr(mir_surface, 
-        [](MirSurface *s)
-        {
-            mir_surface_release_sync(s);
-        });
-}
-
-UAUiWindow* uamc::Window::as_u_window()
-{
-    return static_cast<UAUiWindow*>(this);
-}
-
-uamc::Window* uamc::Window::from_u_window(UAUiWindow *u_window)
-{
-    return static_cast<uamc::Window*>(u_window);
-}
-
-EGLNativeWindowType uamc::Window::get_native_type()
-{
-    return reinterpret_cast<EGLNativeWindowType>(mir_surface_get_egl_native_window(surface.get()));
-}

=== removed file 'src/mirclient/window_mirclient_priv.h'
--- src/mirclient/window_mirclient_priv.h	2013-06-07 23:27:45 +0000
+++ src/mirclient/window_mirclient_priv.h	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_UI_WINDOW_MIRCLIENT_PRIV_H_
-#define UBUNTU_APPLICATION_UI_WINDOW_MIRCLIENT_PRIV_H_
-
-#include <ubuntu/application/ui/window.h>
-#include <mir_toolkit/mir_client_library.h>
-
-#include <EGL/egl.h>
-
-#include <stddef.h>
-
-#include <functional>
-#include <memory>
-#include <string>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-namespace client
-{
-class Instance;
-class WindowProperties;
-struct InputContext;
-
-class Window
-{
-public:
-    Window(Instance& instance, WindowProperties* window);
-    ~Window() = default;
-
-    UAUiWindow* as_u_window();
-    static Window* from_u_window(UAUiWindow* u_window);
-    
-    EGLNativeWindowType get_native_type();
-protected:
-    Window(Window const&) = delete;
-    Window& operator=(Window const&) = delete;
-
-private:
-    Instance& instance;
-
-    typedef std::unique_ptr<WindowProperties, std::function<void(WindowProperties*)>> WindowPropertiesPtr;
-    typedef std::unique_ptr<MirSurface, std::function<void(MirSurface*)>> SurfacePtr;
-    typedef std::unique_ptr<InputContext, std::function<void(InputContext*)>> InputContextPtr;
-
-    WindowPropertiesPtr window_properties;
-    SurfacePtr surface;
-    InputContextPtr input_ctx;
-};
-    
-}
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_WINDOW_MIRCLIENT_PRIV_H_

=== removed file 'src/mirclient/window_properties_mirclient.cpp'
--- src/mirclient/window_properties_mirclient.cpp	2013-06-07 21:58:44 +0000
+++ src/mirclient/window_properties_mirclient.cpp	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "window_properties_mirclient_priv.h"
-
-namespace uamc = ubuntu::application::mir::client;
-
-uamc::WindowProperties::WindowProperties()
-    : cb(nullptr),
-      input_ctx(nullptr)
-{
-    parameters.name = nullptr;
-    parameters.width = 0;
-    parameters.height = 0;
-    parameters.buffer_usage = mir_buffer_usage_hardware;
-}
-
-UAUiWindowProperties* uamc::WindowProperties::as_u_window_properties()
-{
-    return static_cast<UAUiWindowProperties*>(this);
-}
-uamc::WindowProperties* uamc::WindowProperties::from_u_window_properties(UAUiWindowProperties* u_properties)
-{
-    return static_cast<uamc::WindowProperties*>(u_properties);
-}
-
-void uamc::WindowProperties::set_title(char const* window_title, size_t length)
-{
-    title = std::string(window_title, length);
-    parameters.name = title.c_str();
-}
-
-void uamc::WindowProperties::set_input_cb_and_ctx(UAUiWindowInputEventCb callback, void* ctx)
-{
-    cb = callback;
-    input_ctx = ctx;
-}
-
-MirSurfaceParameters const& uamc::WindowProperties::surface_parameters() const
-{
-    return parameters;
-}
-
-UAUiWindowInputEventCb uamc::WindowProperties::input_cb() const
-{
-    return cb;
-}
-
-void* uamc::WindowProperties::input_context() const
-{
-    return input_ctx;
-}
-

=== removed file 'src/mirclient/window_properties_mirclient_priv.h'
--- src/mirclient/window_properties_mirclient_priv.h	2013-06-07 21:58:44 +0000
+++ src/mirclient/window_properties_mirclient_priv.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRCLIENT_PRIV_H_
-#define UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRCLIENT_PRIV_H_
-
-#include <ubuntu/application/ui/window.h>
-#include <mir_toolkit/mir_client_library.h>
-
-#include <stddef.h>
-
-#include <string>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-namespace client
-{
-
-class WindowProperties
-{
-public:
-    WindowProperties();
-    ~WindowProperties() = default;
-
-    UAUiWindowProperties* as_u_window_properties();
-    static WindowProperties* from_u_window_properties(UAUiWindowProperties* u_properties);
-    
-    void set_title(char const* title, size_t length);
-    void set_input_cb_and_ctx(UAUiWindowInputEventCb cb, void* ctx);
-    
-    MirSurfaceParameters const& surface_parameters() const;
-    UAUiWindowInputEventCb input_cb() const;
-    void* input_context() const;
-    
-protected:
-    WindowProperties(WindowProperties const&) = delete;
-    WindowProperties& operator=(WindowProperties const&) = delete;
-
-private:
-    MirSurfaceParameters parameters;
-
-    std::string title;
-
-    UAUiWindowInputEventCb cb;
-    void *input_ctx;
-};
-    
-}
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_UI_WINDOW_PROPERTIES_MIRCLIENT_PRIV_H_

=== removed directory 'src/mircommon'
=== removed file 'src/mircommon/CMakeLists.txt'
--- src/mircommon/CMakeLists.txt	2013-07-10 13:57:20 +0000
+++ src/mircommon/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-set(SOURCES
-  event_helpers_mir.cpp
-  application_id_mir.cpp
-  application_options_mir.cpp
-  application_description_mir.cpp
-  lifecycle_delegate_mir.cpp
-  session_mir.cpp
-)
-
-set(LINK_LIBRARIES
-  ${MIR_COMMON_LDFLAGS} ${MIR_COMMON_LIBRARIES}
-)
-
-if(ENABLE_HYBRIS_IMPLEMENTATION)
-  list(APPEND SOURCES
-    ../hybris/ubuntu_application_sensors_hybris.cpp
-    )
-  list(APPEND LINK_LIBRARIES
-    hybris-common
-    )
-else()
-  list(APPEND SOURCES
-    ubuntu_application_sensors_desktop.cpp
-    )
-endif()
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11")
-
-include_directories(
-  ${MIRCOMMON_INCLUDE_DIRS}
-)
-
-add_library(
-	ubuntu_application_api_mircommon STATIC
-	${SOURCES}
-)
-
-target_link_libraries(
-	ubuntu_application_api_mircommon
-        ${LINK_LIBRARIES}
-)
-
-

=== removed file 'src/mircommon/application_description_mir.cpp'
--- src/mircommon/application_description_mir.cpp	2013-06-07 17:41:36 +0000
+++ src/mircommon/application_description_mir.cpp	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_description_mir_priv.h"
-
-namespace uam = ubuntu::application::mir;
-
-uam::Description::Description()
-    : application_id(nullptr),
-      lifecycle_delegate(nullptr)
-{
-}
-
-UApplicationDescription* uam::Description::as_u_application_description()
-{
-    return static_cast<UApplicationDescription*>(this);
-}
-
-uam::Description* uam::Description::from_u_application_description(UApplicationDescription* description)
-{
-    return static_cast<uam::Description*>(description);
-}
-
-UApplicationDescription*
-u_application_description_new()
-{
-    auto description = new uam::Description();
-    return description->as_u_application_description();
-}
-    
-void
-u_application_description_destroy(UApplicationDescription *u_description)
-{
-    auto description = uam::Description::from_u_application_description(u_description);
-    delete description;
-}
-    
-void
-u_application_description_set_application_id(UApplicationDescription *u_description,
-    UApplicationId *id)
-{
-    auto description = uam::Description::from_u_application_description(u_description);
-    
-    description->application_id = std::unique_ptr<UApplicationId, std::function<void(UApplicationId*)>>(id,
-        [](UApplicationId *p)
-        {
-            u_application_id_destroy(p);
-        });
-}
-    
-UApplicationId* 
-u_application_description_get_application_id(UApplicationDescription *u_description)
-{
-    auto description = uam::Description::from_u_application_description(u_description);
-    return description->application_id.get();
-}
-    
-void
-u_application_description_set_application_lifecycle_delegate(UApplicationDescription *u_description,
-    UApplicationLifecycleDelegate *lifecycle_delegate)
-{
-    auto description = uam::Description::from_u_application_description(u_description);
-
-    // TODO: We don't take a ref as it is created with a floating ref but this should be made more explicit...
-    description->lifecycle_delegate = 
-        std::unique_ptr<UApplicationLifecycleDelegate, std::function<void(UApplicationLifecycleDelegate*)>>(lifecycle_delegate,
-            [](UApplicationLifecycleDelegate *p)
-            {
-                u_application_lifecycle_delegate_unref(p);
-            });
-
-}
-    
-UApplicationLifecycleDelegate* 
-u_application_description_get_application_lifecycle_delegate(UApplicationDescription *u_description)
-{
-    auto description = uam::Description::from_u_application_description(u_description);
-    return description->lifecycle_delegate.get();
-}

=== removed file 'src/mircommon/application_description_mir_priv.h'
--- src/mircommon/application_description_mir_priv.h	2013-06-07 17:41:36 +0000
+++ src/mircommon/application_description_mir_priv.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_DESCRIPTION_MIR_PRIV_H_
-#define UBUNTU_APPLICATION_DESCRIPTION_MIR_PRIV_H_
-
-#include <ubuntu/application/description.h>
-
-#include <memory>
-#include <functional>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-
-class Description
-{
-public:
-    Description();
-    ~Description() = default;
-    
-    UApplicationDescription* as_u_application_description();
-    static Description* from_u_application_description(UApplicationDescription* u_description);
-
-    // TODO<papi> Do we really own these?
-    std::unique_ptr<UApplicationId, std::function<void(UApplicationId*)>> application_id;
-    std::unique_ptr<UApplicationLifecycleDelegate, std::function<void(UApplicationLifecycleDelegate*)>> lifecycle_delegate;
-
-protected:
-    Description(Description const&) = delete;
-    Description& operator=(Description const&) = delete;
-};
-
-}
-}
-} // namespace ubuntu
-
-#endif // UBUNTU_APPLICATION_DESCRIPTION_MIR_PRIV_H_

=== removed file 'src/mircommon/application_id_mir.cpp'
--- src/mircommon/application_id_mir.cpp	2013-06-05 19:33:23 +0000
+++ src/mircommon/application_id_mir.cpp	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_id_mir_priv.h"
-
-namespace uam = ubuntu::application::mir;
-
-uam::Id::Id(const char *name, size_t size)
-    : name(name, size)
-{
-}
-
-UApplicationId* uam::Id::as_u_application_id()
-{
-    return static_cast<UApplicationId*>(this);
-}
-
-uam::Id* uam::Id::from_u_application_id(UApplicationId *id)
-{
-    return static_cast<uam::Id*>(id);
-}
-
-UApplicationId*
-u_application_id_new_from_stringn(const char *string, size_t size)
-{
-    auto id = new uam::Id(string, size);
-    return id->as_u_application_id();
-}
-
-void u_application_id_destroy(UApplicationId *u_id)
-{
-    auto id = uam::Id::from_u_application_id(u_id);
-    delete id;
-}
-
-int u_application_id_compare(UApplicationId* u_lhs, UApplicationId* u_rhs)
-{
-    auto lhs = uam::Id::from_u_application_id(u_lhs);
-    auto rhs = uam::Id::from_u_application_id(u_rhs);
-    return lhs->name.compare(rhs->name);
-}

=== removed file 'src/mircommon/application_id_mir_priv.h'
--- src/mircommon/application_id_mir_priv.h	2013-06-05 19:44:09 +0000
+++ src/mircommon/application_id_mir_priv.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_ID_MIR_PRIV_H_
-#define UBUNTU_APPLICATION_ID_MIR_PRIV_H_
-
-#include <ubuntu/application/id.h>
-
-#include <string>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-
-class Id
-{
-public:
-    Id(const char *name, size_t size);
-    ~Id() = default;
-    
-    UApplicationId* as_u_application_id();
-    static Id* from_u_application_id(UApplicationId* id);
-
-    std::string const name;
-
-protected:
-    Id(const Id&) = delete;
-    Id& operator=(const Id&) = delete;
-};
-
-}
-}
-} // namespace ubuntu
-
-#endif // UBUNTU_APPLICATION_ID_MIR_PRIV_H_

=== removed file 'src/mircommon/application_options_mir.cpp'
--- src/mircommon/application_options_mir.cpp	2013-06-06 23:35:14 +0000
+++ src/mircommon/application_options_mir.cpp	1970-01-01 00:00:00 +0000
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_options_mir_priv.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-
-#include <tuple>
-#include <string>
-
-namespace uam = ubuntu::application::mir;
-
-UApplicationOptions* uam::Options::as_u_application_options()
-{
-    return static_cast<UApplicationOptions*>(this);
-}
-uam::Options* uam::Options::from_u_application_options(UApplicationOptions* options)
-{
-    return static_cast<uam::Options*>(options);
-}
-
-namespace
-{
-
-UAUiStage
-string_to_stage(std::string const& s)
-{
-    if (s == "main_stage")
-        return U_MAIN_STAGE;
-    else if (s == "side_stage")
-        return U_SIDE_STAGE;
-    else if (s == "share_stage")
-        return U_SHARE_STAGE;
-}
-
-UAUiFormFactor
-string_to_form_factor(std::string const& s)
-{
-    if (s == "desktop")
-        return U_DESKTOP;
-    else if (s == "phone")
-        return U_PHONE;
-    else if (s == "tablet")
-        return U_TABLET;
-}
-
-void print_help_and_exit()
-{
-    printf("Usage: executable "
-           "[--form_factor_hint={desktop, phone, tablet}] "
-           "[--stage_hint={main_stage, side_stage, share_stage}] "
-           "[--desktop_file_hint=absolute_path_to_desktop_file]\n");
-    exit(EXIT_SUCCESS);
-}
-
-}
-
-extern "C"
-{
-UApplicationOptions*
-u_application_options_new_from_cmd_line(int argc, char** argv)
-{
-    static const int uninteresting_flag_value = 0;
-    static struct option long_options[] =
-    {        
-        {"form_factor_hint", required_argument, NULL, uninteresting_flag_value},
-        {"stage_hint", required_argument, NULL, uninteresting_flag_value},
-        {"desktop_file_hint", required_argument, NULL, uninteresting_flag_value},
-        {"help", no_argument, NULL, uninteresting_flag_value},
-        {0, 0, 0, 0}
-    };
-
-    static const int form_factor_hint_index = 0;
-    static const int stage_hint_index = 1;
-    static const int desktop_file_hint_index = 2;
-    static const int help_index = 3;
-
-    auto app_options = new uam::Options;
-
-    while(true)
-    {
-        int option_index = 0;
-
-        int c = getopt_long(argc,
-                            argv,
-                            "",
-                            long_options,
-                            &option_index);
-
-        if (c == -1)
-            break;
-
-        switch (c)
-        {
-        case 0:
-            // If this option set a flag, do nothing else now.
-            if (long_options[option_index].flag != 0)
-                break;
-            if (option_index == help_index)
-                print_help_and_exit();
-            if (optarg)
-            {
-                switch(option_index)
-                {
-                case form_factor_hint_index:
-                    app_options->form_factor = string_to_form_factor(std::string(optarg));
-                    break;
-                case stage_hint_index:
-                    app_options->stage = string_to_stage(std::string(optarg));
-                    break;
-                case desktop_file_hint_index:
-                    app_options->desktop_file = std::string(optarg);
-                    break;                
-                }
-            }
-            break;
-        case '?':
-            break;
-        }
-    }
-    
-    return app_options->as_u_application_options();
-}
-
-void
-u_application_options_destroy(UApplicationOptions* u_options)
-{
-    auto options = uam::Options::from_u_application_options(u_options);
-    delete options;
-}
-
-UApplicationOperationMode
-u_application_options_get_operation_mode(UApplicationOptions *u_options)
-{
-    auto options = uam::Options::from_u_application_options(u_options);
-    return options->operation_mode;
-}
-
-UAUiFormFactor
-u_application_options_get_form_factor(UApplicationOptions* u_options)
-{
-    auto options = uam::Options::from_u_application_options(u_options);
-    return options->form_factor;
-}
-
-UAUiStage
-u_application_options_get_stage(UApplicationOptions* u_options)
-{
-    auto options = uam::Options::from_u_application_options(u_options);
-    return options->stage;
-}
-}

=== removed file 'src/mircommon/application_options_mir_priv.h'
--- src/mircommon/application_options_mir_priv.h	2013-06-05 19:44:09 +0000
+++ src/mircommon/application_options_mir_priv.h	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_
-#define UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_
-
-#include <ubuntu/application/options.h>
-#include <ubuntu/application/ui/options.h>
-
-#include <string>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-
-class Options
-{
-public:
-    Options() = default;
-    ~Options() = default;
-    
-    UApplicationOptions* as_u_application_options();
-    static Options* from_u_application_options(UApplicationOptions* u_options);
-
-    UApplicationOperationMode operation_mode = U_APPLICATION_FOREGROUND_APP;
-    UAUiFormFactor form_factor = U_DESKTOP;
-    UAUiStage stage = U_MAIN_STAGE;
-    
-    std::string desktop_file;
-
-protected:
-    Options(Options const&) = delete;
-    Options& operator=(Options const&) = delete;
-};
-
-}
-}
-} // namespace ubuntu
-
-#endif // UBUNTU_APPLICATION_OPTIONS_MIR_PRIV_H_

=== removed file 'src/mircommon/event_helpers_mir.cpp'
--- src/mircommon/event_helpers_mir.cpp	2013-06-05 21:15:46 +0000
+++ src/mircommon/event_helpers_mir.cpp	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "event_helpers_mir.h"
-
-namespace uaum = ubuntu::application::ui::mir;
-
-// TODO<mir>: This begs the question: Why does MirEvent exist? It's difficult to ensure this function is kept in sync 
-// at the unit test level.
-void
-uaum::event_to_ubuntu_event(MirEvent const* mir_event, Event& ubuntu_ev)
-{
-    switch (mir_event->type)
-    {
-    case mir_event_type_key:
-        ubuntu_ev.type = KEY_EVENT_TYPE;
-        ubuntu_ev.device_id = mir_event->key.device_id;
-        ubuntu_ev.source_id = mir_event->key.source_id;
-        ubuntu_ev.action = mir_event->key.action;
-        ubuntu_ev.flags = mir_event->key.flags;
-        ubuntu_ev.meta_state = mir_event->key.modifiers;
-        ubuntu_ev.details.key.key_code = mir_event->key.key_code;
-        ubuntu_ev.details.key.scan_code = mir_event->key.scan_code;
-        ubuntu_ev.details.key.repeat_count = mir_event->key.repeat_count;
-        ubuntu_ev.details.key.down_time = mir_event->key.down_time;
-        ubuntu_ev.details.key.event_time = mir_event->key.event_time;
-        ubuntu_ev.details.key.is_system_key = mir_event->key.is_system_key;
-        break;
-    case mir_event_type_motion:
-        ubuntu_ev.type = MOTION_EVENT_TYPE;
-        ubuntu_ev.device_id = mir_event->motion.device_id;
-        ubuntu_ev.source_id = mir_event->motion.source_id;
-        ubuntu_ev.action = mir_event->motion.action;
-        ubuntu_ev.flags = mir_event->motion.flags;
-        ubuntu_ev.meta_state = mir_event->motion.modifiers;
-        ubuntu_ev.details.motion.edge_flags = mir_event->motion.edge_flags;
-        ubuntu_ev.details.motion.button_state = mir_event->motion.button_state;
-        ubuntu_ev.details.motion.x_offset = mir_event->motion.x_offset;
-        ubuntu_ev.details.motion.y_offset = mir_event->motion.y_offset;
-        ubuntu_ev.details.motion.x_precision = mir_event->motion.x_precision;
-        ubuntu_ev.details.motion.y_precision = mir_event->motion.y_precision;
-        ubuntu_ev.details.motion.down_time = mir_event->motion.down_time;
-        ubuntu_ev.details.motion.event_time = mir_event->motion.event_time;
-        ubuntu_ev.details.motion.pointer_count = mir_event->motion.pointer_count;
-        for (int i = 0; i < mir_event->motion.pointer_count; i++)
-        {
-            ubuntu_ev.details.motion.pointer_coordinates[i].id = mir_event->motion.pointer_coordinates[i].id;
-            ubuntu_ev.details.motion.pointer_coordinates[i].x = mir_event->motion.pointer_coordinates[i].x;
-            ubuntu_ev.details.motion.pointer_coordinates[i].raw_x = mir_event->motion.pointer_coordinates[i].raw_x;
-            ubuntu_ev.details.motion.pointer_coordinates[i].y = mir_event->motion.pointer_coordinates[i].y;
-            ubuntu_ev.details.motion.pointer_coordinates[i].raw_y = mir_event->motion.pointer_coordinates[i].raw_y;
-            ubuntu_ev.details.motion.pointer_coordinates[i].touch_major = mir_event->motion.pointer_coordinates[i].touch_major;
-            ubuntu_ev.details.motion.pointer_coordinates[i].touch_minor = mir_event->motion.pointer_coordinates[i].touch_minor;
-            ubuntu_ev.details.motion.pointer_coordinates[i].size = mir_event->motion.pointer_coordinates[i].size;
-            ubuntu_ev.details.motion.pointer_coordinates[i].pressure = mir_event->motion.pointer_coordinates[i].pressure;
-            ubuntu_ev.details.motion.pointer_coordinates[i].orientation = mir_event->motion.pointer_coordinates[i].orientation;
-        }
-        break;
-    default:
-        break;
-    }
-}

=== removed file 'src/mircommon/event_helpers_mir.h'
--- src/mircommon/event_helpers_mir.h	2013-06-05 20:02:14 +0000
+++ src/mircommon/event_helpers_mir.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_EVENT_HELPERS_MIR_COMMON_H_
-#define UBUNTU_EVENT_HELPERS_MIR_COMMON_H_
-
-#include <ubuntu/application/ui/input/event.h>
-#include <mir_toolkit/event.h>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace ui
-{
-namespace mir
-{
-void event_to_ubuntu_event(MirEvent const* mir_event, Event& ubuntu_ev);
-}
-}
-}
-}
-
-#endif // UBUNTU_EVENT_HELPERS_MIR_COMMON_H_

=== removed file 'src/mircommon/lifecycle_delegate_mir.cpp'
--- src/mircommon/lifecycle_delegate_mir.cpp	2013-06-07 17:23:48 +0000
+++ src/mircommon/lifecycle_delegate_mir.cpp	1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "lifecycle_delegate_mir_priv.h"
-
-namespace uam = ubuntu::application::mir;
-
-// TODO<papi, mir>: This implementation as a stub as we 
-// currently don't do anything with this in Mir. I am not sure
-// what exactly we should be doing either so we need some alignment
-// on this.
-
-uam::LifecycleDelegate::LifecycleDelegate()
-    : resumed_cb(nullptr),
-      stop_cb(nullptr),
-      ctx(nullptr)
-{
-}
-
-UApplicationLifecycleDelegate* uam::LifecycleDelegate::as_u_lifecycle_delegate()
-{
-    return static_cast<UApplicationLifecycleDelegate*>(this);
-}
-
-uam::LifecycleDelegate* uam::LifecycleDelegate::from_u_lifecycle_delegate(UApplicationLifecycleDelegate *u_delegate)
-{
-    return static_cast<uam::LifecycleDelegate*>(u_delegate);
-}
-
-void uam::LifecycleDelegate::ref()
-{
-    ref_count++;
-}
-
-void uam::LifecycleDelegate::unref()
-{
-    ref_count--;
-    if (ref_count == 0)
-        delete this;
-}
-
-
-extern "C"
-{
-
-UApplicationLifecycleDelegate*
-u_application_lifecycle_delegate_new()
-{
-    return (new uam::LifecycleDelegate)->as_u_lifecycle_delegate();
-}
-    
-void
-u_application_lifecycle_delegate_destroy(UApplicationLifecycleDelegate *u_delegate)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-
-    // TODO: What are the intended semantics of this?
-    delegate->unref();
-}
-    
-void
-u_application_lifecycle_delegate_ref(UApplicationLifecycleDelegate *u_delegate)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    delegate->ref();
-}
-    
-void
-u_application_lifecycle_delegate_unref(UApplicationLifecycleDelegate *u_delegate)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    delegate->unref();
-}
-    
-void
-u_application_lifecycle_delegate_set_application_resumed_cb(UApplicationLifecycleDelegate *u_delegate,
-    u_on_application_resumed cb)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    delegate->resumed_cb = cb;
-}
-    
-u_on_application_resumed
-u_application_lifecycle_delegate_get_application_resumed_cb(UApplicationLifecycleDelegate *u_delegate)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    return delegate->resumed_cb;
-}
-    
-void
-u_application_lifecycle_delegate_set_application_about_to_stop_cb(UApplicationLifecycleDelegate *u_delegate,
-    u_on_application_about_to_stop cb)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    delegate->stop_cb = cb;
-}
-    
-u_on_application_about_to_stop
-u_application_lifecycle_delegate_get_application_about_to_stop_cb(UApplicationLifecycleDelegate *u_delegate)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    return delegate->stop_cb;
-}
-    
-void
-u_application_lifecycle_delegate_set_context(UApplicationLifecycleDelegate *u_delegate,
-    void *context)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    delegate->ctx = context;
-}
-    
-void*
-u_application_lifecycle_delegate_get_context(UApplicationLifecycleDelegate *u_delegate,
-    void *context)
-{
-    auto delegate = uam::LifecycleDelegate::from_u_lifecycle_delegate(u_delegate);
-    return delegate->ctx;
-}
-
-}

=== removed file 'src/mircommon/lifecycle_delegate_mir_priv.h'
--- src/mircommon/lifecycle_delegate_mir_priv.h	2013-06-07 17:23:48 +0000
+++ src/mircommon/lifecycle_delegate_mir_priv.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_
-#define UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_
-
-#include <ubuntu/application/lifecycle_delegate.h>
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-
-class LifecycleDelegate
-{
-public:
-    LifecycleDelegate();
-    ~LifecycleDelegate() = default;
-
-    UApplicationLifecycleDelegate* as_u_lifecycle_delegate();
-    static LifecycleDelegate* from_u_lifecycle_delegate(UApplicationLifecycleDelegate *u_delegate);
-
-    void ref();
-    void unref();
-    
-    u_on_application_resumed resumed_cb;
-    u_on_application_about_to_stop stop_cb;
-    void *ctx;
-
-protected:
-    LifecycleDelegate(LifecycleDelegate const&) = delete;
-    LifecycleDelegate& operator=(LifecycleDelegate const&) = delete;
-
-private:
-    unsigned int ref_count;
-};
-
-}
-}
-}
-
-#endif // UBUNTU_APPLICATION_LIECYCLE_DELEGATE_MIR_PRIV_H_

=== removed file 'src/mircommon/session_mir.cpp'
--- src/mircommon/session_mir.cpp	2013-06-21 17:03:18 +0000
+++ src/mircommon/session_mir.cpp	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include <ubuntu/application/ui/session.h>
-
-// TODO<papi>: Not sure what this should do for mir. ApplicationInstance maps to the mir
-// concept of a session and this doesn't really seem to be used
-
-extern "C"
-{
-
-UAUiSession* ua_ui_session_new_with_properties(UAUiSessionProperties *properties)
-{
-    return nullptr;
-}
-    
-UAUiSessionProperties* ua_ui_session_properties_new()
-{
-    return nullptr;
-}
-   
-void ua_ui_session_properties_set_type(UAUiSessionProperties* properties,
-    UAUiSessionType type)
-{
-    (void) properties;
-    (void) type;
-}
-
-void ua_ui_session_properties_set_remote_pid(UAUiSessionProperties* properties,
-                                             uint32_t pid)
-{
-    (void) properties;
-    (void) pid;
-}
-                                             
-}

=== removed file 'src/mircommon/ubuntu_application_sensors_desktop.cpp'
--- src/mircommon/ubuntu_application_sensors_desktop.cpp	2013-06-05 23:47:51 +0000
+++ src/mircommon/ubuntu_application_sensors_desktop.cpp	1970-01-01 00:00:00 +0000
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voss <[e-mail]>
- *              Ricardo Mendoza <[e-mail]>
- */
-
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-
-#include <stddef.h>
-
-// Ubuntu Application Sensors. Null desktop implementation
-
-// Acceleration Sensor
-UASensorsAccelerometer* ua_sensors_accelerometer_new()
-{
-    return NULL;
-}
-
-UStatus ua_sensors_accelerometer_enable(UASensorsAccelerometer*)
-{
-    return (UStatus) 0;
-}
-
-UStatus ua_sensors_accelerometer_disable(UASensorsAccelerometer*)
-{
-    return (UStatus) 0;
-}
-
-uint32_t ua_sensors_accelerometer_get_min_delay(UASensorsAccelerometer*)
-{
-    return 0;
-}
-
-float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer*)
-{
-    return 0.0;
-}
-
-float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer*)
-{
-    return 0.0;
-}
-
-float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer*)
-{
-    return 0.0;
-}
-
-void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer*, on_accelerometer_event_cb, void*)
-{
-}
-
-// Acceleration Sensor Event
-uint64_t uas_accelerometer_event_get_timestamp(UASAccelerometerEvent*)
-{
-    return 0;
-}
-
-float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent*)
-{
-    return 0.0;
-}
-
-float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent*)
-{
-    return 0.0;
-}
-
-float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent*)
-{
-    return 0.0;
-}
-
-// Proximity Sensor
-UASensorsProximity* ua_sensors_proximity_new()
-{
-    return NULL;
-}
-
-UStatus ua_sensors_proximity_enable(UASensorsProximity*)
-{
-    return (UStatus) 0;
-}
-
-UStatus ua_sensors_proximity_disable(UASensorsProximity*)
-{
-    return (UStatus) 0;
-}
-
-uint32_t ua_sensors_proximity_get_min_delay(UASensorsProximity*)
-{
-    return 0;
-}
-
-float ua_sensors_proximity_get_min_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_max_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_resolution(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-void ua_sensors_proximity_set_reading_cb(UASensorsProximity*, on_proximity_event_cb, void*)
-{
-}
-
-// Proximity Sensor Event
-uint64_t uas_proximity_event_get_timestamp(UASProximityEvent*)
-{
-    return 0;
-}
-
-UASProximityDistance uas_proximity_event_get_distance(UASProximityEvent*)
-{
-    return (UASProximityDistance) 0;
-}
-
-
-// Ambient Light Sensor
-UASensorsLight* ua_sensors_light_new()
-{
-    return NULL;
-}
-
-UStatus ua_sensors_light_enable(UASensorsLight*)
-{
-    return (UStatus) 0;
-}
-
-UStatus ua_sensors_light_disable(UASensorsLight*)
-{
-    return (UStatus) 0;
-}
-
-uint32_t ua_sensors_light_get_min_delay(UASensorsLight*)
-{
-    return 0;
-}
-
-float ua_sensors_light_get_min_value(UASensorsLight*)
-{
-    return 0.0;
-}
-
-float ua_sensors_light_get_max_value(UASensorsLight*)
-{
-    return 0.0;
-}
-
-float ua_sensors_light_get_resolution(UASensorsLight*)
-{
-    return 0.0;
-}
-
-void ua_sensors_light_set_reading_cb(UASensorsLight*, on_light_event_cb, void*)
-{
-}
-
-// Ambient Light Sensor Event
-uint64_t uas_light_event_get_timestamp(UASLightEvent*)
-{
-    return 0;
-}
-
-float uas_light_event_get_light(UASLightEvent*)
-{
-    return 0.0;
-}

=== removed directory 'src/mirserver'
=== removed file 'src/mirserver/CMakeLists.txt'
--- src/mirserver/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ src/mirserver/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-set(SOURCES
-  ubuntu_application_api_mirserver.cpp
-  application_instance_mirserver.cpp
-  window_properties_mirserver.cpp
-  window_mirserver.cpp
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
-
-add_library(
-	ubuntu_application_api_mirserver SHARED
-	${SOURCES}
-)
-
-include_directories(
-    ${CMAKE_BINARY_DIR}/include
-    ${MIRSERVER_INCLUDE_DIRS}
-)
-
-target_link_libraries(
-	ubuntu_application_api_mirserver
-        ${MIRSERVER_LDFLAGS} ${MIRSERVER_LIBRARIES}
-        -Wl,--whole-archive ubuntu_application_api_mircommon
-        -Wl,--no-whole-archive
-)
-
-
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/priv/mirserver)
-
-set_target_properties(
-	ubuntu_application_api_mirserver
-	PROPERTIES
-	VERSION 1.0
-	SOVERSION 1
-)
-
-install(TARGETS ubuntu_application_api_mirserver ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/application)

=== removed file 'src/mirserver/application_instance_mirserver.cpp'
--- src/mirserver/application_instance_mirserver.cpp	2013-06-17 22:51:21 +0000
+++ src/mirserver/application_instance_mirserver.cpp	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "application_instance_mirserver_priv.h"
-
-#include "mircommon/application_description_mir_priv.h"
-#include "mircommon/application_options_mir_priv.h"
-#include "mircommon/application_id_mir_priv.h"
-
-#include <mir/shell/surface.h>
-#include <mir/shell/surface_factory.h>
-#include <mir/shell/surface_creation_parameters.h>
-
-namespace uam = ubuntu::application::mir;
-namespace uams = uam::server;
-
-namespace mf = mir::frontend;
-namespace me = mir::events;
-namespace msh = mir::shell;
-
-uams::Instance::Instance(std::shared_ptr<msh::SurfaceFactory> const &surface_factory,
-                         uam::Description* description_,
-                         uam::Options *options_)
-    : surface_factory(surface_factory),
-      ref_count(1)
-{
-    description = DescriptionPtr(description_, 
-        [] (uam::Description* p)
-        {
-            delete p;
-        });
-    options = OptionsPtr(options_,
-        [] (uam::Options* p)
-        {
-            delete p;
-        });
-}
-
-UApplicationInstance* uams::Instance::as_u_application_instance()
-{
-    return static_cast<UApplicationInstance*>(this);
-}
-
-uams::Instance* uams::Instance::from_u_application_instance(UApplicationInstance *u_instance)
-{
-    return static_cast<uams::Instance*>(u_instance);
-}
-
-void uams::Instance::ref()
-{
-    ref_count++;
-}
-
-void uams::Instance::unref()
-{
-    ref_count--;
-    if (ref_count == 0)
-        delete this;
-}
-
-std::shared_ptr<msh::Surface> uams::Instance::create_surface(msh::SurfaceCreationParameters const& parameters)
-{
-    static std::shared_ptr<me::EventSink> const null_event_sink{nullptr};
-    static mf::SurfaceId const default_surface_id{0};
-
-    return surface_factory->create_surface(parameters, default_surface_id,
-                                           null_event_sink);
-}

=== removed file 'src/mirserver/application_instance_mirserver_priv.h'
--- src/mirserver/application_instance_mirserver_priv.h	2013-06-17 22:51:21 +0000
+++ src/mirserver/application_instance_mirserver_priv.h	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#ifndef UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_
-#define UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_
-
-#include <ubuntu/application/instance.h>
-
-#include <memory>
-#include <functional>
-
-namespace mir
-{
-namespace shell
-{
-class SurfaceCreationParameters;
-class Surface;
-class SurfaceFactory;
-}
-}
-
-namespace ubuntu
-{
-namespace application
-{
-namespace mir
-{
-class Description;
-class Options;
-
-namespace server
-{
-
-class Instance
-{
-public:
-    Instance(std::shared_ptr< ::mir::shell::SurfaceFactory> const& surface_factory,
-             ubuntu::application::mir::Description* description, 
-             ubuntu::application::mir::Options *options);
-    ~Instance() = default;
-    
-    UApplicationInstance* as_u_application_instance();
-    static Instance* from_u_application_instance(UApplicationInstance* u_instance);
-    
-    void ref();
-    void unref();
-    
-    std::shared_ptr< ::mir::shell::Surface> create_surface( ::mir::shell::SurfaceCreationParameters const& parameters);
-    
-protected:
-    Instance(Instance const&) = delete;
-    Instance& operator=(Instance const&) = delete;
-
-private:
-    typedef std::unique_ptr<Description, std::function<void(Description*)>> DescriptionPtr;
-    typedef std::unique_ptr<Options, std::function<void(Options*)>> OptionsPtr;
-    
-    OptionsPtr options;
-    DescriptionPtr description;
-    
-    std::shared_ptr< ::mir::shell::SurfaceFactory> const surface_factory;
-    int ref_count;
-};
-
-}
-}
-}
-} // namespace ubuntu
-
-#endif // UBUNTU_APPLICATION_INSTANCE_MIRSERVER_PRIV_H_

=== removed file 'src/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/mirserver/ubuntu_application_api_mirserver.cpp	2013-06-17 22:51:21 +0000
+++ src/mirserver/ubuntu_application_api_mirserver.cpp	1970-01-01 00:00:00 +0000
@@ -1,320 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Robert Carr <[e-mail]>
- */
-
-#include "ubuntu_application_api_mirserver_priv.h"
-#include "application_instance_mirserver_priv.h"
-#include "window_properties_mirserver_priv.h"
-#include "window_mirserver_priv.h"
-
-#include "mircommon/application_id_mir_priv.h"
-#include "mircommon/application_description_mir_priv.h"
-#include "mircommon/application_options_mir_priv.h"
-
-// C APIs
-#include <ubuntu/application/lifecycle_delegate.h>
-#include <ubuntu/application/ui/window.h>
-#include <ubuntu/application/ui/options.h>
-#include <ubuntu/application/ui/session.h>
-#include <ubuntu/application/ui/clipboard.h>
-#include <ubuntu/application/ui/display.h>
-#include <ubuntu/application/sensors/accelerometer.h>
-#include <ubuntu/application/sensors/proximity.h>
-#include <ubuntu/application/sensors/light.h>
-
-#include <mir/default_server_configuration.h>
-
-#include <mir/graphics/display.h>
-#include <mir/graphics/platform.h>
-#include <mir/compositor/graphic_buffer_allocator.h>
-#include <mir/frontend/session.h>
-#include <mir/frontend/shell.h>
-#include <mir/shell/surface_creation_parameters.h>
-#include <mir/shell/surface.h>
-#include <mir/graphics/internal_client.h>
-#include <mir/input/input_platform.h>
-
-#include <assert.h>
-
-#include <memory>
-#include <functional>
-
-namespace uam = ubuntu::application::mir;
-namespace uams = ubuntu::application::mir::server;
-
-namespace
-{
-
-struct MirServerContext
-{
-    std::shared_ptr<mir::graphics::Display> display;
-    std::shared_ptr<mir::compositor::GraphicBufferAllocator> buffer_allocator;
-    std::shared_ptr<mir::shell::SurfaceFactory> surface_factory;
-    std::shared_ptr<mir::input::receiver::InputPlatform> input_platform;
-    std::shared_ptr<mir::graphics::InternalClient> egl_client;
-};
-
-MirServerContext *
-global_mirserver_context()
-{
-    static MirServerContext context;
-    return &context;
-}
-
-extern "C"
-{
-void ua_ui_mirserver_init(mir::DefaultServerConfiguration& config)
-{
-    auto context = global_mirserver_context();
-
-    context->display = config.the_display();
-    context->buffer_allocator = config.the_buffer_allocator();
-    context->surface_factory = config.the_shell_surface_factory();
-    context->input_platform = mir::input::receiver::InputPlatform::create();
-    context->egl_client = config.the_graphics_platform()->create_internal_client();
-}
-
-void ua_ui_mirserver_finish()
-{
-    auto context = global_mirserver_context();
-
-    context->display.reset();
-    context->surface_factory.reset();
-    context->input_platform.reset();
-    context->egl_client.reset();
-}
-}
-
-}
-
-
-extern "C"
-{
-
-UApplicationInstance* u_application_instance_new_from_description_with_options(UApplicationDescription* u_description, UApplicationOptions* u_options)
-{
-    auto surface_factory = global_mirserver_context()->surface_factory;
-    assert(surface_factory);
-
-    auto description = uam::Description::from_u_application_description(u_description);
-    auto options = uam::Options::from_u_application_options(u_options);
-
-    auto instance = new uams::Instance(surface_factory, description, options);
-
-    return instance->as_u_application_instance();
-}
-
-void
-u_application_instance_ref(UApplicationInstance *u_instance)
-{
-    auto instance = uams::Instance::from_u_application_instance(u_instance);
-    instance->ref();
-}
-    
-void
-u_application_instance_unref(UApplicationInstance *u_instance)
-{
-    auto instance = uams::Instance::from_u_application_instance(u_instance);
-    instance->unref();
-}
-    
-void
-u_application_instance_destroy(UApplicationInstance *instance)
-{
-    // TODO<papi>: What are the proper semantics here.
-    u_application_instance_unref(instance);
-}
-    
-void
-u_application_instance_run(UApplicationInstance *instance)
-{
-    // TODO<papi>: What is this supposed to do? Seems to be no-op on hybris.
-    (void) instance;
-}
-
-void ua_ui_set_clipboard_content(void* content, size_t content_size)
-{
-    // TODO<mir,papi>: Implement. Probably need more arguments?
-    (void) content;
-    (void) content_size;
-}
-
-void ua_ui_get_clipboard_content(void** out_content, size_t* out_content_size)
-{
-    // TODO<mir,papi>: Implement
-    *out_content = NULL;
-    *out_content_size = 0;
-}
-
-UAUiDisplay* ua_ui_display_new_with_index(size_t index)
-{
-    // TODO<mir>: Make use of index. This is kind of strangely done...
-    return reinterpret_cast<UAUiDisplay*>(index);
-}
-
-void ua_ui_display_destroy(UAUiDisplay* display)
-{
-    // TODO: Implement. Or is this a noop for mirserver?
-    (void) display;
-}
-
-uint32_t ua_ui_display_query_horizontal_res(UAUiDisplay* display)
-{
-    (void) display; // TODO<mir>: Multiple displays
-
-    auto mir_display = global_mirserver_context()->display;
-    assert(mir_display);
-    
-    return mir_display->view_area().size.width.as_uint32_t();
-}
-
-uint32_t ua_ui_display_query_vertical_res(UAUiDisplay* display)
-{