Merge lp:~dandrader/qtmir/dbusClipboard into lp:qtmir

[Daniel d'Andrada]

Provide a global clipboard via D-Bus

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/qtubuntu/dbusClipboard/+merge/235502

* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes.

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Not applicable.

Until bug 1372579 is released, to make sure apparmor doesn't block d-bus communication to that new interface and object add the following to /usr/share/apparmor/easyprof/templates/ubuntu/1.2/ubuntu-sdk":

"""
dbus (receive, send)
     bus=session
     path=/com/canonical/Unity/Clipboard
     interface=com.canonical.Unity.Clipboard,
"""

And then run:
$ sudo aa-clickhook -f

[Gerry Boland (gerboland)]

You could create an MR for apparmor-easyprof-ubuntu to add that apparmor exception

[Daniel d'Andrada (dandrader)]

> You could create an MR for apparmor-easyprof-ubuntu to add that apparmor
> exception

It's bug 1372579. That's the way jdstrand asked me to proceed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:253
http://jenkins.qa.ubuntu.com/job/qtmir-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/81/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/81/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

The comments and assert at 69/70 seems a little concerning...? Perhaps the data could be clipped? (even in Clipboard::setMimeData...then the assert could remain, becoming an actual precondition of the function).

Beyond that seems ok as a temporary solution.

review: Needs Fixing

[Robert Carr (robertcarr)]

I know this is a preexisting issue but when else to fix it "before release" as the comment references.

[lp:~dandrader/qtmir/dbusClipboard]

254. By Daniel d'Andrada on 2014-09-23

Implement contents size limitation in the D-Bus (global) clipboard

[Daniel d'Andrada (dandrader)]

> The comments and assert at 69/70 seems a little concerning...? Perhaps the
> data could be clipped? (even in Clipboard::setMimeData...then the assert could
> remain, becoming an actual precondition of the function).

Implemented by size limitation. Clipping would make the resulting contents unusable (imagine a half written jpg). So I went for simply refusing/ignoring oversized clipboard contents instead.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/qtmir-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-utopic-armhf-ci/84/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/84/rebuild

review: Approve (continuous-integration)

[Robert Carr (robertcarr)]

LGTM!

review: Approve

=== added file 'src/platforms/mirserver/clipboard.cpp'
--- src/platforms/mirserver/clipboard.cpp	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/clipboard.cpp	2014-09-23 11:37:20 +0000
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Daniel d'Andrada <[e-mail]>
+ */
+
+#include "clipboard.h"
+#include "logging.h"
+
+// C++ std lib
+#include <utility>
+
+#include <QDBusConnection>
+#include <QDBusError>
+#include <QMimeData>
+
+Q_LOGGING_CATEGORY(QTMIR_CLIPBOARD, "qtmir.clipboard")
+
+// FIXME(loicm) The clipboard data format is not defined by Ubuntu Platform API
+//     which makes it impossible to have non-Qt applications communicate with Qt
+//     applications through the clipboard API. The solution would be to have
+//     Ubuntu Platform define the data format or propose an API that supports
+//     embedding different mime types in the clipboard.
+
+// Data format:
+//   number of mime types      (sizeof(int))
+//   data layout               ((4 * sizeof(int)) * number of mime types)
+//     mime type string offset (sizeof(int))
+//     mime type string size   (sizeof(int))
+//     data offset             (sizeof(int))
+//     data size               (sizeof(int))
+//   data                      (n bytes)
+
+namespace {
+
+const int maxFormatsCount = 16;
+
+}
+
+namespace qtmir {
+
+QByteArray serializeMimeData(QMimeData *mimeData)
+{
+    const QStringList formats = mimeData->formats();
+    const int formatCount = qMin(formats.size(), maxFormatsCount);
+    const int headerSize = sizeof(int) + (formatCount * 4 * sizeof(int));
+    int bufferSize = headerSize;
+
+    for (int i = 0; i < formatCount; i++)
+        bufferSize += formats[i].size() + mimeData->data(formats[i]).size();
+
+    // Serialize data.
+    QByteArray serializedMimeData(bufferSize, 0 /* char to fill with */);
+    {
+        char *buffer = serializedMimeData.data();
+        int* header = reinterpret_cast<int*>(serializedMimeData.data());
+        int offset = headerSize;
+        header[0] = formatCount;
+        for (int i = 0; i < formatCount; i++) {
+            const int formatOffset = offset;
+            const int formatSize = formats[i].size();
+            const int dataOffset = offset + formatSize;
+            const int dataSize = mimeData->data(formats[i]).size();
+            memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
+            memcpy(&buffer[dataOffset], mimeData->data(formats[i]).data(), dataSize);
+            header[i*4+1] = formatOffset;
+            header[i*4+2] = formatSize;
+            header[i*4+3] = dataOffset;
+            header[i*4+4] = dataSize;
+            offset += formatSize + dataSize;
+        }
+    }
+
+    return serializedMimeData;
+}
+
+QMimeData *deserializeMimeData(const QByteArray &serializedMimeData)
+{
+    if (static_cast<std::size_t>(serializedMimeData.size()) < sizeof(int)) {
+        // Data is invalid
+        return nullptr;
+    }
+
+    QMimeData *mimeData = new QMimeData;
+
+    const char* const buffer = serializedMimeData.constData();
+    const int* const header = reinterpret_cast<const int*>(serializedMimeData.constData());
+
+    const int count = qMin(header[0], maxFormatsCount);
+
+    for (int i = 0; i < count; i++) {
+        const int formatOffset = header[i*4+1];
+        const int formatSize = header[i*4+2];
+        const int dataOffset = header[i*4+3];
+        const int dataSize = header[i*4+4];
+
+        if (formatOffset + formatSize <= serializedMimeData.size()
+                && dataOffset + dataSize <= serializedMimeData.size()) {
+
+            QString mimeType = QString::fromLatin1(&buffer[formatOffset], formatSize);
+            QByteArray mimeDataBytes(&buffer[dataOffset], dataSize);
+
+            mimeData->setData(mimeType, mimeDataBytes);
+        }
+    }
+
+    return mimeData;
+}
+
+/************************************ DBusClipboard *****************************************/
+
+bool DBusClipboard::skipDBusRegistration = false;
+
+DBusClipboard::DBusClipboard(QObject *parent)
+    : QObject(parent)
+{
+    if (!skipDBusRegistration) {
+        performDBusRegistration();
+    }
+}
+
+void DBusClipboard::setContents(QByteArray newContents)
+{
+    setContentsHelper(std::move(newContents));
+}
+
+void DBusClipboard::SetContents(QByteArray newContents)
+{
+    qCDebug(QTMIR_CLIPBOARD, "D-Bus SetContents - %d bytes", newContents.size());
+
+    if (setContentsHelper(std::move(newContents))) {
+        Q_EMIT contentsChangedRemotely();
+    }
+}
+
+bool DBusClipboard::setContentsHelper(QByteArray newContents)
+{
+    if (newContents.size() > maxContentsSize) {
+        qCWarning(QTMIR_CLIPBOARD, "D-Bus clipboard refused the new contents (%d bytes) as they're"
+                " bigger than the maximum allowed size of %d bytes.",
+                newContents.size(), maxContentsSize);
+        return false;
+    }
+
+    if (newContents != m_contents) {
+        m_contents = std::move(newContents);
+        Q_EMIT ContentsChanged(m_contents);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+QByteArray DBusClipboard::GetContents() const
+{
+    qCDebug(QTMIR_CLIPBOARD, "D-Bus GetContents - returning %d bytes", m_contents.size());
+    return m_contents;
+}
+
+void DBusClipboard::performDBusRegistration()
+{
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    const char *serviceName = "com.canonical.QtMir";
+    const char *objectName = "/com/canonical/QtMir/Clipboard";
+
+    bool serviceOk = connection.registerService(serviceName);
+    if (!serviceOk) {
+        QDBusError error = connection.lastError();
+        QString errorMessage;
+        if (error.isValid()) {
+            errorMessage = error.message();
+        }
+        qCCritical(QTMIR_CLIPBOARD, "Failed to register service %s. %s", serviceName, qPrintable(errorMessage));
+    }
+
+    bool objectOk = connection.registerObject(objectName, this,
+                              QDBusConnection::ExportScriptableSignals
+                              | QDBusConnection::ExportScriptableSlots);
+    if (!objectOk) {
+        QDBusError error = connection.lastError();
+        QString errorMessage;
+        if (error.isValid()) {
+            errorMessage = error.message();
+        }
+        qCCritical(QTMIR_CLIPBOARD, "Failed to register object %s. %s", objectName, qPrintable(errorMessage));
+    }
+
+    if (serviceOk && objectOk) {
+        qCDebug(QTMIR_CLIPBOARD, "D-Bus registration successful.");
+    }
+}
+
+/************************************ Clipboard *****************************************/
+
+Clipboard::Clipboard(QObject *parent)
+    : QObject(parent)
+    , m_dbusClipboard(nullptr)
+{
+}
+
+QMimeData *Clipboard::mimeData(QClipboard::Mode mode)
+{
+    if (mode == QClipboard::Clipboard) {
+        return QPlatformClipboard::mimeData(mode);
+    } else {
+        return nullptr;
+    }
+}
+
+void Clipboard::setMimeData(QMimeData *data, QClipboard::Mode mode)
+{
+    if (mode != QClipboard::Clipboard)
+        return;
+
+    if (m_dbusClipboard) {
+        QByteArray serializedMimeData = serializeMimeData(data);
+        m_dbusClipboard->setContents(std::move(serializedMimeData));
+    }
+
+    QPlatformClipboard::setMimeData(data, mode);
+}
+
+void Clipboard::setupDBusService()
+{
+    Q_ASSERT(!m_dbusClipboard);
+
+    m_dbusClipboard = new DBusClipboard(this);
+
+    connect(m_dbusClipboard, &DBusClipboard::contentsChangedRemotely,
+            this, &Clipboard::setMimeDataWithDBusClibpboardContents);
+}
+
+void Clipboard::setMimeDataWithDBusClibpboardContents()
+{
+    Q_ASSERT(m_dbusClipboard);
+    QMimeData *newMimeData = deserializeMimeData(m_dbusClipboard->contents());
+    if (newMimeData) {
+        // Don't call Clipboard::setMimeData as it will also propagate the change
+        // to the D-Bus clipboard, which doesn't make sense here as we're doing
+        // the other way round (propagating the D-Bus clipboard change to the local
+        // clipboard).
+        QPlatformClipboard::setMimeData(newMimeData, QClipboard::Clipboard);
+    } else {
+        qCWarning(QTMIR_CLIPBOARD, "Failed to deserialize D-Bus clipboard contents (%d bytes)",
+                m_dbusClipboard->contents().size());
+    }
+}
+
+} // namespace qtmir
+
 
=== added file 'src/platforms/mirserver/clipboard.h'
--- src/platforms/mirserver/clipboard.h	1970-01-01 00:00:00 +0000
+++ src/platforms/mirserver/clipboard.h	2014-09-23 11:37:20 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ *
+ * Author: Daniel d'Andrada <[e-mail]>
+ */
+
+#ifndef QTMIR_CLIPBOARD_H
+#define QTMIR_CLIPBOARD_H
+
+#include <qpa/qplatformclipboard.h>
+#include <QObject>
+
+namespace qtmir {
+
+class DBusClipboard : public QObject {
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.canonical.QtMir.Clipboard")
+public:
+    DBusClipboard(QObject *parent = nullptr);
+    virtual ~DBusClipboard() {}
+
+    void setContents(QByteArray contents);
+    const QByteArray &contents() const { return m_contents; }
+
+    static const int maxContentsSize = 4 * 1024 * 1024;  // 4 Mb
+
+    // To make it testable
+    static bool skipDBusRegistration;
+
+Q_SIGNALS:
+    Q_SCRIPTABLE void ContentsChanged(const QByteArray &contents);
+    void contentsChangedRemotely();
+
+public Q_SLOTS:
+    Q_SCRIPTABLE QByteArray GetContents() const;
+    Q_SCRIPTABLE void SetContents(QByteArray contents);
+
+private:
+    void performDBusRegistration();
+    bool setContentsHelper(QByteArray newContents);
+
+    // Contains a serialized QMimeData
+    // Serialization and deserialization is done by the QPlatformClipboard
+    // implementation.
+    QByteArray m_contents;
+};
+
+class Clipboard : public QObject, public QPlatformClipboard
+{
+    Q_OBJECT
+public:
+    Clipboard(QObject *parent = nullptr);
+    virtual ~Clipboard() {}
+
+    QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override;
+    void setMimeData(QMimeData *data, QClipboard::Mode mode) override;
+
+    void setupDBusService();
+
+private Q_SLOTS:
+    void setMimeDataWithDBusClibpboardContents();
+
+private:
+
+    DBusClipboard *m_dbusClipboard;
+};
+
+// NB: Copied from qtubuntu. Must be kept in sync with the original version!
+// Best thing would be to share this code somehow, but not bothering with it right now
+// as the clipboard will move to content-hub at some point.
+QByteArray serializeMimeData(QMimeData *mimeData);
+QMimeData *deserializeMimeData(const QByteArray &serializedMimeData);
+
+} // namespace qtmir
+
+#endif // QTMIR_CLIPBOARD_H
 
=== removed file 'src/platforms/mirserver/connectioncreator.cpp'
--- src/platforms/mirserver/connectioncreator.cpp	2014-06-26 15:14:00 +0000
+++ src/platforms/mirserver/connectioncreator.cpp	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, 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/>.
- */
-
-#include "connectioncreator.h"
-#include <messageprocessor.h>
-
-ConnectionCreator::ConnectionCreator(
-        std::shared_ptr<unity::protobuf::UnityService> const& unityService,
-        std::shared_ptr<mir::frontend::ProtobufIpcFactory> const& ipc_factory,
-        std::shared_ptr<mir::frontend::SessionAuthorizer> const& session_authorizer,
-        std::shared_ptr<mir::frontend::MessageProcessorReport> const& report)
-    : ProtobufConnectionCreator(ipc_factory, session_authorizer, report)
-    , m_unityService(unityService)
-{
-}
-
-std::shared_ptr<mir::frontend::detail::MessageProcessor> ConnectionCreator::create_processor(
-    std::shared_ptr<mir::frontend::detail::ProtobufMessageSender> const& sender,
-    std::shared_ptr<mir::frontend::detail::DisplayServer> const& display_server,
-    std::shared_ptr<mir::frontend::MessageProcessorReport> const& report) const
-{
-    auto const wrapped = mir::frontend::ProtobufConnectionCreator::create_processor(
-            sender,
-            display_server,
-            report);
-
-    return std::make_shared<MessageProcessor>(m_unityService, sender, wrapped);
-}
-
 
=== removed file 'src/platforms/mirserver/connectioncreator.h'
--- src/platforms/mirserver/connectioncreator.h	2014-06-26 15:14:00 +0000
+++ src/platforms/mirserver/connectioncreator.h	1970-01-01 00:00:00 +0000
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, 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/>.
- */
-
-#ifndef CONNECTIONCREATOR_H
-#define CONNECTIONCREATOR_H
-
-#include <mir/frontend/protobuf_connection_creator.h>
-
-namespace unity {
-    namespace protobuf {
-        class UnityService;
-    }
-}
-
-class ConnectionCreator : public mir::frontend::ProtobufConnectionCreator
-{
-public:
-    ConnectionCreator(
-        std::shared_ptr<unity::protobuf::UnityService> const& unityService,
-        std::shared_ptr<mir::frontend::ProtobufIpcFactory> const& ipc_factory,
-        std::shared_ptr<mir::frontend::SessionAuthorizer> const& session_authorizer,
-        std::shared_ptr<mir::frontend::MessageProcessorReport> const& report);
-
-    std::shared_ptr<mir::frontend::detail::MessageProcessor> create_processor(
-        std::shared_ptr<mir::frontend::detail::ProtobufMessageSender> const& sender,
-        std::shared_ptr<mir::frontend::detail::DisplayServer> const& display_server,
-        std::shared_ptr<mir::frontend::MessageProcessorReport> const& report) const override;
-private:
-    std::shared_ptr<unity::protobuf::UnityService> m_unityService;
-};
-
-#endif // CONNECTIONCREATOR_H
-
 
=== modified file 'src/platforms/mirserver/logging.h'
--- src/platforms/mirserver/logging.h	2014-09-07 19:42:14 +0000
+++ src/platforms/mirserver/logging.h	2014-09-23 11:37:20 +0000
@@ -23,5 +23,6 @@
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_SURFACES)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_MESSAGES)
 Q_DECLARE_LOGGING_CATEGORY(QTMIR_MIR_INPUT)
+Q_DECLARE_LOGGING_CATEGORY(QTMIR_CLIPBOARD)
 
 #endif // UBUNTU_APPLICATION_PLUGIN_LOGGING_H
 
=== removed file 'src/platforms/mirserver/messageprocessor.cpp'
--- src/platforms/mirserver/messageprocessor.cpp	2014-06-26 15:14:00 +0000
+++ src/platforms/mirserver/messageprocessor.cpp	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, 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/>.
- */
-
-#include "messageprocessor.h"
-#include <mir/frontend/template_protobuf_message_processor.h>
-
-bool MessageProcessor::dispatch(mir::frontend::detail::Invocation const& invocation)
-{
-    if ("copy" == invocation.method_name()) {
-        mir::frontend::detail::invoke(
-            this,
-            m_unityService.get(),
-            &unity::protobuf::UnityService::copy,
-            invocation);
-        return true;
-    } else if ("paste" == invocation.method_name()) {
-        mir::frontend::detail::invoke(
-            this,
-            m_unityService.get(),
-            &unity::protobuf::UnityService::paste,
-            invocation);
-        return true;
-    } else {
-        return m_wrapped->dispatch(invocation);
-    }
-}
-
-void MessageProcessor::client_pid(int pid)
-{
-    m_wrapped->client_pid(pid);
-}
-
-void MessageProcessor::send_response(::google::protobuf::uint32 id, ::google::protobuf::Message* response)
-{
-    m_sender->send_response(id, response, {});
-}
 
=== removed file 'src/platforms/mirserver/messageprocessor.h'
--- src/platforms/mirserver/messageprocessor.h	2014-06-26 15:14:00 +0000
+++ src/platforms/mirserver/messageprocessor.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, 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/>.
- */
-
-#include <mir/frontend/message_processor.h>
-#include <mir/frontend/protobuf_message_sender.h>
-
-#include "unityrpc.h"
-
-#include <memory>
-
-class MessageProcessor : public mir::frontend::detail::MessageProcessor
-{
-public:
-    MessageProcessor(
-        std::shared_ptr<unity::protobuf::UnityService> const& unityService,
-        std::shared_ptr<mir::frontend::detail::ProtobufMessageSender> const& sender,
-        std::shared_ptr<mir::frontend::detail::MessageProcessor> const& wrapped) :
-        m_sender(sender),
-        m_wrapped(wrapped),
-        m_unityService(unityService) {}
-
-    bool dispatch(mir::frontend::detail::Invocation const& invocation) override;
-    void client_pid(int pid) override;
-
-    void send_response(::google::protobuf::uint32 id, ::google::protobuf::Message* response);
-
-private:
-    std::shared_ptr<mir::frontend::detail::ProtobufMessageSender> const m_sender;
-    std::shared_ptr<mir::frontend::detail::MessageProcessor> const m_wrapped;
-    std::shared_ptr<unity::protobuf::UnityService> const m_unityService;
-};
 
=== modified file 'src/platforms/mirserver/mirserver.pro'
--- src/platforms/mirserver/mirserver.pro	2014-09-07 19:42:33 +0000
+++ src/platforms/mirserver/mirserver.pro	2014-09-23 11:37:20 +0000
@@ -24,8 +24,8 @@
 LIBS += -lboost_system
 
 SOURCES += \
-    connectioncreator.cpp \
     ../../common/debughelpers.cpp \
+    clipboard.cpp \
     focussetter.cpp \
     qteventfeeder.cpp \
     plugin.cpp \
@@ -34,7 +34,6 @@
     sessionlistener.cpp \
     surfaceconfigurator.cpp \
     promptsessionlistener.cpp \
-    messageprocessor.cpp \
     mirplacementstrategy.cpp \
     mirserverconfiguration.cpp \
     mirserverstatuslistener.cpp \
@@ -47,12 +46,11 @@
     qtcompositor.cpp \
     services.cpp \
     ubuntutheme.cpp \
-    unityprotobufservice.cpp \
-    unityrpc.cpp
+
 
 HEADERS += \
-    connectioncreator.h \
     ../../common/debughelpers.h \
+    clipboard.h \
     focussetter.h \
     qteventfeeder.h \
     plugin.h \
@@ -62,7 +60,6 @@
     promptsessionlistener.h \
     surfaceconfigurator.h \
     logging.h \
-    messageprocessor.h \
     mirglconfig.h \
     mirplacementstrategy.h \
     mirserverconfiguration.h \
@@ -76,8 +73,7 @@
     qtcompositor.h \
     services.h \
     ubuntutheme.h \
-    unityprotobufservice.h \
-    unityrpc.h
+
 
 LTTNG_TP_FILES += tracepoints.tp
 
 
=== modified file 'src/platforms/mirserver/mirserverconfiguration.cpp'
--- src/platforms/mirserver/mirserverconfiguration.cpp	2014-08-27 16:51:24 +0000
+++ src/platforms/mirserver/mirserverconfiguration.cpp	2014-09-23 11:37:20 +0000
@@ -17,7 +17,6 @@
 #include "mirserverconfiguration.h"
 
 // local
-#include "connectioncreator.h"
 #include "focussetter.h"
 #include "mirglconfig.h"
 #include "mirplacementstrategy.h"
@@ -29,14 +28,10 @@
 #include "qtcompositor.h"
 #include "qteventfeeder.h"
 #include "logging.h"
-#include "unityprotobufservice.h"
 
 // mir
 #include <mir/options/default_configuration.h>
 
-// Qt
-#include <QDebug>
-
 // egl
 #include <EGL/egl.h>
 
@@ -56,7 +51,6 @@
 MirServerConfiguration::MirServerConfiguration(int argc, char const* argv[], QObject* parent)
     : QObject(parent)
     , DefaultServerConfiguration(std::make_shared<mo::DefaultConfiguration>(argc, argv, &ignore_unparsed_arguments))
-    , m_unityService(std::make_shared<UnityProtobufService>())
 {
     qCDebug(QTMIR_MIR_MESSAGES) << "MirServerConfiguration created";
 }
@@ -155,19 +149,6 @@
         });
 }
 
-std::shared_ptr<mir::frontend::ConnectionCreator>
-MirServerConfiguration::the_connection_creator()
-{
-    return connection_creator([this]
-        {
-            return std::make_shared<ConnectionCreator>(
-                m_unityService,
-                new_ipc_factory(the_session_authorizer()),
-                the_session_authorizer(),
-                the_message_processor_report());
-        });
-}
-
 std::shared_ptr<mir::shell::FocusSetter>
 MirServerConfiguration::the_shell_focus_setter()
 {
 
=== modified file 'src/platforms/mirserver/mirserverconfiguration.h'
--- src/platforms/mirserver/mirserverconfiguration.h	2014-07-11 17:15:47 +0000
+++ src/platforms/mirserver/mirserverconfiguration.h	2014-09-23 11:37:20 +0000
@@ -20,12 +20,6 @@
 #include <QObject>
 #include <mir/default_server_configuration.h>
 
-namespace unity {
-    namespace protobuf {
-        class UnityService;
-    }
-}
-
 class QtEventFeeder;
 class SessionListener;
 class SessionAuthorizer;
@@ -55,7 +49,6 @@
     std::shared_ptr<mir::input::InputDispatcher> the_input_dispatcher() override;
     std::shared_ptr<mir::graphics::GLConfig> the_gl_config() override;
     std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override;
-    std::shared_ptr<mir::frontend::ConnectionCreator> the_connection_creator() override;
     std::shared_ptr<mir::shell::FocusSetter> the_shell_focus_setter() override;
 
     /* qt specific */
@@ -66,7 +59,6 @@
     SurfaceConfigurator *surfaceConfigurator();
 
 private:
-    std::shared_ptr<unity::protobuf::UnityService> m_unityService;
     std::shared_ptr<QtEventFeeder> m_qtEventFeeder;
 };
 
 
=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
--- src/platforms/mirserver/mirserverintegration.cpp	2014-07-08 18:23:45 +0000
+++ src/platforms/mirserver/mirserverintegration.cpp	2014-09-23 11:37:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 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
@@ -13,7 +13,8 @@
  * 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/>.
  *
- * Author: Gerry Boland <[e-mail]>
+ * Authors: Gerry Boland <[e-mail]>
+ *          Daniel d'Andrada <[e-mail]>
  */
 
 #include "mirserverintegration.h"
@@ -47,6 +48,7 @@
 #include <csignal>
 
 // local
+#include "clipboard.h"
 #include "display.h"
 #include "displaywindow.h"
 #include "miropenglcontext.h"
@@ -56,6 +58,7 @@
 #include "ubuntutheme.h"
 
 namespace mg = mir::graphics;
+using qtmir::Clipboard;
 
 MirServerIntegration::MirServerIntegration()
     : m_accessibility(new QPlatformAccessibility())
@@ -67,6 +70,7 @@
     , m_display(nullptr)
     , m_mirServer(nullptr)
     , m_nativeInterface(nullptr)
+    , m_clipboard(new Clipboard)
 {
     // Start Mir server only once Qt has initialized its event dispatcher, see initialize()
 
@@ -174,6 +178,8 @@
         qDebug() << "Signal caught by Mir, stopping Mir server..";
         QCoreApplication::quit();
     });
+
+    m_clipboard->setupDBusService();
 }
 
 QPlatformAccessibility *MirServerIntegration::accessibility() const
@@ -206,3 +212,8 @@
 {
     return m_nativeInterface;
 }
+
+QPlatformClipboard *MirServerIntegration::clipboard() const
+{
+    return m_clipboard.data();
+}
 
=== modified file 'src/platforms/mirserver/mirserverintegration.h'
--- src/platforms/mirserver/mirserverintegration.h	2014-06-03 20:53:46 +0000
+++ src/platforms/mirserver/mirserverintegration.h	2014-09-23 11:37:20 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2013-2014 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
@@ -13,7 +13,8 @@
  * 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/>.
  *
- * Author: Gerry Boland <[e-mail]>
+ * Authors: Gerry Boland <[e-mail]>
+ *          Daniel d'Andrada <[e-mail]>
  */
 
 #ifndef MIRSERVERINTEGRATION_H
@@ -29,6 +30,10 @@
 class NativeInterface;
 class QMirServer;
 
+namespace qtmir {
+    class Clipboard;
+}
+
 class MirServerIntegration : public QPlatformIntegration
 {
 public:
@@ -49,6 +54,8 @@
     void initialize() override;
 #endif
 
+    QPlatformClipboard *clipboard() const override;
+
     QPlatformInputContext* inputContext() const override { return m_inputContext; }
 
     QPlatformFontDatabase *fontDatabase() const override;
@@ -74,6 +81,7 @@
     QMirServer *m_mirServer;
     NativeInterface *m_nativeInterface;
     QPlatformInputContext* m_inputContext;
+    QScopedPointer<qtmir::Clipboard> m_clipboard;
 };
 
 #endif // MIRSERVERINTEGRATION_H
 
=== removed file 'src/platforms/mirserver/unityprotobufservice.cpp'
--- src/platforms/mirserver/unityprotobufservice.cpp	2014-06-16 18:29:36 +0000
+++ src/platforms/mirserver/unityprotobufservice.cpp	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, 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/>.
- */
-
-#include "unityprotobufservice.h"
-
-void UnityProtobufService::copy(::google::protobuf::RpcController* /*controller*/,
-        const ::unity::protobuf::Clip* newClip,
-        ::unity::protobuf::Void* /*response*/,
-        ::google::protobuf::Closure* done)
-{
-    m_clip = newClip->content();
-    done->Run();
-}
-
-void UnityProtobufService::paste(::google::protobuf::RpcController* /*controller*/,
-        const ::unity::protobuf::Void* /*request*/,
-        ::unity::protobuf::Clip* clipReturned,
-        ::google::protobuf::Closure* done)
-{
-    clipReturned->set_content(m_clip);
-    done->Run();
-}
 
=== removed file 'src/platforms/mirserver/unityprotobufservice.h'
--- src/platforms/mirserver/unityprotobufservice.h	2014-06-16 18:29:36 +0000
+++ src/platforms/mirserver/unityprotobufservice.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, 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/>.
- */
-
-#ifndef UNITY_PROTOBUF_SERVICE_H
-#define UNITY_PROTOBUF_SERVICE_H
-
-#include "unityrpc.h"
-#include <string>
-
-class UnityProtobufService : public unity::protobuf::UnityService
-{
-public:
-    void copy(::google::protobuf::RpcController* controller,
-            const ::unity::protobuf::Clip* request,
-            ::unity::protobuf::Void* response,
-            ::google::protobuf::Closure* done) override;
-
-    void paste(::google::protobuf::RpcController* controller,
-            const ::unity::protobuf::Void* request,
-            ::unity::protobuf::Clip* response,
-            ::google::protobuf::Closure* done) override;
-
-private:
-    std::string m_clip;
-};
-
-#endif // UNITY_PROTOBUF_SERVICE_H
 
=== removed file 'src/platforms/mirserver/unityrpc.cpp'
--- src/platforms/mirserver/unityrpc.cpp	2014-06-16 18:29:36 +0000
+++ src/platforms/mirserver/unityrpc.cpp	1970-01-01 00:00:00 +0000
@@ -1,742 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: unityrpc.proto
-
-#define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
-#include "unityrpc.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/once.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// @@protoc_insertion_point(includes)
-
-namespace unity {
-namespace protobuf {
-
-namespace {
-
-const ::google::protobuf::Descriptor* Clip_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  Clip_reflection_ = NULL;
-const ::google::protobuf::Descriptor* Void_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  Void_reflection_ = NULL;
-const ::google::protobuf::ServiceDescriptor* UnityService_descriptor_ = NULL;
-
-}  // namespace
-
-
-void protobuf_AssignDesc_unityrpc_2eproto() {
-  protobuf_AddDesc_unityrpc_2eproto();
-  const ::google::protobuf::FileDescriptor* file =
-    ::google::protobuf::DescriptorPool::generated_pool()->FindFileByName(
-      "unityrpc.proto");
-  GOOGLE_CHECK(file != NULL);
-  Clip_descriptor_ = file->message_type(0);
-  static const int Clip_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Clip, content_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Clip, error_),
-  };
-  Clip_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      Clip_descriptor_,
-      Clip::default_instance_,
-      Clip_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Clip, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Clip, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(Clip));
-  Void_descriptor_ = file->message_type(1);
-  static const int Void_offsets_[1] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Void, error_),
-  };
-  Void_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      Void_descriptor_,
-      Void::default_instance_,
-      Void_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Void, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Void, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(Void));
-  UnityService_descriptor_ = file->service(0);
-}
-
-namespace {
-
-GOOGLE_PROTOBUF_DECLARE_ONCE(protobuf_AssignDescriptors_once_);
-inline void protobuf_AssignDescriptorsOnce() {
-  ::google::protobuf::GoogleOnceInit(&protobuf_AssignDescriptors_once_,
-                 &protobuf_AssignDesc_unityrpc_2eproto);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    Clip_descriptor_, &Clip::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    Void_descriptor_, &Void::default_instance());
-}
-
-}  // namespace
-
-void protobuf_ShutdownFile_unityrpc_2eproto() {
-  delete Clip::default_instance_;
-  delete Clip_reflection_;
-  delete Void::default_instance_;
-  delete Void_reflection_;
-}
-
-void protobuf_AddDesc_unityrpc_2eproto() {
-  static bool already_here = false;
-  if (already_here) return;
-  already_here = true;
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-    "\n\016unityrpc.proto\022\016unity.protobuf\"&\n\004Clip"
-    "\022\017\n\007content\030\001 \002(\014\022\r\n\005error\030\177 \001(\t\"\025\n\004Void"
-    "\022\r\n\005error\030\177 \001(\t2w\n\014UnityService\0222\n\004copy\022"
-    "\024.unity.protobuf.Clip\032\024.unity.protobuf.V"
-    "oid\0223\n\005paste\022\024.unity.protobuf.Void\032\024.uni"
-    "ty.protobuf.ClipB\003\200\001\001", 221);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "unityrpc.proto", &protobuf_RegisterTypes);
-  Clip::default_instance_ = new Clip();
-  Void::default_instance_ = new Void();
-  Clip::default_instance_->InitAsDefaultInstance();
-  Void::default_instance_->InitAsDefaultInstance();
-  ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_unityrpc_2eproto);
-}
-
-// Force AddDescriptors() to be called at static initialization time.
-struct StaticDescriptorInitializer_unityrpc_2eproto {
-  StaticDescriptorInitializer_unityrpc_2eproto() {
-    protobuf_AddDesc_unityrpc_2eproto();
-  }
-} static_descriptor_initializer_unityrpc_2eproto_;
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int Clip::kContentFieldNumber;
-const int Clip::kErrorFieldNumber;
-#endif  // !_MSC_VER
-
-Clip::Clip()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void Clip::InitAsDefaultInstance() {
-}
-
-Clip::Clip(const Clip& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void Clip::SharedCtor() {
-  _cached_size_ = 0;
-  content_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-Clip::~Clip() {
-  SharedDtor();
-}
-
-void Clip::SharedDtor() {
-  if (content_ != &::google::protobuf::internal::kEmptyString) {
-    delete content_;
-  }
-  if (error_ != &::google::protobuf::internal::kEmptyString) {
-    delete error_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void Clip::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Clip::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return Clip_descriptor_;
-}
-
-const Clip& Clip::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_unityrpc_2eproto();
-  return *default_instance_;
-}
-
-Clip* Clip::default_instance_ = NULL;
-
-Clip* Clip::New() const {
-  return new Clip;
-}
-
-void Clip::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_content()) {
-      if (content_ != &::google::protobuf::internal::kEmptyString) {
-        content_->clear();
-      }
-    }
-    if (has_error()) {
-      if (error_ != &::google::protobuf::internal::kEmptyString) {
-        error_->clear();
-      }
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool Clip::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required bytes content = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
-                input, this->mutable_content()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(1018)) goto parse_error;
-        break;
-      }
-
-      // optional string error = 127;
-      case 127: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_error:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_error()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->error().data(), this->error().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void Clip::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // required bytes content = 1;
-  if (has_content()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBytes(
-      1, this->content(), output);
-  }
-
-  // optional string error = 127;
-  if (has_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->error().data(), this->error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      127, this->error(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* Clip::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // required bytes content = 1;
-  if (has_content()) {
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteBytesToArray(
-        1, this->content(), target);
-  }
-
-  // optional string error = 127;
-  if (has_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->error().data(), this->error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        127, this->error(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int Clip::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // required bytes content = 1;
-    if (has_content()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::BytesSize(
-          this->content());
-    }
-
-    // optional string error = 127;
-    if (has_error()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->error());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Clip::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const Clip* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const Clip*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void Clip::MergeFrom(const Clip& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_content()) {
-      set_content(from.content());
-    }
-    if (from.has_error()) {
-      set_error(from.error());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void Clip::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Clip::CopyFrom(const Clip& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Clip::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000001) != 0x00000001) return false;
-
-  return true;
-}
-
-void Clip::Swap(Clip* other) {
-  if (other != this) {
-    std::swap(content_, other->content_);
-    std::swap(error_, other->error_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata Clip::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = Clip_descriptor_;
-  metadata.reflection = Clip_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-#ifndef _MSC_VER
-const int Void::kErrorFieldNumber;
-#endif  // !_MSC_VER
-
-Void::Void()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void Void::InitAsDefaultInstance() {
-}
-
-Void::Void(const Void& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void Void::SharedCtor() {
-  _cached_size_ = 0;
-  error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-Void::~Void() {
-  SharedDtor();
-}
-
-void Void::SharedDtor() {
-  if (error_ != &::google::protobuf::internal::kEmptyString) {
-    delete error_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void Void::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* Void::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return Void_descriptor_;
-}
-
-const Void& Void::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_unityrpc_2eproto();
-  return *default_instance_;
-}
-
-Void* Void::default_instance_ = NULL;
-
-Void* Void::New() const {
-  return new Void;
-}
-
-void Void::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (has_error()) {
-      if (error_ != &::google::protobuf::internal::kEmptyString) {
-        error_->clear();
-      }
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool Void::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string error = 127;
-      case 127: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_error()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->error().data(), this->error().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void Void::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional string error = 127;
-  if (has_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->error().data(), this->error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      127, this->error(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* Void::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional string error = 127;
-  if (has_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->error().data(), this->error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        127, this->error(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int Void::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional string error = 127;
-    if (has_error()) {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->error());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Void::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const Void* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const Void*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void Void::MergeFrom(const Void& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_error()) {
-      set_error(from.error());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void Void::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Void::CopyFrom(const Void& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Void::IsInitialized() const {
-
-  return true;
-}
-
-void Void::Swap(Void* other) {
-  if (other != this) {
-    std::swap(error_, other->error_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata Void::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = Void_descriptor_;
-  metadata.reflection = Void_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-UnityService::~UnityService() {}
-
-const ::google::protobuf::ServiceDescriptor* UnityService::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return UnityService_descriptor_;
-}
-
-const ::google::protobuf::ServiceDescriptor* UnityService::GetDescriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return UnityService_descriptor_;
-}
-
-void UnityService::copy(::google::protobuf::RpcController* controller,
-                         const ::unity::protobuf::Clip*,
-                         ::unity::protobuf::Void*,
-                         ::google::protobuf::Closure* done) {
-  controller->SetFailed("Method copy() not implemented.");
-  done->Run();
-}
-
-void UnityService::paste(::google::protobuf::RpcController* controller,
-                         const ::unity::protobuf::Void*,
-                         ::unity::protobuf::Clip*,
-                         ::google::protobuf::Closure* done) {
-  controller->SetFailed("Method paste() not implemented.");
-  done->Run();
-}
-
-void UnityService::CallMethod(const ::google::protobuf::MethodDescriptor* method,
-                             ::google::protobuf::RpcController* controller,
-                             const ::google::protobuf::Message* request,
-                             ::google::protobuf::Message* response,
-                             ::google::protobuf::Closure* done) {
-  GOOGLE_DCHECK_EQ(method->service(), UnityService_descriptor_);
-  switch(method->index()) {
-    case 0:
-      copy(controller,
-             ::google::protobuf::down_cast<const ::unity::protobuf::Clip*>(request),
-             ::google::protobuf::down_cast< ::unity::protobuf::Void*>(response),
-             done);
-      break;
-    case 1:
-      paste(controller,
-             ::google::protobuf::down_cast<const ::unity::protobuf::Void*>(request),
-             ::google::protobuf::down_cast< ::unity::protobuf::Clip*>(response),
-             done);
-      break;
-    default:
-      GOOGLE_LOG(FATAL) << "Bad method index; this should never happen.";
-      break;
-  }
-}
-
-const ::google::protobuf::Message& UnityService::GetRequestPrototype(
-    const ::google::protobuf::MethodDescriptor* method) const {
-  GOOGLE_DCHECK_EQ(method->service(), descriptor());
-  switch(method->index()) {
-    case 0:
-      return ::unity::protobuf::Clip::default_instance();
-    case 1:
-      return ::unity::protobuf::Void::default_instance();
-    default:
-      GOOGLE_LOG(FATAL) << "Bad method index; this should never happen.";
-      return *reinterpret_cast< ::google::protobuf::Message*>(NULL);
-  }
-}
-
-const ::google::protobuf::Message& UnityService::GetResponsePrototype(
-    const ::google::protobuf::MethodDescriptor* method) const {
-  GOOGLE_DCHECK_EQ(method->service(), descriptor());
-  switch(method->index()) {
-    case 0:
-      return ::unity::protobuf::Void::default_instance();
-    case 1:
-      return ::unity::protobuf::Clip::default_instance();
-    default:
-      GOOGLE_LOG(FATAL) << "Bad method index; this should never happen.";
-      return *reinterpret_cast< ::google::protobuf::Message*>(NULL);
-  }
-}
-
-UnityService_Stub::UnityService_Stub(::google::protobuf::RpcChannel* channel)
-  : channel_(channel), owns_channel_(false) {}
-UnityService_Stub::UnityService_Stub(
-    ::google::protobuf::RpcChannel* channel,
-    ::google::protobuf::Service::ChannelOwnership ownership)
-  : channel_(channel),
-    owns_channel_(ownership == ::google::protobuf::Service::STUB_OWNS_CHANNEL) {}
-UnityService_Stub::~UnityService_Stub() {
-  if (owns_channel_) delete channel_;
-}
-
-void UnityService_Stub::copy(::google::protobuf::RpcController* controller,
-                              const ::unity::protobuf::Clip* request,
-                              ::unity::protobuf::Void* response,
-                              ::google::protobuf::Closure* done) {
-  channel_->CallMethod(descriptor()->method(0),
-                       controller, request, response, done);
-}
-void UnityService_Stub::paste(::google::protobuf::RpcController* controller,
-                              const ::unity::protobuf::Void* request,
-                              ::unity::protobuf::Clip* response,
-                              ::google::protobuf::Closure* done) {
-  channel_->CallMethod(descriptor()->method(1),
-                       controller, request, response, done);
-}
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace protobuf
-}  // namespace unity
-
-// @@protoc_insertion_point(global_scope)
 
=== removed file 'src/platforms/mirserver/unityrpc.h'
--- src/platforms/mirserver/unityrpc.h	2014-06-16 18:29:36 +0000
+++ src/platforms/mirserver/unityrpc.h	1970-01-01 00:00:00 +0000
@@ -1,535 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: unityrpc.proto
-
-#ifndef PROTOBUF_unityrpc_2eproto__INCLUDED
-#define PROTOBUF_unityrpc_2eproto__INCLUDED
-
-#include <string>
-
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 2005000
-#error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
-#error your headers.
-#endif
-#if 2005000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
-#error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
-#error regenerate this file with a newer version of protoc.
-#endif
-
-#include <google/protobuf/generated_message_util.h>
-#include <google/protobuf/message.h>
-#include <google/protobuf/repeated_field.h>
-#include <google/protobuf/extension_set.h>
-#include <google/protobuf/service.h>
-#include <google/protobuf/unknown_field_set.h>
-// @@protoc_insertion_point(includes)
-
-namespace unity {
-namespace protobuf {
-
-// Internal implementation detail -- do not call these.
-void  protobuf_AddDesc_unityrpc_2eproto();
-void protobuf_AssignDesc_unityrpc_2eproto();
-void protobuf_ShutdownFile_unityrpc_2eproto();
-
-class Clip;
-class Void;
-
-// ===================================================================
-
-class Clip : public ::google::protobuf::Message {
- public:
-  Clip();
-  virtual ~Clip();
-
-  Clip(const Clip& from);
-
-  inline Clip& operator=(const Clip& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Clip& default_instance();
-
-  void Swap(Clip* other);
-
-  // implements Message ----------------------------------------------
-
-  Clip* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const Clip& from);
-  void MergeFrom(const Clip& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // required bytes content = 1;
-  inline bool has_content() const;
-  inline void clear_content();
-  static const int kContentFieldNumber = 1;
-  inline const ::std::string& content() const;
-  inline void set_content(const ::std::string& value);
-  inline void set_content(const char* value);
-  inline void set_content(const void* value, size_t size);
-  inline ::std::string* mutable_content();
-  inline ::std::string* release_content();
-  inline void set_allocated_content(::std::string* content);
-
-  // optional string error = 127;
-  inline bool has_error() const;
-  inline void clear_error();
-  static const int kErrorFieldNumber = 127;
-  inline const ::std::string& error() const;
-  inline void set_error(const ::std::string& value);
-  inline void set_error(const char* value);
-  inline void set_error(const char* value, size_t size);
-  inline ::std::string* mutable_error();
-  inline ::std::string* release_error();
-  inline void set_allocated_error(::std::string* error);
-
-  // @@protoc_insertion_point(class_scope:unity.protobuf.Clip)
- private:
-  inline void set_has_content();
-  inline void clear_has_content();
-  inline void set_has_error();
-  inline void clear_has_error();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::std::string* content_;
-  ::std::string* error_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
-
-  friend void  protobuf_AddDesc_unityrpc_2eproto();
-  friend void protobuf_AssignDesc_unityrpc_2eproto();
-  friend void protobuf_ShutdownFile_unityrpc_2eproto();
-
-  void InitAsDefaultInstance();
-  static Clip* default_instance_;
-};
-// -------------------------------------------------------------------
-
-class Void : public ::google::protobuf::Message {
- public:
-  Void();
-  virtual ~Void();
-
-  Void(const Void& from);
-
-  inline Void& operator=(const Void& from) {
-    CopyFrom(from);
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
-    return _unknown_fields_;
-  }
-
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
-    return &_unknown_fields_;
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor();
-  static const Void& default_instance();
-
-  void Swap(Void* other);
-
-  // implements Message ----------------------------------------------
-
-  Void* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const Void& from);
-  void MergeFrom(const Void& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
-  int GetCachedSize() const { return _cached_size_; }
-  private:
-  void SharedCtor();
-  void SharedDtor();
-  void SetCachedSize(int size) const;
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // optional string error = 127;
-  inline bool has_error() const;
-  inline void clear_error();
-  static const int kErrorFieldNumber = 127;
-  inline const ::std::string& error() const;
-  inline void set_error(const ::std::string& value);
-  inline void set_error(const char* value);
-  inline void set_error(const char* value, size_t size);
-  inline ::std::string* mutable_error();
-  inline ::std::string* release_error();
-  inline void set_allocated_error(::std::string* error);
-
-  // @@protoc_insertion_point(class_scope:unity.protobuf.Void)
- private:
-  inline void set_has_error();
-  inline void clear_has_error();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::std::string* error_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
-
-  friend void  protobuf_AddDesc_unityrpc_2eproto();
-  friend void protobuf_AssignDesc_unityrpc_2eproto();
-  friend void protobuf_ShutdownFile_unityrpc_2eproto();
-
-  void InitAsDefaultInstance();
-  static Void* default_instance_;
-};
-// ===================================================================
-
-class UnityService_Stub;
-
-class UnityService : public ::google::protobuf::Service {
- protected:
-  // This class should be treated as an abstract interface.
-  inline UnityService() {};
- public:
-  virtual ~UnityService();
-
-  typedef UnityService_Stub Stub;
-
-  static const ::google::protobuf::ServiceDescriptor* descriptor();
-
-  virtual void copy(::google::protobuf::RpcController* controller,
-                       const ::unity::protobuf::Clip* request,
-                       ::unity::protobuf::Void* response,
-                       ::google::protobuf::Closure* done);
-  virtual void paste(::google::protobuf::RpcController* controller,
-                       const ::unity::protobuf::Void* request,
-                       ::unity::protobuf::Clip* response,
-                       ::google::protobuf::Closure* done);
-
-  // implements Service ----------------------------------------------
-
-  const ::google::protobuf::ServiceDescriptor* GetDescriptor();
-  void CallMethod(const ::google::protobuf::MethodDescriptor* method,
-                  ::google::protobuf::RpcController* controller,
-                  const ::google::protobuf::Message* request,
-                  ::google::protobuf::Message* response,
-                  ::google::protobuf::Closure* done);
-  const ::google::protobuf::Message& GetRequestPrototype(
-    const ::google::protobuf::MethodDescriptor* method) const;
-  const ::google::protobuf::Message& GetResponsePrototype(
-    const ::google::protobuf::MethodDescriptor* method) const;
-
- private:
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnityService);
-};
-
-class UnityService_Stub : public UnityService {
- public:
-  UnityService_Stub(::google::protobuf::RpcChannel* channel);
-  UnityService_Stub(::google::protobuf::RpcChannel* channel,
-                   ::google::protobuf::Service::ChannelOwnership ownership);
-  ~UnityService_Stub();
-
-  inline ::google::protobuf::RpcChannel* channel() { return channel_; }
-
-  // implements UnityService ------------------------------------------
-
-  void copy(::google::protobuf::RpcController* controller,
-                       const ::unity::protobuf::Clip* request,
-                       ::unity::protobuf::Void* response,
-                       ::google::protobuf::Closure* done);
-  void paste(::google::protobuf::RpcController* controller,
-                       const ::unity::protobuf::Void* request,
-                       ::unity::protobuf::Clip* response,
-                       ::google::protobuf::Closure* done);
- private:
-  ::google::protobuf::RpcChannel* channel_;
-  bool owns_channel_;
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(UnityService_Stub);
-};
-
-
-// ===================================================================
-
-
-// ===================================================================
-
-// Clip
-
-// required bytes content = 1;
-inline bool Clip::has_content() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void Clip::set_has_content() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Clip::clear_has_content() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void Clip::clear_content() {
-  if (content_ != &::google::protobuf::internal::kEmptyString) {
-    content_->clear();
-  }
-  clear_has_content();
-}
-inline const ::std::string& Clip::content() const {
-  return *content_;
-}
-inline void Clip::set_content(const ::std::string& value) {
-  set_has_content();
-  if (content_ == &::google::protobuf::internal::kEmptyString) {
-    content_ = new ::std::string;
-  }
-  content_->assign(value);
-}
-inline void Clip::set_content(const char* value) {
-  set_has_content();
-  if (content_ == &::google::protobuf::internal::kEmptyString) {
-    content_ = new ::std::string;
-  }
-  content_->assign(value);
-}
-inline void Clip::set_content(const void* value, size_t size) {
-  set_has_content();
-  if (content_ == &::google::protobuf::internal::kEmptyString) {
-    content_ = new ::std::string;
-  }
-  content_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* Clip::mutable_content() {
-  set_has_content();
-  if (content_ == &::google::protobuf::internal::kEmptyString) {
-    content_ = new ::std::string;
-  }
-  return content_;
-}
-inline ::std::string* Clip::release_content() {
-  clear_has_content();
-  if (content_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = content_;
-    content_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
-}
-inline void Clip::set_allocated_content(::std::string* content) {
-  if (content_ != &::google::protobuf::internal::kEmptyString) {
-    delete content_;
-  }
-  if (content) {
-    set_has_content();
-    content_ = content;
-  } else {
-    clear_has_content();
-    content_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
-}
-
-// optional string error = 127;
-inline bool Clip::has_error() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void Clip::set_has_error() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Clip::clear_has_error() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void Clip::clear_error() {
-  if (error_ != &::google::protobuf::internal::kEmptyString) {
-    error_->clear();
-  }
-  clear_has_error();
-}
-inline const ::std::string& Clip::error() const {
-  return *error_;
-}
-inline void Clip::set_error(const ::std::string& value) {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  error_->assign(value);
-}
-inline void Clip::set_error(const char* value) {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  error_->assign(value);
-}
-inline void Clip::set_error(const char* value, size_t size) {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  error_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* Clip::mutable_error() {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  return error_;
-}
-inline ::std::string* Clip::release_error() {
-  clear_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = error_;
-    error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
-}
-inline void Clip::set_allocated_error(::std::string* error) {
-  if (error_ != &::google::protobuf::internal::kEmptyString) {
-    delete error_;
-  }
-  if (error) {
-    set_has_error();
-    error_ = error;
-  } else {
-    clear_has_error();
-    error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
-}
-
-// -------------------------------------------------------------------
-
-// Void
-
-// optional string error = 127;
-inline bool Void::has_error() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void Void::set_has_error() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Void::clear_has_error() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void Void::clear_error() {
-  if (error_ != &::google::protobuf::internal::kEmptyString) {
-    error_->clear();
-  }
-  clear_has_error();
-}
-inline const ::std::string& Void::error() const {
-  return *error_;
-}
-inline void Void::set_error(const ::std::string& value) {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  error_->assign(value);
-}
-inline void Void::set_error(const char* value) {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  error_->assign(value);
-}
-inline void Void::set_error(const char* value, size_t size) {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  error_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* Void::mutable_error() {
-  set_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    error_ = new ::std::string;
-  }
-  return error_;
-}
-inline ::std::string* Void::release_error() {
-  clear_has_error();
-  if (error_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = error_;
-    error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
-}
-inline void Void::set_allocated_error(::std::string* error) {
-  if (error_ != &::google::protobuf::internal::kEmptyString) {
-    delete error_;
-  }
-  if (error) {
-    set_has_error();
-    error_ = error;
-  } else {
-    clear_has_error();
-    error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-
-}  // namespace protobuf
-}  // namespace unity
-
-#ifndef SWIG
-namespace google {
-namespace protobuf {
-
-
-}  // namespace google
-}  // namespace protobuf
-#endif  // SWIG
-
-// @@protoc_insertion_point(global_scope)
-
-#endif  // PROTOBUF_unityrpc_2eproto__INCLUDED
 
=== removed file 'src/platforms/mirserver/unityrpc.proto'
--- src/platforms/mirserver/unityrpc.proto	2014-06-16 18:29:36 +0000
+++ src/platforms/mirserver/unityrpc.proto	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-option cc_generic_services = true;
-
-package unity.protobuf;
-
-message Clip {
-  required bytes content = 1;
-  optional string error = 127;
-}
-
-message Void {
-  optional string error = 127;
-}
-
-service UnityService {
-  rpc copy(Clip) returns (Void);
-  rpc paste(Void) returns (Clip);
-}
 
=== added directory 'tests/mirserver/Clipboard'
=== added file 'tests/mirserver/Clipboard/Clipboard.pro'
--- tests/mirserver/Clipboard/Clipboard.pro	1970-01-01 00:00:00 +0000
+++ tests/mirserver/Clipboard/Clipboard.pro	2014-09-23 11:37:20 +0000
@@ -0,0 +1,16 @@
+include(../../test-includes.pri)
+
+TARGET = ClipboardTest
+
+QT += gui-private
+
+INCLUDEPATH += \
+    ../../../src/platforms/mirserver \
+    ../../../src/common
+
+SOURCES += \
+    clipboard_test.cpp \
+    ../../../src/common/debughelpers.cpp
+
+LIBS += -Wl,-rpath,$${OUT_PWD}/../../../src/platforms/mirserver \
+    -L../../../src/platforms/mirserver -lqpa-mirserver
 
=== added file 'tests/mirserver/Clipboard/clipboard_test.cpp'
--- tests/mirserver/Clipboard/clipboard_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/mirserver/Clipboard/clipboard_test.cpp	2014-09-23 11:37:20 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2014 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 warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, 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/>.
+ *
+ */
+
+#include <gtest/gtest.h>
+
+#include <clipboard.h>
+
+#include <QLoggingCategory>
+#include <QMimeData>
+
+using namespace qtmir;
+
+TEST(ClipboardTest, MimeDataSerialization)
+{
+    QMimeData *mimeData = new QMimeData;
+    mimeData->setData("text/plain", "Hello World!");
+    mimeData->setData("text/html", "<html lang=\"en\"><body>Hello World!</body></html>");
+
+    QByteArray serializedMimeData = serializeMimeData(mimeData);
+
+    ASSERT_TRUE(serializedMimeData.size() > 0);
+
+    QMimeData *deserializedMimeData = deserializeMimeData(serializedMimeData);
+
+    ASSERT_TRUE(deserializedMimeData != nullptr);
+
+    ASSERT_TRUE(deserializedMimeData->hasFormat("text/plain"));
+    ASSERT_EQ(mimeData->data("text/plain"), deserializedMimeData->data("text/plain"));
+
+    ASSERT_TRUE(deserializedMimeData->hasFormat("text/html"));
+    ASSERT_EQ(mimeData->data("text/html"), deserializedMimeData->data("text/html"));
+
+    delete mimeData;
+    delete deserializedMimeData;
+}
+
+TEST(ClipboardTest, RefuseContentsThatAreTooBig)
+{
+    QLoggingCategory::setFilterRules(QStringLiteral("*=false"));
+    DBusClipboard::skipDBusRegistration = true;
+    DBusClipboard *dbusClipboard = new DBusClipboard;
+
+    // Was getting a "warning: overflow in implicit constant conversion [-Woverflow]"
+    // when I used that constant directly in the QByteArray constructors below. Don't
+    // understand why so here's the workaround for it.
+    int maxContentsSize = DBusClipboard::maxContentsSize;
+
+    QByteArray reasonableContents(maxContentsSize * 0.9, 'R');
+    QByteArray tooBigContents(maxContentsSize * 1.2, 'B');
+
+    dbusClipboard->SetContents(reasonableContents);
+
+    ASSERT_EQ(dbusClipboard->contents(), reasonableContents);
+
+    dbusClipboard->SetContents(tooBigContents);
+
+    // tooBigContents were refused. So it stays with the previously
+    // set contents
+    ASSERT_EQ(dbusClipboard->contents(), reasonableContents);
+
+    delete dbusClipboard;
+}
 
=== modified file 'tests/mirserver/mirserver.pro'
--- tests/mirserver/mirserver.pro	2014-08-27 11:51:28 +0000
+++ tests/mirserver/mirserver.pro	2014-09-23 11:37:20 +0000
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = QtEventFeeder
+SUBDIRS = QtEventFeeder Clipboard