Merge lp:~thomas-moenicke/phablet-extras/maliit-framework-0.99-server into lp:phablet-extras/maliit-framework

[Thomas Moenicke]

server update

server update

[lp:~thomas-moenicke/phablet-extras/maliit-framework-0.99-server]

1561. By Thomas Moenicke on 2013-06-27

updated files in root dir

1562. By Thomas Moenicke on 2013-06-27

cleanup

1563. By Thomas Moenicke on 2013-06-27

cleanup

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1561
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/7/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-i386-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-framework-ci/20/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1563
http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-extras-maliit-framework-saucy-i386-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-maliit-framework-ci/21/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'NEWS'
--- NEWS	2013-03-21 13:59:07 +0000
+++ NEWS	2013-06-27 13:54:25 +0000
@@ -1,7 +1,54 @@
-{NEXT}
+{NEXT]
+======
+
+CHANGES SINCE 0.99.0
+* Introduced Qt5 input context, replacing the one provided by Qt. Can
+  be enabled by CONFIG+=qt5-inputcontext
+* Allow plugin window reactive area and input method area reported to
+  application differ
+* Fix window state to have transient hint and window type as with
+  Maliit 0.8x
+
+0.99.0
 ======
 
 CHANGES SINCE 0.94.0
+* Requires Qt 5
+* GTK+ and Qt 4 input context are moved into a separate rpository/package
+* Do not use debug config for unit tests
+* Do not abort if there are no plugins.
+* Improvements for QML plugins
+  - Notify qml keyboard when editor target focus changes
+  - Expose editor state better to QML input methods
+  - Replace correctionEnabled with predictionEnabled in qml interface
+  - Enhanced QML interface event sending
+* Use QScreen::availableSize to calculate screenSize
+* Add window group class managing plugins' QWindows
+  - Replaces surface abstraction
+* Remove CONFIG options
+  - disable-background-translucency
+  - disable-dbus
+  - enable-qdbus
+  - noqml
+* Remove MIndicatorServiceClient
+* Use QDBus instead of glib-dbus
+* Remove unused code
+* Update Wayland support to latest protocol changes
+* Add support for input region also on wayland
+* Add a proper Platform class
+* Remove unneeded plugin factories
+
+BUG FIXES
+* Fix some quick input method docs a bit.
+* Fix build when building without CONFIG+=wayland
+* Fix build with CONFIG+=wayland.
+* Fix unused parameter warning.
+* Fix minputmethodquickplugin test for Qt 5
+* Fix private include and use QT+=gui-private
+* Fix some QDBus issues.
+* Fix plugins windows are never added to WindowGroup
+* Fix showing of nemo-keyboard
+* Fix qdbus interface and adaptor generation
 
 0.94.0
 ======
@@ -21,13 +68,39 @@
 * Remove SDK
   - It was pretty much unmaintained.
 
+0.93.1
+======
+
+CHANGES SINCE 0.93.0
+* Use QtQtuick2 when compiling against Qt5
+  - Only affects QML plugins such as Nemo Keyboard.
+
+BUG FIXES
+* Fixes: MALIIT#194 - Maliit can not input when QML viewer is set to full
+  screen on QWS without x11
+* Fixes: MALIIT#197 - Read initial SW_TABLET_MODE state correctly
+* Fix qmake warnings about using CONFIG+=qdbus
+* Fix qmake warnings about using deprecated IN_PWD variables
+
+0.93.0
+======
+
 CHANGES SINCE 0.92.5
-* Fix the build when disabling GTK+ support
 * Monitor SW_TABLET_MODE to determine hardware keyboard presence
   -  A new, default implementation for MImHwKeyboardTracker: we look for a
      readable evdev device which has a SW_TABLET_MODE switch. If found, we use
      that device for determining the presence/availability of the hardware
      keyboard.
+* Allow QML plugins to send key events:
+  - Use MInputMethodQuick.sendKey()
+
+BUG FIXES
+* Fix focus handling for Qt5
+* Fix the build when disabling GTK+ support
+* Fix QML plugin loading for Qt5
+* Fix "fullscreen" surfaces (required by QtQuick still):
+  - Events can be passed through to application again even if input method with
+    a semi-translucent "fullscreen" surface is shown.
 
 0.92.5
 ======

=== modified file 'README'
--- README	2012-02-29 14:10:25 +0000
+++ README	2013-06-27 13:54:25 +0000
@@ -12,7 +12,7 @@
 
 Installing
 
-Qt 4.7 must be installed to build the Maliit framework. At a terminal, run:
+Qt5 must be installed to build the Maliit framework. At a terminal, run:
 
 qmake
 make
@@ -30,7 +30,7 @@
 
 Start the server:
 
-maliit-server -software -bypass-wm-hint
+maliit-server
 
 Note that a compositing window manager and a D-Bus session bus are required to
 use Maliit.

=== modified file 'VERSION'
--- VERSION	2013-03-21 13:59:07 +0000
+++ VERSION	2013-06-27 13:54:25 +0000
@@ -1,1 +1,1 @@
-0.94.0
+0.99.0

=== modified file 'common/maliit/namespace.h'
--- common/maliit/namespace.h	2012-07-10 09:00:33 +0000
+++ common/maliit/namespace.h	2013-06-27 13:54:25 +0000
@@ -21,25 +21,13 @@
 //! \ingroup common
 namespace Maliit {
     /*!
-     * \brief Orientation angle of windows in the application.
-     *
-     * \sa Orientation
-     */
-    enum OrientationAngle {
-        Angle0   =   0,
-        Angle90  =  90,
-        Angle180 = 180,
-        Angle270 = 270
-    };
-
-    /*!
-     * \brief Possible orientations of windows in the application.
-     *
-     * \sa OrientationAngle
-     */
-    enum Orientation {
-        Portrait, //!< equal to either Maliit::Angle90 or Maliit::Angle270 orientation angles
-        Landscape //!< equal to either Maliit::Angle0 or Maliit::Angle180 orientation angles
+     * \brief Position of the window on the screen.
+     */
+    enum Position {
+        PositionOverlay,
+        PositionCenterBottom,
+        PositionLeftBottom,
+        PositionRightBottom,
     };
 
     /*!
@@ -70,63 +58,6 @@
         CustomContentType
     };
 
-    //! \brief Type of toolbar widget
-    enum ItemType {
-        //! Undefined item type
-        ItemUndefined,
-
-        //! Item should be visualized as button
-        ItemButton,
-
-        //! Item should be visualized as label
-        ItemLabel
-    };
-
-    //! \brief Type of visible premiss for toolbar button
-    enum VisibleType {
-        //! Item's visibility will not be changed automatically
-        VisibleUndefined,
-
-        //! Item's visibility depends on text selection
-        VisibleWhenSelectingText,
-
-        //! Item is always visible
-        VisibleAlways
-    };
-
-    //! \brief Type of action
-    enum ActionType {
-        //! Do nothing
-        ActionUndefined,
-
-        //! Send key sequence like Ctrl+D
-        ActionSendKeySequence,
-
-        //! Send string
-        ActionSendString,
-
-        //! Send command (not implemented yet)
-        ActionSendCommand,
-
-        //! Copy selected text
-        ActionCopy,
-
-        //! Paste text from clipboard
-        ActionPaste,
-
-        //! Show some group of items
-        ActionShowGroup,
-
-        //! Hide some group of items
-        ActionHideGroup,
-
-        //! Close virtual keyboard
-        ActionClose,
-
-        //! Standard copy/paste button
-        ActionCopyPaste
-    };
-
     /*!
      * \brief State of Copy/Paste button.
      */
@@ -171,43 +102,6 @@
         EventRequestEventOnly     //!< Only a Qt::KeyEvent
     };
 
-     /*!
-      * \brief Possible values for all the modes that are shown in the Input
-      * mode indicator.
-      */
-    enum InputModeIndicator {
-        NoIndicator,                 //!< No indicator should be shown
-        LatinLowerIndicator,         //!< Latin lower case mode
-        LatinUpperIndicator,         //!< Latin upper case mode
-        LatinLockedIndicator,        //!< Latin caps locked mode
-        CyrillicLowerIndicator,      //!< Cyrillic lower case mode
-        CyrillicUpperIndicator,      //!< Cyrillic upper case mode
-        CyrillicLockedIndicator,     //!< Cyrillic caps locked mode
-        ArabicIndicator,             //!< Arabic mode
-        PinyinIndicator,             //!< Pinyin mode
-        ZhuyinIndicator,             //!< Zhuyin mode
-        CangjieIndicator,            //!< Cangjie mode
-        NumAndSymLatchedIndicator,   //!< Number and Symbol latched mode
-        NumAndSymLockedIndicator,    //!< Number and Symbol locked mode
-        DeadKeyAcuteIndicator,       //!< Dead key acute mode
-        DeadKeyCaronIndicator,       //!< Dead key caron mode
-        DeadKeyCircumflexIndicator,  //!< Dead key circumflex mode
-        DeadKeyDiaeresisIndicator,   //!< Dead key diaeresis mode
-        DeadKeyGraveIndicator,       //!< Dead key grave mode
-        DeadKeyTildeIndicator        //!< Dead key tilde mode
-    };
-
-    enum InputMethodMode {
-        //! Normal mode allows to use preedit and error correction
-        InputMethodModeNormal,
-
-        //! Virtual keyboard sends QKeyEvent for every key press or release
-        InputMethodModeDirect,
-
-        //! Used with proxy widget
-        InputMethodModeProxy
-    };
-
     /*!
      * \brief The text format for part of the preedit string, specified by
      * start and length.
@@ -228,21 +122,6 @@
         {};
     };
 
-    /*! \brief Extensions for Qt::inputMethodQuery
-     * \note the inputMethodQuery interface may change or be removed in Qt 5!
-     */
-    enum InputMethodQueryExtensions {
-        VisualizationPriorityQuery = 10001, //!< Tells if input method widget wants to have high
-        //!< priority for visualization. Input method should
-        //!< honor this and stay out of widgets space.
-        PreeditRectangleQuery,      //!< Retrieve bounding rectangle for current preedit text.
-        ImCorrectionEnabledQuery,   //!< Explicit correction enabling for text entries.
-        ImModeQuery,                //!< Retrieve mode: normal, direct or proxy.
-        InputMethodAttributeExtensionIdQuery, //!< Attribute extension identifier for text entry.
-        InputMethodAttributeExtensionQuery, //!< Attribute extension file name for text entry.
-        WesternNumericInputEnforcedQuery //!< Overrides localized numeric input with western numeric input.
-    };
-
     namespace InputMethodQuery
     {
         //! Name of property which tells whether correction is enabled.
@@ -294,10 +173,7 @@
 }
 
 Q_DECLARE_METATYPE(Maliit::TextContentType)
-Q_DECLARE_METATYPE(Maliit::Orientation)
-Q_DECLARE_METATYPE(Maliit::OrientationAngle)
-Q_DECLARE_METATYPE(Maliit::InputMethodMode)
-Q_DECLARE_METATYPE(Maliit::InputMethodQueryExtensions)
+Q_DECLARE_METATYPE(Maliit::PreeditTextFormat)
 Q_DECLARE_METATYPE(QList<Maliit::PreeditTextFormat>)
 
 #endif

=== modified file 'config.pri'
--- config.pri	2013-03-21 13:59:07 +0000
+++ config.pri	2013-06-27 13:54:25 +0000
@@ -1,11 +1,5 @@
-MALIIT_VERSION = $$system(cat $$IN_PWD/VERSION)
+MALIIT_VERSION = $$system(cat $$PWD/VERSION)
 
-MALIIT_INTERFACE_VERSION = 1.0
-MALIIT_PLUGINS_INTERFACE_VERSION = 1.0
-MALIIT_PLUGINS_QUICK_INTERFACE_VERSION = 0.80
-MALIIT_FRAMEWORK_INTERFACE_VERSION = 0.80
-MALIIT_CONNECTION_INTERFACE_VERSION = 0.80
-MALIIT_SERVER_INTERFACE_VERSION = 0.80
 MALIIT_ABI_VERSION = $$MALIIT_VERSION
 
 # For libmaliit
@@ -13,19 +7,14 @@
 MALIIT_SETTINGS_LIB = maliit-settings
 MALIIT_HEADER = maliit
 MALIIT_FRAMEWORK_HEADER = maliit/framework
-# For libmaliit-glib
-MALIIT_CONNECTION_GLIB_LIB = maliit-connection-glib
-MALIIT_GLIB_LIB = maliit-glib
 
 include(defines.pri)
 
 # Linker optimization for release build
 QMAKE_LFLAGS_RELEASE+=-Wl,--as-needed
 # Compiler warnings are error if the build type is debug
-#QMAKE_CXXFLAGS_DEBUG+=-Werror -O0
-QMAKE_CXXFLAGS_DEBUG+= -O0
-#QMAKE_CFLAGS_DEBUG+=-Werror -O0
-QMAKE_CFLAGS_DEBUG+=-O0
+QMAKE_CXXFLAGS_DEBUG+=-Werror -O0
+QMAKE_CFLAGS_DEBUG+=-Werror -O0
 
 OBJECTS_DIR = .obj
 MOC_DIR = .moc
@@ -145,19 +134,12 @@
     CONFIG += qws
 }
 
-# Use x11 on unix systems without lighthouse (qpa) or QWS (qws)
-unix:!qpa:!qws {
-    CONFIG += x11
+wayland {
+    DEFINES += HAVE_WAYLAND
 }
 
-contains(QT_MAJOR_VERSION, 4) {
-    QT_WIDGETS = gui
-} else {
-    QT_WIDGETS = gui widgets
-
-    wayland {
-        DEFINES += HAVE_WAYLAND
-    }
+noxcb {
+    DEFINES += NOXCB
 }
 
 MALIIT_INSTALL_PRF = $$[QT_INSTALL_DATA]/mkspecs/features
@@ -174,7 +156,7 @@
         return(false)
     }
 
-    MALIIT_IN_DIR = $$IN_PWD
+    MALIIT_IN_DIR = $$PWD
     MALIIT_OUT_DIR = $$OUT_PWD
 
     variables = MALIIT_FRAMEWORK_FEATURE \
@@ -209,11 +191,9 @@
                 MALIIT_PACKAGE_BRIEF \
                 MALIIT_FRAMEWORK_HEADER \
                 MALIIT_SERVER_ARGUMENTS \
-                MALIIT_CONNECTION_HEADER \
                 MALIIT_CONNECTION_LIB \
                 MALIIT_SERVER_HEADER \
                 MALIIT_ABI_VERSION_MAJOR \
-                MALIIT_GLIB_LIB \
 
     command = "sed"
     for(var, variables) {

=== removed directory 'connection-glib'
=== removed file 'connection-glib/.gitignore'
--- connection-glib/.gitignore	2012-05-22 06:12:09 +0000
+++ connection-glib/.gitignore	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-*-glue.h
-maliitmarshalers.*

=== removed file 'connection-glib/connection-glib.pro'
--- connection-glib/connection-glib.pro	2012-11-16 14:29:44 +0000
+++ connection-glib/connection-glib.pro	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-TOP_DIR = ..
-
-include($$TOP_DIR/config.pri)
-
-TEMPLATE = lib
-TARGET = $$TOP_DIR/lib/$$MALIIT_CONNECTION_GLIB_LIB
-CONFIG += staticlib
-
-CONFIG += link_pkgconfig
-
-PKGCONFIG += glib-2.0 gthread-2.0 dbus-glib-1
-
-system(pkg-config gio-2.0 --atleast-version 2.26) {
-    DEFINES   += MALIIT_USE_GIO_API
-    PKGCONFIG += gio-2.0
-}
-
-debug{
-    DEFINES += ENABLE_DEBUG
-}
-
-!enable-dbus-activation {
-    DEFINES += NO_DBUS_ACTIVATION
-}
-
-DEFINES += G_LOG_DOMAIN=\\\"Maliit\\\"
-
-# Generated dbus glue code has warnings of this type, so disable them
-QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
-QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-
-HEADERS += \
-    meego-im-proxy.h \
-    meego-imcontext-dbus.h \
-    meego-im-connector.h \
-    qt-keysym-map.h \
-    debug.h \
-    meego-imcontext-dbus-private.h \
-    meego-im-connector-private.h \
-
-SOURCES += \
-    meego-im-proxy.c \
-    meego-imcontext-dbus.c \
-    meego-im-connector.c \
-    qt-keysym-map.cpp \
-    debug.c \
-
-include($$TOP_DIR/dbus_interfaces/dbus_interfaces.pri)
-
-# improxy
-# Generate dbus glue
-QMAKE_EXTRA_TARGETS += dbus_glue_improxy
-dbus_glue_improxy.target = $$OUT_PWD/meego-im-proxy-glue.h
-dbus_glue_improxy.output = $$OUT_PWD/meego-im-proxy-glue.h
-dbus_glue_improxy.depends = $$DBUS_SERVER_XML
-dbus_glue_improxy.commands = \
-    dbus-binding-tool --prefix=meego_im_proxy --mode=glib-client \
-        --output=$$OUT_PWD/meego-im-proxy-glue.h \
-        $$DBUS_SERVER_XML
-
-# Use to work around the fact that qmake looks up the target for the generated header wrong
-QMAKE_EXTRA_TARGETS += fake_dbus_glue_improxy
-fake_dbus_glue_improxy.target = meego-im-proxy-glue.h
-fake_dbus_glue_improxy.depends = dbus_glue_improxy
-
-# imcontext
-# Generate dbus glue
-QMAKE_EXTRA_TARGETS += dbus_glue_imcontext
-dbus_glue_imcontext.target = $$OUT_PWD/meego-imcontext-dbus-glue.h
-dbus_glue_imcontext.output = $$OUT_PWD/meego-imcontext-dbus-glue.h
-dbus_glue_imcontext.depends = $$DBUS_CONTEXT_XML
-dbus_glue_imcontext.commands = \
-    dbus-binding-tool --prefix=meego_imcontext_dbus --mode=glib-server \
-        --output=$$OUT_PWD/meego-imcontext-dbus-glue.h \
-        $$DBUS_CONTEXT_XML
-
-# Use to work around the fact that qmake looks up the target for the generated header wrong
-QMAKE_EXTRA_TARGETS += fake_dbus_glue_imcontext
-fake_dbus_glue_imcontext.target = meego-imcontext-dbus-glue.h
-fake_dbus_glue_imcontext.depends = dbus_glue_imcontext
-
-GLIB_GENMARSHAL_LIST += maliitmarshalers.list
-
-OTHER_FILES += maliitmarshalers.list
-
-glib_genmarshal_header.name = glib-genmarshal header ${QMAKE_FILE_IN}
-glib_genmarshal_header.commands = glib-genmarshal --prefix=_maliit_marshal --header --g-fatal-warnings ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-glib_genmarshal_header.output = ${QMAKE_FILE_IN_BASE}.h
-glib_genmarshal_header.variable_out = HEADERS
-glib_genmarshal_header.input = GLIB_GENMARSHAL_LIST
-
-glib_genmarshal_source.name = glib-genmarshal source ${QMAKE_FILE_IN}
-glib_genmarshal_source.commands = glib-genmarshal --prefix=_maliit_marshal --body --g-fatal-warnings ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-glib_genmarshal_source.output = ${QMAKE_FILE_IN_BASE}.c
-glib_genmarshal_source.variable_out = SOURCES
-glib_genmarshal_source.input = GLIB_GENMARSHAL_LIST
-
-QMAKE_EXTRA_COMPILERS += glib_genmarshal_header glib_genmarshal_source

=== removed file 'connection-glib/debug.c'
--- connection-glib/debug.c	2012-09-17 14:41:52 +0000
+++ connection-glib/debug.c	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#include "debug.h"
-
-#include <string.h>
-
-gboolean
-maliit_is_debug_enabled(void)
-{
-    static gint debug_enabled = -1;
-
-    if (debug_enabled == -1) {
-        const char *enabled_debug_var = g_getenv("MALIIT_DEBUG");
-        if (enabled_debug_var && strlen(enabled_debug_var) > 0
-            && strcmp(enabled_debug_var, "0") != 0) {
-            debug_enabled = 1;
-        } else {
-            debug_enabled = 0;
-        }
-    }
-
-    return debug_enabled == 1;
-}

=== removed file 'connection-glib/debug.h'
--- connection-glib/debug.h	2012-05-22 06:12:09 +0000
+++ connection-glib/debug.h	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#ifndef _DEBUG_H
-#define _DEBUG_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-gboolean maliit_is_debug_enabled(void);
-
-#define DBG(x, a...) if (maliit_is_debug_enabled()) { g_debug("%s: " x, __FUNCTION__, ##a); }
-
-#define STEP() DBG("")
-
-#define UNUSED(v) (void)v;
-
-G_END_DECLS
-
-#endif // _DEBUG_H

=== removed file 'connection-glib/libmaliit-connection-glib.pri'
--- connection-glib/libmaliit-connection-glib.pri	2012-07-16 20:24:30 +0000
+++ connection-glib/libmaliit-connection-glib.pri	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-# Use when a .pro file requires libmaliit-connection-glib
-# The .pro file must define TOP_DIR to be a relative path
-# to the top-level source/build directory, and include config.pri
-
-LIBS += $$TOP_DIR/lib/$$maliitStaticLib($${MALIIT_CONNECTION_GLIB_LIB})
-POST_TARGETDEPS += $$TOP_DIR/lib/$$maliitStaticLib($${MALIIT_CONNECTION_GLIB_LIB})
-INCLUDEPATH += $$TOP_DIR/connection-glib
-PKGCONFIG += glib-2.0
-
-system(pkg-config gio-2.0 --atleast-version 2.26) {
-    PKGCONFIG += gio-2.0
-}

=== removed file 'connection-glib/maliitmarshalers.list'
--- connection-glib/maliitmarshalers.list	2012-08-06 12:48:36 +0000
+++ connection-glib/maliitmarshalers.list	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-VOID:STRING,BOXED,INT,INT,INT
-VOID:STRING,INT,INT,INT
-VOID:INT,INT,INT,STRING,BOOLEAN,INT
-BOXED:VOID
-VOID:INT,INT
-VOID:INT,INT,INT,INT
-STRING:VOID
-VOID:INT,STRING,STRING,STRING,VARIANT
-VOID:STRING,STRING

=== removed file 'connection-glib/meego-im-connector-private.h'
--- connection-glib/meego-im-connector-private.h	2012-07-13 19:00:44 +0000
+++ connection-glib/meego-im-connector-private.h	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/* This file is part of Maliit framework
- *
- * Copyright (C) 2012 Openismus GmbH
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the licence, or (at your option) any later version.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-MeegoImConnector *meego_im_connector_new();
-void meego_im_connector_free(MeegoImConnector *self);
-void meego_im_connector_set_singleton(MeegoImConnector *self);

=== removed file 'connection-glib/meego-im-connector.c'
--- connection-glib/meego-im-connector.c	2012-08-06 12:48:49 +0000
+++ connection-glib/meego-im-connector.c	1970-01-01 00:00:00 +0000
@@ -1,260 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#include "meego-im-connector.h"
-#include "debug.h"
-
-#include <glib.h>
-#include <gio/gio.h>
-
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#define MALIIT_SERVER_NAME "org.maliit.server"
-#define MALIIT_SERVER_OBJECT_PATH "/org/maliit/server/address"
-#define MALIIT_SERVER_INTERFACE "org.maliit.Server.Address"
-#define MALIIT_SERVER_ADDRESS_PROPERTY "address"
-
-#ifndef MALIIT_USE_GIO_API
-#define DBUS_PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties"
-#define DBUS_PROPERTIES_GET_METHOD "Get"
-#endif
-
-#define MALIIT_SERVER_ADDRESS_ENV "MALIIT_SERVER_ADDRESS"
-
-/* For glib < 2.30 */
-#ifndef G_VALUE_INIT
-#define G_VALUE_INIT { 0, { { 0 } } }
-#endif
-
-struct _MeegoImConnectorPrivate {
-    DBusGConnection *connection;
-};
-
-MeegoImConnector *meego_im_connector_new();
-
-static gboolean
-try_reconnect(MeegoImConnector *connector)
-{
-    if (connector->try_reconnect) {
-        meego_im_connector_run(connector);
-    }
-    return FALSE; // _run is responsible for setting up a new timeout if needed
-}
-
-
-static void
-connection_dropped(gpointer instance, MeegoImConnector *connector)
-{
-    if (connector->priv->connection) {
-        dbus_g_connection_unref(connector->priv->connection);
-    }
-    try_reconnect(connector);
-}
-
-#ifdef MALIIT_USE_GIO_API
-static char *
-get_dbus_address()
-{
-    const char *overridden_address = g_getenv(MALIIT_SERVER_ADDRESS_ENV);
-
-    if (overridden_address && *overridden_address) {
-        return g_strdup(overridden_address);
-    }
-
-    GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_NONE;
-
-#if defined(NO_DBUS_ACTIVATION)
-    flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
-#endif
-
-    GDBusProxy *proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SESSION,
-                                                      flags,
-                                                      0,
-                                                      MALIIT_SERVER_NAME,
-                                                      MALIIT_SERVER_OBJECT_PATH,
-                                                      MALIIT_SERVER_INTERFACE,
-                                                      0, 0);
-
-
-    if (!proxy)
-        return 0;
-
-    GVariant *variant = g_dbus_proxy_get_cached_property(proxy, MALIIT_SERVER_ADDRESS_PROPERTY);
-
-    if (!variant) {
-        g_object_unref(proxy);
-        return 0;
-    }
-
-    char* address = g_strdup(g_variant_get_string(variant, 0));
-
-    g_variant_unref(variant);
-    g_object_unref(proxy);
-
-    return address;
-}
-
-#else
-static char *
-get_dbus_address()
-{
-    const char *overridden_address = g_getenv(MALIIT_SERVER_ADDRESS_ENV);
-
-    if (overridden_address && *overridden_address) {
-        return g_strdup(overridden_address);
-    }
-
-    GValue value = G_VALUE_INIT;
-    GError *error = NULL;
-    DBusGConnection *connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
-
-    if (!connection) {
-        DBG("%s: %s", __PRETTY_FUNCTION__, error->message);
-        g_error_free(error);
-        return NULL;
-    }
-
-    DBusGProxy *proxy = dbus_g_proxy_new_for_name(connection,
-                                            MALIIT_SERVER_NAME,
-                                            MALIIT_SERVER_OBJECT_PATH,
-                                            DBUS_PROPERTIES_INTERFACE);
-
-    if (!dbus_g_proxy_call(proxy,
-                           DBUS_PROPERTIES_GET_METHOD,
-                           &error,
-                           G_TYPE_STRING, MALIIT_SERVER_INTERFACE,
-                           G_TYPE_STRING, MALIIT_SERVER_ADDRESS_PROPERTY,
-                           G_TYPE_INVALID,
-                           G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
-
-        DBG("%s: %s", __PRETTY_FUNCTION__, error->message);
-        g_error_free(error);
-        return NULL;
-    }
-
-    gchar *result = g_value_dup_string(&value);
-    g_value_unset(&value);
-    g_object_unref(proxy);
-
-    return result;
-}
-#endif
-
-/**
- * MeegoImConnector:
- *
- * Connects and maintains the DBusConnection, and the objects
- * that depend on it. Makes sure that MeegoIMProxy and MeegoIMDbusObj
- * has the correct DBusConnection by calling _connect on them when
- * the connection has changed.
- *
- * MeegoIMProxy is responsible for letting the connector know that the
- * connection was dropped by emitting the "connection-dropped signal".
- */
-MeegoImConnector *
-meego_im_connector_new()
-{
-    MeegoImConnector *self = g_new(MeegoImConnector, 1);
-    self->priv = g_new(MeegoImConnectorPrivate, 1);
-
-    self->priv->connection = NULL;
-    self->dbusobj = meego_imcontext_dbusobj_new();
-    self->proxy = meego_im_proxy_new();
-    self->try_reconnect = TRUE;
-
-    g_signal_connect(self->proxy, "connection-dropped",
-                     G_CALLBACK(connection_dropped), (gpointer)self);
-
-    return self;
-}
-
-void
-meego_im_connector_free(MeegoImConnector *self)
-{
-    if (self->priv->connection) {
-        dbus_g_connection_unref(self->priv->connection);
-    }
-    g_object_unref(self->dbusobj);
-    g_object_unref(self->proxy);
-
-    g_free(self->priv);
-    g_free(self);
-}
-
-
-static MeegoImConnector *meego_im_connector_singleton = NULL;
-
-void
-meego_im_connector_set_singleton(MeegoImConnector *self)
-{
-    meego_im_connector_singleton = self;
-}
-
-MeegoImConnector *
-meego_im_connector_get_singleton()
-{
-    MeegoImConnector *connector = meego_im_connector_singleton;
-    if (!connector) {
-        connector = meego_im_connector_new();
-        meego_im_connector_set_singleton(connector);
-        meego_im_connector_run(connector);
-    }
-    return connector;
-}
-
-void
-meego_im_connector_run(MeegoImConnector *self)
-{
-    DBusGConnection *connection = NULL;
-    DBusConnection *dbus_connection;
-    DBusError error;
-    char *address = NULL;
-
-    g_return_if_fail(self != NULL);
-
-    address = get_dbus_address();
-    if (!address) {
-        DBG("Couldn't connect to Maliit server. Retrying...");
-
-        g_timeout_add_seconds(2, (GSourceFunc)try_reconnect, self);
-        return;
-    }
-
-    dbus_error_init(&error);
-
-    // Input contexts should not share the connection to the maliit server with
-    // each other (even not when they are in the same application). Therefore,
-    // use private connection for IC to server connection.
-    dbus_connection = dbus_connection_open_private(address, &error);
-    g_free(address);
-
-    if (!dbus_connection) {
-        DBG("Couldn't connect to Maliit server: %s. Retrying...", error.message);
-
-        dbus_error_free(&error);
-
-        g_timeout_add_seconds(2, (GSourceFunc)try_reconnect, self);
-        return;
-    }
-
-    dbus_connection_setup_with_g_main(dbus_connection, NULL);
-    connection = dbus_connection_get_g_connection(dbus_connection);
-
-    self->priv->connection = connection;
-
-    meego_im_proxy_connect(self->proxy, (gpointer)self->priv->connection);
-    meego_imcontext_dbusobj_connect(self->dbusobj, (gpointer)self->priv->connection);
-}

=== removed file 'connection-glib/meego-im-connector.h'
--- connection-glib/meego-im-connector.h	2012-07-13 19:00:44 +0000
+++ connection-glib/meego-im-connector.h	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#include "meego-im-proxy.h"
-#include "meego-imcontext-dbus.h"
-
-typedef struct _MeegoImConnectorPrivate MeegoImConnectorPrivate;
-
-typedef struct {
-    MeegoIMProxy *proxy;
-    MeegoIMContextDbusObj *dbusobj;
-    MeegoImConnectorPrivate *priv;
-    gboolean try_reconnect;
-} MeegoImConnector;
-
-void meego_im_connector_run(MeegoImConnector *self);
-MeegoImConnector *meego_im_connector_get_singleton();

=== removed file 'connection-glib/meego-im-proxy.c'
--- connection-glib/meego-im-proxy.c	2012-08-06 12:48:36 +0000
+++ connection-glib/meego-im-proxy.c	1970-01-01 00:00:00 +0000
@@ -1,468 +0,0 @@
-/*
- * Copyright (C) 2010, Intel Corporation.
- *
- * Author: Raymond Liu <[e-mail]>
- *
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <string.h>
-
-#include "meego-im-proxy.h"
-#include "meego-im-proxy-glue.h"
-#include "maliitmarshalers.h"
-#include "debug.h"
-
-#include <dbus/dbus-glib.h>
-G_DEFINE_TYPE(MeegoIMProxy, meego_im_proxy, G_TYPE_OBJECT);
-
-#define MEEGO_IM_OBJECT_PATH "/com/meego/inputmethod/uiserver1"
-#define MEEGO_IM_SERVICE_INTERFACE "com.meego.inputmethod.uiserver1"
-
-static void meego_im_proxy_finalize(GObject *object);
-static void meego_im_proxy_class_init(MeegoIMProxyClass *klass);
-static void meego_im_proxy_init(MeegoIMProxy *meego_im_proxy);
-
-enum {
-    SIGNAL_CONNECTION_DROPPED = 0,
-    SIGNAL_CONNECTION_ESTABLISHED,
-    SIGNAL_INVOKE_ACTION,
-    N_SIGNALS
-};
-
-static guint meego_im_proxy_signals[N_SIGNALS];
-
-/* Private struct */
-struct _MeegoImProxyPrivate {
-    DBusGProxy *dbusproxy;
-};
-
-static void
-handle_disconnect(gpointer instance, MeegoIMProxy *im_proxy)
-{
-    g_return_if_fail(im_proxy);
-
-    im_proxy->priv->dbusproxy = NULL;
-    g_signal_emit(im_proxy, meego_im_proxy_signals[SIGNAL_CONNECTION_DROPPED], 0, NULL);
-
-}
-
-static void
-handle_invoke_action(gpointer instance, const char *action, const char *sequence, MeegoIMProxy *im_proxy)
-{
-    g_signal_emit(im_proxy, meego_im_proxy_signals[SIGNAL_INVOKE_ACTION], 0, action, sequence);
-}
-
-MeegoIMProxy *
-meego_im_proxy_new(void)
-{
-    return g_object_new(MEEGO_TYPE_IM_PROXY, NULL);
-}
-
-
-static void
-meego_im_proxy_finalize(GObject *object)
-{
-    G_OBJECT_CLASS(meego_im_proxy_parent_class)->finalize(object);
-}
-
-
-static void
-meego_im_proxy_class_init(MeegoIMProxyClass *klass)
-{
-    GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-
-    gobject_class->finalize = meego_im_proxy_finalize;
-
-    meego_im_proxy_signals[SIGNAL_CONNECTION_DROPPED] =
-        g_signal_new("connection-dropped", G_TYPE_FROM_CLASS(klass),
-                     0, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-    meego_im_proxy_signals[SIGNAL_CONNECTION_ESTABLISHED] =
-        g_signal_new("connection-established", G_TYPE_FROM_CLASS(klass),
-                     0, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-    meego_im_proxy_signals[SIGNAL_INVOKE_ACTION] =
-        g_signal_new("invoke-action", G_TYPE_FROM_CLASS(klass),
-                     0, 0, NULL, NULL, _maliit_marshal_VOID__STRING_STRING, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
-
-    g_type_class_add_private(klass, sizeof(MeegoImProxyPrivate));
-}
-
-static void
-meego_im_proxy_init(MeegoIMProxy *self)
-{
-    MeegoImProxyPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, MEEGO_TYPE_IM_PROXY, MeegoImProxyPrivate);
-
-    self->load_plugin_settings_observer = NULL;
-
-    priv->dbusproxy = NULL;
-    self->priv = priv;
-}
-
-void
-meego_im_proxy_connect(MeegoIMProxy *proxy, gpointer connection)
-{
-    DBusGProxy *dbusproxy;
-    DBusGConnection *dbus_connection = (DBusGConnection *)connection;
-    g_return_if_fail(dbus_connection != NULL);
-
-    if (proxy->priv->dbusproxy) {
-        g_object_unref(proxy->priv->dbusproxy);
-    }
-
-    dbusproxy = dbus_g_proxy_new_for_peer(dbus_connection,
-                                          MEEGO_IM_OBJECT_PATH, /* obj path */
-                                          MEEGO_IM_SERVICE_INTERFACE /* interface */);
-
-    if (dbusproxy == NULL) {
-        g_warning("could not create dbus_proxy\n");
-    }
-
-    g_signal_connect(G_OBJECT(dbusproxy), "destroy", G_CALLBACK(handle_disconnect), proxy);
-
-    dbus_g_object_register_marshaller(_maliit_marshal_VOID__STRING_STRING, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal(dbusproxy, "invokeAction", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal(dbusproxy, "invokeAction", G_CALLBACK(handle_invoke_action), proxy, 0);
-
-    proxy->priv->dbusproxy = dbusproxy;
-
-    g_signal_emit(proxy, meego_im_proxy_signals[SIGNAL_CONNECTION_ESTABLISHED], 0);
-}
-
-gboolean
-meego_im_proxy_activate_context(MeegoIMProxy *proxy)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_activate_context(proxy->priv->dbusproxy, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-gboolean
-meego_im_proxy_register_extension (MeegoIMProxy *proxy,
-                                   gint id,
-                                   const gchar *filename)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_register_attribute_extension (proxy->priv->dbusproxy,
-                                                                        id,
-                                                                        filename,
-                                                                        &error);
-
-    if (error != NULL) {
-      g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-gboolean
-meego_im_proxy_unregister_extension (MeegoIMProxy *proxy,
-                                     gint id)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_unregister_attribute_extension (proxy->priv->dbusproxy,
-                                                                          id,
-                                                                          &error);
-
-    if (error != NULL) {
-      g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-gboolean
-meego_im_proxy_app_orientation_changed(MeegoIMProxy *proxy, const gint angle)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_app_orientation_changed(proxy->priv->dbusproxy, angle, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-
-gboolean
-meego_im_proxy_hide_input_method(MeegoIMProxy *proxy)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_hide_input_method(proxy->priv->dbusproxy, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-
-#if 0
-// Not yet really implemented
-
-gboolean
-meego_im_proxy_mouse_clicked_on_preedit(MeegoIMProxy *proxy, const GValueArray *pos,
-                                        const GValueArray *preedit_rect)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_mouse_clicked_on_preedit(proxy->priv->dbusproxy,
-            pos, preedit_rect, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-#endif
-
-gboolean
-meego_im_proxy_update_widget_info(MeegoIMProxy *proxy, const GHashTable *state_information, gboolean focus_changed)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_update_widget_information(proxy->priv->dbusproxy,
-            state_information, focus_changed, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-
-
-
-gboolean
-meego_im_proxy_process_key_event(MeegoIMProxy *proxy, const gint type, const gint code,
-                                 const gint modifiers, const char *text,
-                                 const gboolean auto_repeat, const gint count,
-                                 const guint native_scan_code,
-                                 const guint native_modifiers,
-                                 const guint time)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    DBG("QT key event type=0x%x, code=0x%x, modifiers=0x%x, text=%s",
-        type, code, modifiers, text);
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_process_key_event(proxy->priv->dbusproxy,
-            type, code, modifiers, text, auto_repeat,
-            count, native_scan_code, native_modifiers,
-            time, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-
-gboolean
-meego_im_proxy_reset(MeegoIMProxy *proxy)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_reset(proxy->priv->dbusproxy, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-
-gboolean
-meego_im_proxy_set_copy_paste_state(MeegoIMProxy *proxy, const gboolean copy_available,
-                                    const gboolean paste_available)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_set_copy_paste_state(proxy->priv->dbusproxy,
-            copy_available, paste_available, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-
-gboolean
-meego_im_proxy_set_preedit(MeegoIMProxy *proxy, const char *text, gint cursor_pos)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_set_preedit(proxy->priv->dbusproxy, text, cursor_pos, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-
-gboolean
-meego_im_proxy_show_input_method(MeegoIMProxy *proxy)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_show_input_method(proxy->priv->dbusproxy, &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-gboolean
-meego_im_proxy_set_extended_attribute (MeegoIMProxy *proxy,
-                                       gint id,
-                                       const gchar *target,
-                                       const gchar *target_item,
-                                       const gchar *attribute,
-                                       GValue *value)
-{
-    GError *error = NULL;
-    gboolean ret = TRUE;
-
-    STEP();
-    if (!proxy || proxy->priv->dbusproxy == NULL)
-        return FALSE;
-
-    ret = com_meego_inputmethod_uiserver1_set_extended_attribute (proxy->priv->dbusproxy,
-                                                                  id,
-                                                                  target,
-                                                                  target_item,
-                                                                  attribute,
-                                                                  value,
-                                                                  &error);
-
-    if (error != NULL) {
-        g_warning("%s", error->message);
-    }
-
-    return ret;
-}
-
-gboolean
-meego_im_proxy_load_plugin_settings (MeegoIMProxy *proxy,
-                                     const gchar *locale_name)
-{
-    GError *error;
-    gboolean ret;
-
-    g_return_val_if_fail (MEEGO_IS_IM_PROXY (proxy), FALSE);
-
-    if (proxy->load_plugin_settings_observer) {
-        proxy->load_plugin_settings_observer(proxy, locale_name);
-    }
-
-    if (!proxy->priv->dbusproxy) {
-        return FALSE;
-    }
-
-    error = NULL;
-    ret = com_meego_inputmethod_uiserver1_load_plugin_settings (proxy->priv->dbusproxy,
-                                                                locale_name,
-                                                                &error);
-
-    if (error) {
-        g_warning ("%s", error->message);
-        g_error_free (error);
-    }
-
-    return ret;
-}

=== removed file 'connection-glib/meego-im-proxy.h'
--- connection-glib/meego-im-proxy.h	2012-07-13 19:02:51 +0000
+++ connection-glib/meego-im-proxy.h	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2010, Intel Corporation.
- *
- * Author: Raymond Liu <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _MEEGO_IM_PROXY_H
-#define _MEEGO_IM_PROXY_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-typedef struct _MeegoIMProxy MeegoIMProxy;
-typedef struct _MeegoIMProxyClass MeegoIMProxyClass;
-typedef struct _MeegoImProxyPrivate MeegoImProxyPrivate;
-
-#define MEEGO_TYPE_IM_PROXY     (meego_im_proxy_get_type())
-#define MEEGO_IM_PROXY(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), MEEGO_TYPE_IM_PROXY, MeegoIMProxy))
-#define MEEGO_IM_PROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), MEEGO_TYPE_IM_PROXY, MeegoIMProxyClass))
-#define MEEGO_IS_IM_PROXY(obj)      (G_TYPE_CHECK_INSTANCE_TYPE((obj), MEEGO_TYPE_IM_PROXY))
-#define MEEGO_IS_IM_PROXY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE((klass), MEEGO_TYPE_IM_PROXY))
-#define MEEGO_IM_PROXY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS((obj), MEEGO_TYPE_IM_PROXY, MeegoIMProxyClass))
-
-
-typedef gboolean (*MeegoIMProxyLoadPluginSettingsFunction) (MeegoIMProxy *proxy, const gchar *locale_name);
-
-struct _MeegoIMProxy {
-    GObject parent;
-    MeegoImProxyPrivate *priv;
-
-    /* Used to observe calls during testing
-     * Over time it may make sense to convert all functions into
-     * c/glib style vfuncs to allow "inheritance" */
-    MeegoIMProxyLoadPluginSettingsFunction load_plugin_settings_observer;
-};
-
-struct _MeegoIMProxyClass {
-    GObjectClass parent;
-};
-
-GType meego_im_proxy_get_type(void);
-
-MeegoIMProxy *meego_im_proxy_new(void);
-void meego_im_proxy_connect(MeegoIMProxy *proxy, gpointer connection);
-gboolean meego_im_proxy_activate_context(MeegoIMProxy *proxy);
-gboolean meego_im_proxy_app_orientation_changed(MeegoIMProxy *proxy, const gint angle);
-gboolean meego_im_proxy_hide_input_method(MeegoIMProxy *proxy);
-#if 0
-// Not yet really implemented
-gboolean meego_im_proxy_mouse_clicked_on_preedit(MeegoIMProxy *proxy, const GValueArray *pos,
-        const GValueArray *preedit_rect);
-#endif
-
-gboolean meego_im_proxy_update_widget_info(MeegoIMProxy *proxy, const GHashTable *state_information, gboolean focus_changed);
-
-gboolean meego_im_proxy_process_key_event(MeegoIMProxy *proxy, const gint type, const gint code,
-        const gint modifiers, const char *text,
-        const gboolean auto_repeat, const gint count,
-        const guint native_scan_code,
-        const guint native_modifiers,
-        const guint time);
-
-gboolean meego_im_proxy_reset(MeegoIMProxy *proxy);
-gboolean meego_im_proxy_set_context_object(MeegoIMProxy *proxy, const char *object_name);
-gboolean meego_im_proxy_set_copy_paste_state(MeegoIMProxy *proxy, const gboolean copy_available,
-        const gboolean paste_available);
-gboolean meego_im_proxy_set_preedit(MeegoIMProxy *proxy, const char *text, const gint cursor_pos);
-gboolean meego_im_proxy_show_input_method(MeegoIMProxy *proxy);
-
-gboolean
-meego_im_proxy_register_extension (MeegoIMProxy *proxy,
-                                   gint id,
-                                   const gchar *filename);
-
-gboolean
-meego_im_proxy_unregister_extension (MeegoIMProxy *proxy,
-                                     gint id);
-
-gboolean
-meego_im_proxy_set_extended_attribute (MeegoIMProxy *proxy,
-                                       gint id,
-                                       const gchar *target,
-                                       const gchar* target_item,
-                                       const gchar *attribute,
-                                       GValue *value);
-
-gboolean
-meego_im_proxy_load_plugin_settings (MeegoIMProxy *proxy,
-                                     const gchar *locale_name);
-
-G_END_DECLS
-
-#endif //_MEEGO_IM_PROXY_H

=== removed file 'connection-glib/meego-imcontext-dbus-private.h'
--- connection-glib/meego-imcontext-dbus-private.h	2012-08-06 12:48:36 +0000
+++ connection-glib/meego-imcontext-dbus-private.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/* This file is part of Maliit framework
- *
- * Copyright (C) 2012 Openismus GmbH
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the licence, or (at your option) any later version.
- *
- * This library 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 library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef MEEGOIMCONTEXTDBUSPRIVATE_H
-#define MEEGOIMCONTEXTDBUSPRIVATE_H
-
-gboolean meego_imcontext_dbus_activation_lost_event(MeegoIMContextDbusObj *obj, GError **error);
-gboolean meego_imcontext_dbus_im_initiated_hide(MeegoIMContextDbusObj *obj, GError **error);
-gboolean meego_imcontext_dbus_commit_string(MeegoIMContextDbusObj *obj, char *string, gint replacement_start,
-        int replacement_length, int cursor_pos, GError **error);
-gboolean meego_imcontext_dbus_update_preedit(MeegoIMContextDbusObj *obj, const char *string, GPtrArray *formatListData, gint32 replaceStart, gint32 replaceLength, gint32 cursorPos, GError** error);
-gboolean meego_imcontext_dbus_key_event(MeegoIMContextDbusObj *obj, int type, int key, int modifiers, char *text,
-                                        gboolean auto_repeat, int count, GError **error);
-gboolean meego_imcontext_dbus_update_input_method_area(MeegoIMContextDbusObj *obj, int x, int y, int width, int height, GError **error);
-gboolean meego_imcontext_dbus_set_global_correction_enabled(MeegoIMContextDbusObj *obj, gboolean correction, GError **error);
-gboolean meego_imcontext_dbus_set_redirect_keys(MeegoIMContextDbusObj *obj, gboolean enabled, GError **error);
-gboolean meego_imcontext_dbus_preedit_rectangle(MeegoIMContextDbusObj *obj, GValueArray **rect, gboolean *valid, GError **error);
-gboolean meego_imcontext_dbus_set_language (MeegoIMContextDbusObj *obj,
-                                            const gchar *language_id,
-                                            GError **error);
-gboolean meego_imcontext_dbus_set_detectable_auto_repeat(MeegoIMContextDbusObj *obj, gboolean enabled, GError **error);
-gboolean meego_imcontext_dbus_set_selection(MeegoIMContextDbusObj *obj, int start, int length, GError **error);
-gboolean meego_imcontext_dbus_selection(MeegoIMContextDbusObj *obj, gboolean *valid, gchar **gdata, GError **error);
-
-gboolean meego_imcontext_dbus_notify_extended_attribute_changed (MeegoIMContextDbusObj *obj,
-                                                                 gint id,
-                                                                 const gchar *target,
-                                                                 const gchar *target_item,
-                                                                 const gchar *key,
-                                                                 GValue *value,
-                                                                 GError **error);
-gboolean
-meego_imcontext_dbus_plugin_settings_loaded (MeegoIMContextDbusObj *obj,
-                                             GPtrArray *settings_data,
-                                             GError **error G_GNUC_UNUSED);
-
-#endif // MEEGOIMCONTEXTDBUSPRIVATE_H

=== removed file 'connection-glib/meego-imcontext-dbus.c'
--- connection-glib/meego-imcontext-dbus.c	2012-08-06 12:48:36 +0000
+++ connection-glib/meego-imcontext-dbus.c	1970-01-01 00:00:00 +0000
@@ -1,443 +0,0 @@
-/*
- * Copyright (C) 2010 Intel Corporation
- * Copyright (C) 2012 One Laptop per Child Association
- *
- * Author:  Raymond Liu <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#include <stdlib.h>
-#include <glib.h>
-
-#include "meego-imcontext-dbus.h"
-
-#include "debug.h"
-#include "maliitmarshalers.h"
-
-#include <dbus/dbus-glib.h>
-
-#define MEEGO_IMCONTEXT_DBUSOBJ_SERVICE_OBJECT_PATH "/com/meego/inputmethod/inputcontext"
-
-G_DEFINE_TYPE(MeegoIMContextDbusObj, meego_imcontext_dbusobj, G_TYPE_OBJECT);
-
-#include "meego-imcontext-dbus-private.h"
-
-enum {
-    ACTIVATION_LOST_EVENT,
-    IM_INITIATED_HIDE,
-    COMMIT_STRING,
-    UPDATE_PREEDIT,
-    KEY_EVENT,
-    UPDATE_INPUT_METHOD_AREA,
-    SET_GLOBAL_CORRECTION,
-    PREEDIT_RECTANGLE,
-    COPY,
-    PASTE,
-    SET_REDIRECT_KEYS,
-    SET_DETECTABLE_AUTO_REPEAT,
-    SET_SELECTION,
-    SELECTION,
-    SET_LANGUAGE,
-    NOTIFY_EXTENDED_ATTRIBUTE_CHANGED,
-    PLUGIN_SETTINGS_LOADED,
-    LAST_SIGNAL
-};
-
-static guint imcontext_signals[LAST_SIGNAL] = { 0 };
-
-#include "meego-imcontext-dbus-glue.h"
-
-
-static void
-meego_imcontext_dbusobj_init(MeegoIMContextDbusObj *obj)
-{
-    STEP();
-    g_assert(obj != NULL);
-}
-
-
-static void
-meego_imcontext_dbusobj_class_init(MeegoIMContextDbusObjClass *klass)
-{
-    g_assert(klass != NULL);
-
-    dbus_g_object_type_install_info(MEEGO_IMCONTEXT_TYPE_DBUSOBJ,
-                                    &dbus_glib_meego_imcontext_dbus_object_info);
-
-    imcontext_signals[ACTIVATION_LOST_EVENT] = g_signal_new("activation-lost-event",
-                                                            G_TYPE_FROM_CLASS(klass),
-                                                            G_SIGNAL_RUN_FIRST,
-                                                            0,
-                                                            NULL, NULL,
-                                                            g_cclosure_marshal_VOID__VOID,
-                                                            G_TYPE_NONE, 0);
-    imcontext_signals[IM_INITIATED_HIDE] = g_signal_new("im-initiated-hide",
-                                                        G_TYPE_FROM_CLASS(klass),
-                                                        G_SIGNAL_RUN_FIRST,
-                                                        0,
-                                                        NULL, NULL,
-                                                        g_cclosure_marshal_VOID__VOID,
-                                                        G_TYPE_NONE, 0);
-    imcontext_signals[COMMIT_STRING] = g_signal_new("commit-string",
-                                                    G_TYPE_FROM_CLASS(klass),
-                                                    G_SIGNAL_RUN_FIRST,
-                                                    0,
-                                                    NULL, NULL,
-                                                    _maliit_marshal_VOID__STRING_INT_INT_INT,
-                                                    G_TYPE_NONE, 4,
-                                                    G_TYPE_STRING,
-                                                    G_TYPE_INT,
-                                                    G_TYPE_INT,
-                                                    G_TYPE_INT);
-    imcontext_signals[UPDATE_PREEDIT] = g_signal_new("update-preedit",
-                                                     G_TYPE_FROM_CLASS(klass),
-                                                     G_SIGNAL_RUN_FIRST,
-                                                     0,
-                                                     NULL, NULL,
-                                                     _maliit_marshal_VOID__STRING_BOXED_INT_INT_INT,
-                                                     G_TYPE_NONE, 5,
-                                                     G_TYPE_STRING,
-                                                     G_TYPE_PTR_ARRAY,
-                                                     G_TYPE_INT,
-                                                     G_TYPE_INT,
-                                                     G_TYPE_INT);
-    imcontext_signals[KEY_EVENT] = g_signal_new("key-event",
-                                                G_TYPE_FROM_CLASS(klass),
-                                                G_SIGNAL_RUN_FIRST,
-                                                0,
-                                                NULL, NULL,
-                                                _maliit_marshal_VOID__INT_INT_INT_STRING_BOOLEAN_INT,
-                                                G_TYPE_NONE, 6,
-                                                G_TYPE_INT,
-                                                G_TYPE_INT,
-                                                G_TYPE_INT,
-                                                G_TYPE_STRING,
-                                                G_TYPE_BOOLEAN,
-                                                G_TYPE_INT);
-    imcontext_signals[UPDATE_INPUT_METHOD_AREA] = g_signal_new("update-input-method-area",
-                                                               G_TYPE_FROM_CLASS(klass),
-                                                               G_SIGNAL_RUN_FIRST,
-                                                               0,
-                                                               NULL, NULL,
-                                                               _maliit_marshal_VOID__INT_INT_INT_INT,
-                                                               G_TYPE_NONE, 4,
-                                                               G_TYPE_INT,
-                                                               G_TYPE_INT,
-                                                               G_TYPE_INT,
-                                                               G_TYPE_INT);
-    imcontext_signals[SET_GLOBAL_CORRECTION] = g_signal_new("set-global-correction",
-                                                            G_TYPE_FROM_CLASS(klass),
-                                                            G_SIGNAL_RUN_FIRST,
-                                                            0,
-                                                            NULL, NULL,
-                                                            g_cclosure_marshal_VOID__BOOLEAN,
-                                                            G_TYPE_NONE, 1,
-                                                            G_TYPE_BOOLEAN);
-    imcontext_signals[PREEDIT_RECTANGLE] = g_signal_new("preedit-rectangle",
-                                                        G_TYPE_FROM_CLASS(klass),
-                                                        G_SIGNAL_RUN_LAST,
-                                                        0,
-                                                        NULL, NULL,
-                                                        _maliit_marshal_BOXED__VOID,
-                                                        G_TYPE_PTR_ARRAY, 0);
-    imcontext_signals[COPY] = g_signal_new("copy",
-                                           G_TYPE_FROM_CLASS(klass),
-                                           G_SIGNAL_RUN_FIRST,
-                                           0,
-                                           NULL, NULL,
-                                           g_cclosure_marshal_VOID__VOID,
-                                           G_TYPE_NONE, 0);
-    imcontext_signals[PASTE] = g_signal_new("paste",
-                                            G_TYPE_FROM_CLASS(klass),
-                                            G_SIGNAL_RUN_FIRST,
-                                            0,
-                                            NULL, NULL,
-                                            g_cclosure_marshal_VOID__VOID,
-                                            G_TYPE_NONE, 0);
-    imcontext_signals[SET_REDIRECT_KEYS] = g_signal_new("set-redirect-keys",
-                                                        G_TYPE_FROM_CLASS(klass),
-                                                        G_SIGNAL_RUN_FIRST,
-                                                        0,
-                                                        NULL, NULL,
-                                                        g_cclosure_marshal_VOID__BOOLEAN,
-                                                        G_TYPE_NONE, 1,
-                                                        G_TYPE_BOOLEAN);
-    imcontext_signals[SET_DETECTABLE_AUTO_REPEAT] = g_signal_new("set-detectable-auto-repeat",
-                                                                 G_TYPE_FROM_CLASS(klass),
-                                                                 G_SIGNAL_RUN_FIRST,
-                                                                 0,
-                                                                 NULL, NULL,
-                                                                 g_cclosure_marshal_VOID__BOOLEAN,
-                                                                 G_TYPE_NONE, 1,
-                                                                 G_TYPE_BOOLEAN);
-    imcontext_signals[SET_SELECTION] = g_signal_new("set-selection",
-                                                    G_TYPE_FROM_CLASS(klass),
-                                                    G_SIGNAL_RUN_FIRST,
-                                                    0,
-                                                    NULL, NULL,
-                                                    _maliit_marshal_VOID__INT_INT,
-                                                    G_TYPE_NONE, 2,
-                                                    G_TYPE_INT,
-                                                    G_TYPE_INT);
-    imcontext_signals[SELECTION] = g_signal_new("selection",
-                                                G_TYPE_FROM_CLASS(klass),
-                                                G_SIGNAL_RUN_LAST,
-                                                0,
-                                                NULL, NULL,
-                                                _maliit_marshal_STRING__VOID,
-                                                G_TYPE_STRING, 0);
-    imcontext_signals[SET_LANGUAGE] = g_signal_new("set-language",
-                                                   G_TYPE_FROM_CLASS(klass),
-                                                   G_SIGNAL_RUN_FIRST,
-                                                   0,
-                                                   NULL, NULL,
-                                                   g_cclosure_marshal_VOID__STRING,
-                                                   G_TYPE_NONE, 1,
-                                                   G_TYPE_STRING);
-    imcontext_signals[NOTIFY_EXTENDED_ATTRIBUTE_CHANGED] = g_signal_new("notify-extended-attribute-changed",
-                                                                        G_TYPE_FROM_CLASS(klass),
-                                                                        G_SIGNAL_RUN_FIRST,
-                                                                        0,
-                                                                        NULL, NULL,
-                                                                        _maliit_marshal_VOID__INT_STRING_STRING_STRING_VARIANT,
-                                                                        G_TYPE_NONE, 5,
-                                                                        G_TYPE_INT,
-                                                                        G_TYPE_STRING,
-                                                                        G_TYPE_STRING,
-                                                                        G_TYPE_STRING,
-                                                                        G_TYPE_VARIANT);
-
-    imcontext_signals[PLUGIN_SETTINGS_LOADED] =
-        g_signal_new ("plugin-settings-loaded",
-                      G_TYPE_FROM_CLASS(klass),
-                      G_SIGNAL_RUN_FIRST,
-                      0,
-                      NULL,
-                      NULL,
-                      g_cclosure_marshal_VOID__BOXED,
-                      G_TYPE_NONE,
-                      1,
-                      G_TYPE_PTR_ARRAY);
-}
-
-void
-meego_imcontext_dbusobj_connect(MeegoIMContextDbusObj *obj, gpointer connection)
-{
-    DBusGConnection *dbus_connection = (DBusGConnection *)connection;
-    g_return_if_fail(dbus_connection != NULL);
-
-    dbus_g_connection_register_g_object(dbus_connection,
-                                        MEEGO_IMCONTEXT_DBUSOBJ_SERVICE_OBJECT_PATH,
-                                        G_OBJECT(obj));
-}
-
-MeegoIMContextDbusObj *
-meego_imcontext_dbusobj_new(void)
-{
-    return g_object_new(MEEGO_IMCONTEXT_TYPE_DBUSOBJ, NULL);
-}
-
-
-gboolean
-meego_imcontext_dbus_activation_lost_event(MeegoIMContextDbusObj *obj, GError **error)
-{
-    STEP();
-
-    g_signal_emit(obj, imcontext_signals[ACTIVATION_LOST_EVENT], 0);
-
-    return TRUE;
-}
-
-
-gboolean
-meego_imcontext_dbus_im_initiated_hide(MeegoIMContextDbusObj *obj, GError **error)
-{
-    STEP();
-
-    g_signal_emit(obj, imcontext_signals[IM_INITIATED_HIDE], 0);
-
-    return TRUE;
-}
-
-
-gboolean
-meego_imcontext_dbus_commit_string(MeegoIMContextDbusObj *obj, char *string, gint replacement_start,
-                                   int replacement_length, int cursor_pos, GError **error)
-{
-    UNUSED(error);
-
-    DBG("commit string: %s", string);
-
-    g_signal_emit(obj, imcontext_signals[COMMIT_STRING], 0, string, replacement_start, replacement_length, cursor_pos);
-
-    return TRUE;
-}
-
-
-gboolean
-meego_imcontext_dbus_update_preedit(MeegoIMContextDbusObj *obj, const char *string, GPtrArray *formatListData, gint32 replaceStart, gint32 replaceLength, gint32 cursorPos, GError **error)
-{
-    UNUSED(error);
-
-    DBG("preedit string: %s", string);
-
-    g_signal_emit(obj, imcontext_signals[UPDATE_PREEDIT], 0, string, formatListData, replaceStart, replaceLength, cursorPos);
-
-    return TRUE;
-}
-
-
-gboolean
-meego_imcontext_dbus_key_event(MeegoIMContextDbusObj *obj, int type, int key, int modifiers, char *text,
-                               gboolean auto_repeat, int count, GError **error)
-{
-    UNUSED(error);
-
-    DBG("type=0x%x, key=0x%x, modifiers=0x%x, text = %s, auto_repeat=%d, count=%d",
-        type, key, modifiers, text, auto_repeat, count);
-
-    g_signal_emit(obj, imcontext_signals[KEY_EVENT], 0, type, key, modifiers, text, auto_repeat, count);
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_update_input_method_area(MeegoIMContextDbusObj *obj, int x, int y, int width, int height, GError **error G_GNUC_UNUSED)
-{
-    STEP();
-
-    g_signal_emit(obj, imcontext_signals[UPDATE_INPUT_METHOD_AREA], 0, x, y, width, height);
-
-    return TRUE;
-}
-
-
-gboolean
-meego_imcontext_dbus_set_global_correction_enabled(MeegoIMContextDbusObj *obj, gboolean correction, GError **error)
-{
-    STEP();
-
-    // TODO emit SET_GLOBAL_CORRECTION signal
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_set_redirect_keys(MeegoIMContextDbusObj *obj, gboolean enabled, GError **error)
-{
-    UNUSED(error);
-
-    STEP();
-
-    g_signal_emit(obj, imcontext_signals[SET_REDIRECT_KEYS], 0, enabled);
-
-    return TRUE;
-}
-
-
-gboolean
-meego_imcontext_dbus_preedit_rectangle(MeegoIMContextDbusObj *obj, GValueArray **rect, gboolean *valid, GError **error)
-{
-    STEP();
-
-    // TODO emit PREEDIT_RECTANGLE signal
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_set_detectable_auto_repeat(MeegoIMContextDbusObj *obj, gboolean enabled, GError **error)
-{
-    STEP();
-
-    // TODO emit SET_DETECTABLE_AUTO_REPEAT signal
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_set_selection(MeegoIMContextDbusObj *obj, int start, int length, GError **error)
-{
-    STEP();
-
-    // TODO emit SET_SELECTION signal
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_selection(MeegoIMContextDbusObj *obj, gboolean *valid, gchar **gdata, GError **error)
-{
-    STEP();
-
-    // TODO emit SELECTION signal
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_set_language (MeegoIMContextDbusObj *obj,
-                                   const gchar *language_id,
-                                   GError **error)
-{
-    UNUSED(error);
-    STEP();
-
-    g_signal_emit(obj, imcontext_signals[SET_LANGUAGE], 0, language_id);
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_notify_extended_attribute_changed (MeegoIMContextDbusObj *obj,
-                                                        gint id,
-                                                        const gchar *target,
-                                                        const gchar *target_item,
-                                                        const gchar *key,
-                                                        GValue *value,
-                                                        GError **error)
-{
-    UNUSED(error);
-    STEP();
-
-    GVariant *variant_value = dbus_g_value_build_g_variant (value);
-
-    if (variant_value) {
-        if (g_variant_is_floating (variant_value)) {
-            g_variant_ref_sink (variant_value);
-        }
-
-        g_signal_emit(obj, imcontext_signals[NOTIFY_EXTENDED_ATTRIBUTE_CHANGED], 0, id, target, target_item, key, variant_value);
-
-        g_variant_unref (variant_value);
-
-        return TRUE;
-    }
-
-    g_warning ("Unknown data type: %s", G_VALUE_TYPE_NAME (value));
-
-    return TRUE;
-}
-
-gboolean
-meego_imcontext_dbus_plugin_settings_loaded (MeegoIMContextDbusObj *obj,
-                                             GPtrArray *settings_data,
-                                             GError **error G_GNUC_UNUSED)
-{
-    g_signal_emit(obj, imcontext_signals[PLUGIN_SETTINGS_LOADED], 0, settings_data);
-    return TRUE;
-}

=== removed file 'connection-glib/meego-imcontext-dbus.h'
--- connection-glib/meego-imcontext-dbus.h	2012-07-13 19:02:51 +0000
+++ connection-glib/meego-imcontext-dbus.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2010 Intel Corporation
- *
- * Author:  Raymond Liu <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- */
-
-#ifndef _MEEGO_IMCONTEXT_DBUS_H
-#define _MEEGO_IMCONTEXT_DBUS_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-typedef struct {
-    GObject parent;
-
-} MeegoIMContextDbusObj;
-
-typedef struct {
-    GObjectClass parent;
-} MeegoIMContextDbusObjClass;
-
-GType meego_imcontext_dbusobj_get_type(void);
-
-#define MEEGO_IMCONTEXT_TYPE_DBUSOBJ (meego_imcontext_dbusobj_get_type())
-#define MEEGO_IMCONTEXT_DBUSOBJ(obj) \
-        (G_TYPE_CHECK_INSTANCE_CAST((obj), MEEGO_IMCONTEXT_TYPE_DBUSOBJ, MeegoIMContextDbusObj))
-#define MEEGO_IMCONTEXT_DBUSOBJ_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_CAST((klass), MEEGO_IMCONTEXT_TYPE_DBUSOBJ, MeegoIMContextDbusObjClass))
-#define MEEGO_IMCONTEXT_IS_DBUSOBJ(obj) \
-        (G_TYPE_CHECK_INSTANCE_TYPE((obj), MEEGO_IMCONTEXT_TYPE_DBUSOBJ))
-#define MEEGO_IMCONTEXT_IS_DBUSOBJ_CLASS(klass) \
-        (G_TYPE_CHECK_CLASS_TYPE((klass), MEEGO_IMCONTEXT_TYPE_DBUSOBJ))
-#define MEEGO_IMCONTEXT_DBUSOBJ_GET_CLASS(obj) \
-        (G_TYPE_INSTANCE_GET_CLASS((obj), MEEGO_IMCONTEXT_TYPE_DBUSOBJ, MeegoIMContextDbusObjClass))
-
-
-MeegoIMContextDbusObj *meego_imcontext_dbusobj_new(void);
-void meego_imcontext_dbusobj_connect(MeegoIMContextDbusObj *obj, gpointer connection);
-
-#endif /* _MEEGO_IMCONTEXT_DBUS_H */

=== removed file 'connection-glib/qt-keysym-map.cpp'
--- connection-glib/qt-keysym-map.cpp	2012-05-22 06:12:09 +0000
+++ connection-glib/qt-keysym-map.cpp	1970-01-01 00:00:00 +0000
@@ -1,542 +0,0 @@
-/*
- * Copyright (C) 2001 Ellis Whitehead <[e-mail]>
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2010, Intel Corporation.
- *
- * Author: Raymond Liu <[e-mail]>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- * 
- * This library 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 library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-
-#include <X11/keysym.h>
-#include <qstring.h>
-
-#include "qt-keysym-map.h"
-#include "debug.h"
-
-
-#if 0
-
-typedef struct {
-	int QtKey;
-	uint XKeySym;
-} KeySymMap;
-
-static const KeySymMap QtKeyXSymMaps[] =
-{
-	{ '/',			XK_KP_Divide },
-	{ '*',			XK_KP_Multiply },
-	{ '-',			XK_KP_Subtract },
-	{ '+',			XK_KP_Add },
-	{ Qt::Key_Escape,	XK_Escape },
-	{ Qt::Key_Tab,		XK_Tab },
-	{ Qt::Key_Backtab,	XK_ISO_Left_Tab },
-	{ Qt::Key_Backspace,	XK_BackSpace },
-	{ Qt::Key_Return,	XK_Return },
-	{ Qt::Key_Enter,	XK_KP_Enter },
-	{ Qt::Key_Insert,	XK_Insert },
-	{ Qt::Key_Delete,	XK_Delete },
-	{ Qt::Key_Pause,	XK_Pause },
-	{ Qt::Key_Print,	XK_Print },
-	{ Qt::Key_SysReq,	XK_Sys_Req },
-	{ Qt::Key_Home,		XK_Home },
-	{ Qt::Key_End,		XK_End },
-	{ Qt::Key_Left,		XK_Left },
-	{ Qt::Key_Up,		XK_Up },
-	{ Qt::Key_Right,	XK_Right },
-	{ Qt::Key_Down,		XK_Down },
-	{ Qt::Key_CapsLock,	XK_Caps_Lock },
-	{ Qt::Key_NumLock,	XK_Num_Lock },
-	{ Qt::Key_ScrollLock,	XK_Scroll_Lock },
-	{ Qt::Key_F1,		XK_F1 },
-	{ Qt::Key_F2,		XK_F2 },
-	{ Qt::Key_F3,		XK_F3 },
-	{ Qt::Key_F4,		XK_F4 },
-	{ Qt::Key_F5,		XK_F5 },
-	{ Qt::Key_F6,		XK_F6 },
-	{ Qt::Key_F7,		XK_F7 },
-	{ Qt::Key_F8,		XK_F8 },
-	{ Qt::Key_F9,		XK_F9 },
-	{ Qt::Key_F10,		XK_F10 },
-	{ Qt::Key_F11,		XK_F11 },
-	{ Qt::Key_F12,		XK_F12 },
-	{ Qt::Key_F13,		XK_F13 },
-	{ Qt::Key_F14,		XK_F14 },
-	{ Qt::Key_F15,		XK_F15 },
-	{ Qt::Key_F16,		XK_F16 },
-	{ Qt::Key_F17,		XK_F17 },
-	{ Qt::Key_F18,		XK_F18 },
-	{ Qt::Key_F19,		XK_F19 },
-	{ Qt::Key_F20,		XK_F20 },
-	{ Qt::Key_F21,		XK_F21 },
-	{ Qt::Key_F22,		XK_F22 },
-	{ Qt::Key_F23,		XK_F23 },
-	{ Qt::Key_F24,		XK_F24 },
-	{ Qt::Key_F25,		XK_F25 },
-	{ Qt::Key_F26,		XK_F26 },
-	{ Qt::Key_F27,		XK_F27 },
-	{ Qt::Key_F28,		XK_F28 },
-	{ Qt::Key_F29,		XK_F29 },
-	{ Qt::Key_F30,		XK_F30 },
-	{ Qt::Key_F31,		XK_F31 },
-	{ Qt::Key_F32,		XK_F32 },
-	{ Qt::Key_F33,		XK_F33 },
-	{ Qt::Key_F34,		XK_F34 },
-	{ Qt::Key_F35,		XK_F35 },
-	{ Qt::Key_Super_L,	XK_Super_L },
-	{ Qt::Key_Super_R,	XK_Super_R },
-	{ Qt::Key_Menu,		XK_Menu },
-	{ Qt::Key_Hyper_L,	XK_Hyper_L },
-	{ Qt::Key_Hyper_R,	XK_Hyper_R },
-	{ Qt::Key_Help,		XK_Help },
-	{ Qt::Key_Return,	XK_KP_Enter },
-
-	{ Qt::Key_Multi_key,	XK_Multi_key },
-	{ Qt::Key_Codeinput,	XK_Codeinput },
-	{ Qt::Key_SingleCandidate,	XK_SingleCandidate },
-	{ Qt::Key_MultipleCandidate,	XK_MultipleCandidate },
-	{ Qt::Key_PreviousCandidate,	XK_PreviousCandidate },
-	{ Qt::Key_Mode_switch,	XK_Mode_switch },
-	{ Qt::Key_Kanji,	XK_Kanji },
-	{ Qt::Key_Muhenkan,	XK_Muhenkan },
-	{ Qt::Key_Henkan,	XK_Henkan },
-	{ Qt::Key_Romaji,	XK_Romaji },
-	{ Qt::Key_Hiragana,	XK_Hiragana },
-	{ Qt::Key_Katakana,	XK_Katakana },
-	{ Qt::Key_Hiragana_Katakana,	XK_Hiragana_Katakana },
-	{ Qt::Key_Zenkaku,	XK_Zenkaku },
-	{ Qt::Key_Hankaku,	XK_Hankaku },
-	{ Qt::Key_Zenkaku_Hankaku,	XK_Zenkaku_Hankaku },
-	{ Qt::Key_Touroku,	XK_Touroku },
-	{ Qt::Key_Massyo,	XK_Massyo },
-	{ Qt::Key_Kana_Lock,	XK_Kana_Lock },
-	{ Qt::Key_Kana_Shift,	XK_Kana_Shift },
-	{ Qt::Key_Eisu_Shift,	XK_Eisu_Shift },
-	{ Qt::Key_Eisu_toggle,	XK_Eisu_toggle },
-	{ Qt::Key_Hangul,	XK_Hangul },
-	{ Qt::Key_Hangul_Start,	XK_Hangul_Start },
-	{ Qt::Key_Hangul_End,	XK_Hangul_End },
-	{ Qt::Key_Hangul_Hanja,	XK_Hangul_Hanja },
-	{ Qt::Key_Hangul_Jamo,	XK_Hangul_Jamo },
-	{ Qt::Key_Hangul_Romaja,	XK_Hangul_Romaja },
-	{ Qt::Key_Hangul_Jeonja,	XK_Hangul_Jeonja },
-	{ Qt::Key_Hangul_Banja,	XK_Hangul_Banja },
-	{ Qt::Key_Hangul_PreHanja,	XK_Hangul_PreHanja },
-	{ Qt::Key_Hangul_Special,	XK_Hangul_Special },
-
-	{ 0, 0 }
-};
-
-#else
-
-typedef struct {
-	uint XKeySym;
-	int QtKey;
-} KeySymMap;
-
-// keyboard mapping table, modified from QKeymapper_x11.cpp
-static const KeySymMap QtKeyXSymMaps[] = {
-
-// misc keys
-
-	{ XK_Escape,                  Qt::Key_Escape },
-	{ XK_Tab,                     Qt::Key_Tab },
-	{ XK_ISO_Left_Tab,            Qt::Key_Backtab },
-	{ XK_BackSpace,               Qt::Key_Backspace },
-	{ XK_Return,                  Qt::Key_Return },
-	{ XK_Insert,                  Qt::Key_Insert },
-	{ XK_Delete,                  Qt::Key_Delete },
-	{ XK_Clear,                   Qt::Key_Delete },
-	{ XK_Pause,                   Qt::Key_Pause },
-	{ XK_Print,                   Qt::Key_Print },
-	{ 0x1005FF60,                 Qt::Key_SysReq },         // hardcoded Sun SysReq
-	{ 0x1007ff00,                 Qt::Key_SysReq },         // hardcoded X386 SysReq
-
-// cursor movement
-
-	{ XK_Home,                    Qt::Key_Home },
-	{ XK_End,                     Qt::Key_End },
-	{ XK_Left,                    Qt::Key_Left },
-	{ XK_Up,                      Qt::Key_Up },
-	{ XK_Right,                   Qt::Key_Right },
-	{ XK_Down,                    Qt::Key_Down },
-	{ XK_Prior,                   Qt::Key_PageUp },
-	{ XK_Next,                    Qt::Key_PageDown },
-
-// modifiers
-
-	{ XK_Shift_L,                 Qt::Key_Shift },
-	{ XK_Shift_R,                 Qt::Key_Shift },
-	{ XK_Shift_Lock,              Qt::Key_Shift },
-	{ XK_Control_L,               Qt::Key_Control },
-	{ XK_Control_R,               Qt::Key_Control },
-	{ XK_Meta_L,                  Qt::Key_Meta },
-	{ XK_Meta_R,                  Qt::Key_Meta },
-	{ XK_Alt_L,                   Qt::Key_Alt },
-	{ XK_Alt_R,                   Qt::Key_Alt },
-	{ XK_Caps_Lock,               Qt::Key_CapsLock },
-	{ XK_Num_Lock,                Qt::Key_NumLock },
-	{ XK_Scroll_Lock,             Qt::Key_ScrollLock },
-	{ XK_Super_L,                 Qt::Key_Super_L },
-	{ XK_Super_R,                 Qt::Key_Super_R },
-	{ XK_Menu,                    Qt::Key_Menu },
-	{ XK_Hyper_L,                 Qt::Key_Hyper_L },
-	{ XK_Hyper_R,                 Qt::Key_Hyper_R },
-	{ XK_Help,                    Qt::Key_Help },
-	{ 0x1000FF74,                 Qt::Key_Backtab },        // hardcoded HP backtab
-	{ 0x1005FF10,                 Qt::Key_F11 },            // hardcoded Sun F36 (labeled F11)
-	{ 0x1005FF11,                 Qt::Key_F12 },            // hardcoded Sun F37 (labeled F12)
-
-// function keys
-
-	{ XK_F1,                   Qt::Key_F1 },
-	{ XK_F2,                   Qt::Key_F2 },
-	{ XK_F3,                   Qt::Key_F3 },
-	{ XK_F4,                   Qt::Key_F4 },
-	{ XK_F5,                   Qt::Key_F5 },
-	{ XK_F6,                   Qt::Key_F6 },
-	{ XK_F7,                   Qt::Key_F7 },
-	{ XK_F8,                   Qt::Key_F8 },
-	{ XK_F9,                   Qt::Key_F9 },
-	{ XK_F10,                  Qt::Key_F10 },
-	{ XK_F11,                  Qt::Key_F11 },
-	{ XK_F12,                  Qt::Key_F12 },
-	{ XK_F13,                  Qt::Key_F13 },
-	{ XK_F14,                  Qt::Key_F14 },
-	{ XK_F15,                  Qt::Key_F15 },
-	{ XK_F16,                  Qt::Key_F16 },
-	{ XK_F17,                  Qt::Key_F17 },
-	{ XK_F18,                  Qt::Key_F18 },
-	{ XK_F19,                  Qt::Key_F19 },
-	{ XK_F20,                  Qt::Key_F20 },
-
-// numeric and function keypad keys
-
-	{ XK_KP_Space,                Qt::Key_Space },
-	{ XK_KP_Tab,                  Qt::Key_Tab },
-	{ XK_KP_Enter,                Qt::Key_Enter },
-	{ XK_KP_F1,                   Qt::Key_F1 },
-	{ XK_KP_F2,                   Qt::Key_F2 },
-	{ XK_KP_F3,                   Qt::Key_F3 },
-	{ XK_KP_F4,                   Qt::Key_F4 },
-
-	{ XK_KP_Home,                 Qt::Key_Home },
-	{ XK_KP_Left,                 Qt::Key_Left },
-	{ XK_KP_Up,                   Qt::Key_Up },
-	{ XK_KP_Right,                Qt::Key_Right },
-	{ XK_KP_Down,                 Qt::Key_Down },
-	{ XK_KP_Prior,                Qt::Key_PageUp },
-	{ XK_KP_Next,                 Qt::Key_PageDown },
-	{ XK_KP_End,                  Qt::Key_End },
-	{ XK_KP_Begin,                Qt::Key_Clear },
-	{ XK_KP_Insert,               Qt::Key_Insert },
-	{ XK_KP_Delete,               Qt::Key_Delete },
-	{ XK_KP_Equal,                Qt::Key_Equal },
-	{ XK_KP_Multiply,             Qt::Key_Asterisk },
-	{ XK_KP_Add,                  Qt::Key_Plus },
-	{ XK_KP_Separator,            Qt::Key_Comma },
-	{ XK_KP_Subtract,             Qt::Key_Minus },
-	{ XK_KP_Decimal,              Qt::Key_Period },
-	{ XK_KP_Divide,               Qt::Key_Slash },
-
-	{ XK_KP_0, 	              Qt::Key_0 },
-	{ XK_KP_1, 	              Qt::Key_1 },
-	{ XK_KP_2, 	              Qt::Key_2 },
-	{ XK_KP_3, 	              Qt::Key_3 },
-	{ XK_KP_4, 	              Qt::Key_4 },
-	{ XK_KP_5, 	              Qt::Key_5 },
-	{ XK_KP_6, 	              Qt::Key_6 },
-	{ XK_KP_7, 	              Qt::Key_7 },
-	{ XK_KP_8, 	              Qt::Key_8 },
-	{ XK_KP_9, 	              Qt::Key_9 },
-
-//International input method support keys
-//International & multi-key character composition
-
-	{ XK_ISO_Level3_Shift,        Qt::Key_AltGr },
-	{ XK_Multi_key,		Qt::Key_Multi_key },
-	{ XK_Codeinput,		Qt::Key_Codeinput },
-	{ XK_SingleCandidate,		Qt::Key_SingleCandidate },
-	{ XK_MultipleCandidate,	Qt::Key_MultipleCandidate },
-	{ XK_PreviousCandidate,	Qt::Key_PreviousCandidate },
-
-// Misc Functions
-	{ XK_Mode_switch,		Qt::Key_Mode_switch },
-	{ XK_script_switch,		Qt::Key_Mode_switch },
-
-// Japanese keyboard support
-	{ XK_Kanji,			Qt::Key_Kanji },
-	{ XK_Muhenkan,		Qt::Key_Muhenkan },
-	//{ XK_Henkan_Mode,		Qt::Key_Henkan_Mode },
-	{ XK_Henkan_Mode,		Qt::Key_Henkan },
-	{ XK_Henkan,			Qt::Key_Henkan },
-	{ XK_Romaji,			Qt::Key_Romaji },
-	{ XK_Hiragana,		Qt::Key_Hiragana },
-	{ XK_Katakana,		Qt::Key_Katakana },
-	{ XK_Hiragana_Katakana,	Qt::Key_Hiragana_Katakana },
-	{ XK_Zenkaku,			Qt::Key_Zenkaku },
-	{ XK_Hankaku,			Qt::Key_Hankaku },
-	{ XK_Zenkaku_Hankaku,		Qt::Key_Zenkaku_Hankaku },
-	{ XK_Touroku,			Qt::Key_Touroku },
-	{ XK_Massyo,			Qt::Key_Massyo },
-	{ XK_Kana_Lock,		Qt::Key_Kana_Lock },
-	{ XK_Kana_Shift,		Qt::Key_Kana_Shift },
-	{ XK_Eisu_Shift,		Qt::Key_Eisu_Shift },
-	{ XK_Eisu_toggle,		Qt::Key_Eisu_toggle },
-	//{ XK_Kanji_Bangou,		Qt::Key_Kanji_Bangou },
-	//{ XK_Zen_Koho,		Qt::Key_Zen_Koho },
-	//{ XK_Mae_Koho,		Qt::Key_Mae_Koho },
-	{ XK_Kanji_Bangou,		Qt::Key_Codeinput },
-	{ XK_Zen_Koho,		Qt::Key_MultipleCandidate },
-	{ XK_Mae_Koho,		Qt::Key_PreviousCandidate },
-
-#ifdef XK_KOREAN
-// Korean keyboard support
-	{ XK_Hangul,			Qt::Key_Hangul },
-	{ XK_Hangul_Start,		Qt::Key_Hangul_Start },
-	{ XK_Hangul_End,		Qt::Key_Hangul_End },
-	{ XK_Hangul_Hanja,		Qt::Key_Hangul_Hanja },
-	{ XK_Hangul_Jamo,		Qt::Key_Hangul_Jamo },
-	{ XK_Hangul_Romaja,		Qt::Key_Hangul_Romaja },
-	//{ XK_Hangul_Codeinput,	Qt::Key_Hangul_Codeinput },
-	{ XK_Hangul_Codeinput,	Qt::Key_Codeinput },
-	{ XK_Hangul_Jeonja,		Qt::Key_Hangul_Jeonja },
-	{ XK_Hangul_Banja,		Qt::Key_Hangul_Banja },
-	{ XK_Hangul_PreHanja,		Qt::Key_Hangul_PreHanja },
-	{ XK_Hangul_PostHanja,	Qt::Key_Hangul_PostHanja },
-	//{ XK_Hangul_SingleCandidate,Qt::Key_Hangul_SingleCandidate },
-	//{ XK_Hangul_MultipleCandidate,Qt::Key_Hangul_MultipleCandidate },
-	//{ XK_Hangul_PreviousCandidate,Qt::Key_Hangul_PreviousCandidate },
-	{ XK_Hangul_SingleCandidate,	Qt::Key_SingleCandidate },
-	{ XK_Hangul_MultipleCandidate,Qt::Key_MultipleCandidate },
-	{ XK_Hangul_PreviousCandidate,Qt::Key_PreviousCandidate },
-	{ XK_Hangul_Special,		Qt::Key_Hangul_Special },
-	//{ XK_Hangul_switch,		Qt::Key_Hangul_switch },
-	{ XK_Hangul_switch,		Qt::Key_Mode_switch },
-#endif  // XK_KOREAN
-
-// dead keys
-	{ XK_dead_grave,              Qt::Key_Dead_Grave },
-	{ XK_dead_acute,              Qt::Key_Dead_Acute },
-	{ XK_dead_circumflex,         Qt::Key_Dead_Circumflex },
-	{ XK_dead_tilde,              Qt::Key_Dead_Tilde },
-	{ XK_dead_macron,             Qt::Key_Dead_Macron },
-	{ XK_dead_breve,              Qt::Key_Dead_Breve },
-	{ XK_dead_abovedot,           Qt::Key_Dead_Abovedot },
-	{ XK_dead_diaeresis,          Qt::Key_Dead_Diaeresis },
-	{ XK_dead_abovering,          Qt::Key_Dead_Abovering },
-	{ XK_dead_doubleacute,        Qt::Key_Dead_Doubleacute },
-	{ XK_dead_caron,              Qt::Key_Dead_Caron },
-	{ XK_dead_cedilla,            Qt::Key_Dead_Cedilla },
-	{ XK_dead_ogonek,             Qt::Key_Dead_Ogonek },
-	{ XK_dead_iota,               Qt::Key_Dead_Iota },
-	{ XK_dead_voiced_sound,       Qt::Key_Dead_Voiced_Sound },
-	{ XK_dead_semivoiced_sound,   Qt::Key_Dead_Semivoiced_Sound },
-	{ XK_dead_belowdot,           Qt::Key_Dead_Belowdot },
-	{ XK_dead_hook,               Qt::Key_Dead_Hook },
-	{ XK_dead_horn,               Qt::Key_Dead_Horn },
-
-// Special keys from X.org - This include multimedia keys,
-// wireless/bluetooth/uwb keys , special launcher keys, etc.
-
-#if 0
-	{ XF86XK_Back,                Qt::Key_Back },
-	{ XF86XK_Forward,             Qt::Key_Forward },
-	{ XF86XK_Stop,                Qt::Key_Stop },
-	{ XF86XK_Refresh,             Qt::Key_Refresh },
-	{ XF86XK_Favorites,           Qt::Key_Favorites },
-	{ XF86XK_AudioMedia,          Qt::Key_LaunchMedia },
-	{ XF86XK_OpenURL,             Qt::Key_OpenUrl },
-	{ XF86XK_HomePage,            Qt::Key_HomePage },
-	{ XF86XK_Search,              Qt::Key_Search },
-	{ XF86XK_AudioLowerVolume,    Qt::Key_VolumeDown },
-	{ XF86XK_AudioMute,           Qt::Key_VolumeMute },
-	{ XF86XK_AudioRaiseVolume,    Qt::Key_VolumeUp },
-	{ XF86XK_AudioPlay,           Qt::Key_MediaPlay },
-	{ XF86XK_AudioStop,           Qt::Key_MediaStop },
-	{ XF86XK_AudioPrev,           Qt::Key_MediaPrevious },
-	{ XF86XK_AudioNext,           Qt::Key_MediaNext },
-	{ XF86XK_AudioRecord,         Qt::Key_MediaRecord },
-	{ XF86XK_Mail,                Qt::Key_LaunchMail },
-	{ XF86XK_MyComputer,          Qt::Key_Launch0 },
-	{ XF86XK_Calculator,          Qt::Key_Calculator },
-	{ XF86XK_Memo,                Qt::Key_Memo },
-	{ XF86XK_ToDoList,            Qt::Key_ToDoList },
-	{ XF86XK_Calendar,            Qt::Key_Calendar },
-	{ XF86XK_PowerDown,           Qt::Key_PowerDown },
-	{ XF86XK_ContrastAdjust,      Qt::Key_ContrastAdjust },
-	{ XF86XK_Standby,             Qt::Key_Standby },
-	{ XF86XK_MonBrightnessUp,     Qt::Key_MonBrightnessUp },
-	{ XF86XK_MonBrightnessDown,   Qt::Key_MonBrightnessDown },
-	{ XF86XK_KbdLightOnOff,       Qt::Key_KeyboardLightOnOff },
-	{ XF86XK_KbdBrightnessUp,     Qt::Key_KeyboardBrightnessUp },
-	{ XF86XK_KbdBrightnessDown,   Qt::Key_KeyboardBrightnessDown },
-	{ XF86XK_PowerOff,            Qt::Key_PowerOff },
-	{ XF86XK_WakeUp,              Qt::Key_WakeUp },
-	{ XF86XK_Eject,               Qt::Key_Eject },
-	{ XF86XK_ScreenSaver,         Qt::Key_ScreenSaver },
-	{ XF86XK_WWW,                 Qt::Key_WWW },
-	{ XF86XK_Sleep,               Qt::Key_Sleep },
-	{ XF86XK_LightBulb,           Qt::Key_LightBulb },
-	{ XF86XK_Shop,                Qt::Key_Shop },
-	{ XF86XK_History,             Qt::Key_History },
-	{ XF86XK_AddFavorite,         Qt::Key_AddFavorite },
-	{ XF86XK_HotLinks,            Qt::Key_HotLinks },
-	{ XF86XK_BrightnessAdjust,    Qt::Key_BrightnessAdjust },
-	{ XF86XK_Finance,             Qt::Key_Finance },
-	{ XF86XK_Community,           Qt::Key_Community },
-	{ XF86XK_AudioRewind,         Qt::Key_AudioRewind },
-	{ XF86XK_BackForward,         Qt::Key_BackForward },
-	{ XF86XK_ApplicationLeft,     Qt::Key_ApplicationLeft },
-	{ XF86XK_ApplicationRight,    Qt::Key_ApplicationRight },
-	{ XF86XK_Book,                Qt::Key_Book },
-	{ XF86XK_CD,                  Qt::Key_CD },
-	{ XF86XK_Calculater,          Qt::Key_Calculator },
-	{ XF86XK_Clear,               Qt::Key_Clear },
-	{ XF86XK_ClearGrab,           Qt::Key_ClearGrab },
-	{ XF86XK_Close,               Qt::Key_Close },
-	{ XF86XK_Copy,                Qt::Key_Copy },
-	{ XF86XK_Cut,                 Qt::Key_Cut },
-	{ XF86XK_Display,             Qt::Key_Display },
-	{ XF86XK_DOS,                 Qt::Key_DOS },
-	{ XF86XK_Documents,           Qt::Key_Documents },
-	{ XF86XK_Excel,               Qt::Key_Excel },
-	{ XF86XK_Explorer,            Qt::Key_Explorer },
-	{ XF86XK_Game,                Qt::Key_Game },
-	{ XF86XK_Go,                  Qt::Key_Go },
-	{ XF86XK_iTouch,              Qt::Key_iTouch },
-	{ XF86XK_LogOff,              Qt::Key_LogOff },
-	{ XF86XK_Market,              Qt::Key_Market },
-	{ XF86XK_Meeting,             Qt::Key_Meeting },
-	{ XF86XK_MenuKB,              Qt::Key_MenuKB },
-	{ XF86XK_MenuPB,              Qt::Key_MenuPB },
-	{ XF86XK_MySites,             Qt::Key_MySites },
-	{ XF86XK_News,                Qt::Key_News },
-	{ XF86XK_OfficeHome,          Qt::Key_OfficeHome },
-	{ XF86XK_Option,              Qt::Key_Option },
-	{ XF86XK_Paste,               Qt::Key_Paste },
-	{ XF86XK_Phone,               Qt::Key_Phone },
-	{ XF86XK_Reply,               Qt::Key_Reply },
-	{ XF86XK_Reload,              Qt::Key_Reload },
-	{ XF86XK_RotateWindows,       Qt::Key_RotateWindows },
-	{ XF86XK_RotationPB,          Qt::Key_RotationPB },
-	{ XF86XK_RotationKB,          Qt::Key_RotationKB },
-	{ XF86XK_Save,                Qt::Key_Save },
-	{ XF86XK_Send,                Qt::Key_Send },
-	{ XF86XK_Spell,               Qt::Key_Spell },
-	{ XF86XK_SplitScreen,         Qt::Key_SplitScreen },
-	{ XF86XK_Support,             Qt::Key_Support },
-	{ XF86XK_TaskPane,            Qt::Key_TaskPane },
-	{ XF86XK_Terminal,            Qt::Key_Terminal },
-	{ XF86XK_Tools,               Qt::Key_Tools },
-	{ XF86XK_Travel,              Qt::Key_Travel },
-	{ XF86XK_Video,               Qt::Key_Video },
-	{ XF86XK_Word,                Qt::Key_Word },
-	{ XF86XK_Xfer,                Qt::Key_Xfer },
-	{ XF86XK_ZoomIn,              Qt::Key_ZoomIn },
-	{ XF86XK_ZoomOut,             Qt::Key_ZoomOut },
-	{ XF86XK_Away,                Qt::Key_Away },
-	{ XF86XK_Messenger,           Qt::Key_Messenger },
-	{ XF86XK_WebCam,              Qt::Key_WebCam },
-	{ XF86XK_MailForward,         Qt::Key_MailForward },
-	{ XF86XK_Pictures,            Qt::Key_Pictures },
-	{ XF86XK_Music,               Qt::Key_Music },
-	{ XF86XK_Battery,             Qt::Key_Battery },
-	{ XF86XK_Bluetooth,           Qt::Key_Bluetooth },
-	{ XF86XK_WLAN,                Qt::Key_WLAN },
-	{ XF86XK_UWB,                 Qt::Key_UWB },
-	{ XF86XK_AudioForward,        Qt::Key_AudioForward },
-	{ XF86XK_AudioRepeat,         Qt::Key_AudioRepeat },
-	{ XF86XK_AudioRandomPlay,     Qt::Key_AudioRandomPlay },
-	{ XF86XK_Subtitle,            Qt::Key_Subtitle },
-	{ XF86XK_AudioCycleTrack,     Qt::Key_AudioCycleTrack },
-	{ XF86XK_Time,                Qt::Key_Time },
-	{ XF86XK_Select,              Qt::Key_Select },
-	{ XF86XK_View,                Qt::Key_View },
-	{ XF86XK_TopMenu,             Qt::Key_TopMenu },
-	{ XF86XK_Bluetooth,           Qt::Key_Bluetooth },
-	{ XF86XK_Suspend,             Qt::Key_Suspend },
-	{ XF86XK_Hibernate,           Qt::Key_Hibernate },
-	{ XF86XK_Launch0,             Qt::Key_Launch2 },
-	{ XF86XK_Launch1,             Qt::Key_Launch3 },
-	{ XF86XK_Launch2,             Qt::Key_Launch4 },
-	{ XF86XK_Launch3,             Qt::Key_Launch5 },
-	{ XF86XK_Launch4,             Qt::Key_Launch6 },
-	{ XF86XK_Launch5,             Qt::Key_Launch7 },
-	{ XF86XK_Launch6,             Qt::Key_Launch8 },
-	{ XF86XK_Launch7,             Qt::Key_Launch9 },
-	{ XF86XK_Launch8,             Qt::Key_LaunchA },
-	{ XF86XK_Launch9,             Qt::Key_LaunchB },
-	{ XF86XK_LaunchA,             Qt::Key_LaunchC },
-	{ XF86XK_LaunchB,             Qt::Key_LaunchD },
-	{ XF86XK_LaunchC,             Qt::Key_LaunchE },
-	{ XF86XK_LaunchD,             Qt::Key_LaunchF },
-#endif
-
-	{ 0,                          0}
-};
-
-#endif
-
-
-int
-QtKeyToXKeySym(int qtKey) {
-
-	// TODO: Need to complete this function for all scenario.
-	int i;
-	int count = sizeof(QtKeyXSymMaps)/sizeof(KeySymMap);
-
-	if (qtKey < 0x1000) {
-		//return QChar(qtKey).toLower().unicode();
-		return qtKey;
-	}
-
-	for(i = 0; i < count; i++ ) {
-		if( QtKeyXSymMaps[i].QtKey == qtKey ) {
-			return QtKeyXSymMaps[i].XKeySym;
-		}
-	}
-
-        return 0;
-}
-
-
-int
-XKeySymToQTKey(uint keySym)
-{
-	int i;
-	int count = sizeof(QtKeyXSymMaps)/sizeof(KeySymMap);
-
-	if ((keySym < 0x1000)) {
-		//if (keySym >= 'a' && keySym <= 'z')
-		//	return QChar(keySym).toUpper().toAscii();
-		return keySym;
-	}
-
-#ifdef Q_WS_WIN
-        if(keySym < 0x3000)
-                return keySym;
-#else
-	if (keySym < 0x3000 )
-		return keySym | Qt::UNICODE_ACCEL;
-
-	for(i = 0; i < count; i++)
-		if(QtKeyXSymMaps[i].XKeySym == keySym)
-			return QtKeyXSymMaps[i].QtKey;
-#endif
-        return Qt::Key_unknown;
-}
-

=== removed file 'connection-glib/qt-keysym-map.h'
--- connection-glib/qt-keysym-map.h	2012-05-22 06:12:09 +0000
+++ connection-glib/qt-keysym-map.h	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#ifndef _QT_KEYSYM_MAP_H
-#define _QT_KEYSYM_MAP_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-int QtKeyToXKeySym(int qtKey);
-int XKeySymToQTKey(uint keySym);
-
-
-G_END_DECLS
-
-#endif //_QT_KEYSYM_MAP_H

=== modified file 'connection/.gitignore'
--- connection/.gitignore	2013-03-21 13:59:07 +0000
+++ connection/.gitignore	2013-06-27 13:54:25 +0000
@@ -1,8 +1,5 @@
 org.maliit.server.service
 minputmethodserver.service
-mdbusglibicconnectionserviceglue.h
-mdbusglibinputcontextadaptorglue.h
-maliit-connection.pc
 minputmethodcontext1interface_adaptor.cpp
 minputmethodcontext1interface_adaptor.h
 minputmethodcontext1interface_interface.cpp
@@ -11,5 +8,3 @@
 minputmethodserver1interface_adaptor.h
 minputmethodserver1interface_interface.cpp
 minputmethodserver1interface_interface.h
-maliitmarshalers.c
-maliitmarshalers.h

=== modified file 'connection/connection.pro'
--- connection/connection.pro	2013-03-21 13:59:07 +0000
+++ connection/connection.pro	2013-06-27 13:54:25 +0000
@@ -7,236 +7,67 @@
 TARGET = $$TOP_DIR/lib/$$MALIIT_CONNECTION_LIB
 
 include($$TOP_DIR/common/libmaliit-common.pri)
+include($$TOP_DIR/weston-protocols/libmaliit-weston-protocols.pri)
 
 DEFINES += MALIIT_INPUTCONTEXT_NAME=\\\"$${MALIIT_INPUTCONTEXT_NAME}\\\"
-CONFIG += link_pkgconfig
+CONFIG += staticlib
 
 # Interface classes
 PUBLIC_HEADERS += \
     connectionfactory.h \
-    mimserverconnection.h \
     minputcontextconnection.h \
 
 PUBLIC_SOURCES += \
     connectionfactory.cpp \
-    mimserverconnection.cpp \
     minputcontextconnection.cpp \
 
-# Default to building direct connection
-CONFIG += direct-connection
+# Default to building qdbus based connection
+CONFIG += qdbus-dbus-connection
 
-direct-connection {
+wayland {
+    QT += gui-private
     PUBLIC_SOURCES += \
-        miminputcontextdirectconnection.cpp \
-        mimdirectserverconnection.cpp \
-
+        waylandinputmethodconnection.cpp
     PUBLIC_HEADERS += \
-        miminputcontextdirectconnection.h \
-        mimdirectserverconnection.h \
-}
-
-# Default to building glib-dbus based connection
-disable-dbus {
-    DEFINES += MALIIT_DISABLE_DBUS
-} else {
-    enable-qdbus {
-        CONFIG += qdbus-dbus-connection
-    } else {
-        CONFIG += glib-dbus-connection
-    }
-}
-
-contains(QT_MAJOR_VERSION, 5) {
-    wayland {
-        load(wayland-scanner)
-        PUBLIC_SOURCES += \
-            minputcontextwestonimprotocolconnection.cpp
-        PUBLIC_HEADERS += \
-            minputcontextwestonimprotocolconnection.h
-        WAYLANDSOURCES += \
-            $$IN_PWD/input-method.xml \
-            $$IN_PWD/text.xml
-        PKGCONFIG += wayland-client
-    }
+        waylandinputmethodconnection.h
 }
 
 include($$TOP_DIR/dbus_interfaces/dbus_interfaces.pri)
 
 qdbus-dbus-connection {
-    INTERFACE_LIST += $$DBUS_SERVER_XML $$DBUS_CONTEXT_XML
-    SERVER_ADAPTOR_LIST += $$DBUS_SERVER_XML
-    IC_ADAPTOR_LIST += $$DBUS_CONTEXT_XML
+    server_adaptor.files = $$DBUS_SERVER_XML
+    server_adaptor.header_flags = -i dbusinputcontextconnection.h -l DBusInputContextConnection
+    server_adaptor.source_flags = -l DBusInputContextConnection
+
+    context_adaptor.files = $$DBUS_CONTEXT_XML
+    context_adaptor.header_flags = -i dbusserverconnection.h -l DBusServerConnection
+    context_adaptor.source_flags = -l DBusServerConnection
+
+    DBUS_ADAPTORS = server_adaptor context_adaptor
+    DBUS_INTERFACES = $$DBUS_SERVER_XML $$DBUS_CONTEXT_XML
+    QDBUSXML2CPP_INTERFACE_HEADER_FLAGS = -i maliit/namespace.h -i maliit/settingdata.h
+
+    QT += dbus
+
+    !enable-dbus-activation {
+        DEFINES += NO_DBUS_ACTIVATION
+    }
 
     PRIVATE_HEADERS += \
         dbuscustomarguments.h \
-        \ # input-context
+        dbusinputcontextconnection.h \
+        serverdbusaddress.h \
+        mimserverconnection.h \
         dbusserverconnection.h \
-        \ # server
-        dbusinputcontextconnection.h \
+        inputcontextdbusaddress.h \
 
     PRIVATE_SOURCES += \
         dbuscustomarguments.cpp \
-        \ # input-context
+        dbusinputcontextconnection.cpp \
+        serverdbusaddress.cpp \
+        mimserverconnection.cpp \
         dbusserverconnection.cpp \
-        \ # server
-        dbusinputcontextconnection.cpp \
-
-    qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp)
-
-    server_adaptor_header.commands = $$QMAKE_QDBUSXML2CPP -i dbusinputcontextconnection.h -l DBusInputContextConnection -a ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN}
-    server_adaptor_header.output_function = dbus_adaptor_header_output
-    server_adaptor_header.name = DBUSXML2CPP ADAPTOR HEADER ${QMAKE_FILE_IN}
-    server_adaptor_header.variable_out = DBUS_ADAPTOR_HEADERS
-    server_adaptor_header.input = SERVER_ADAPTOR_LIST
-
-    ic_adaptor_header.commands = $$QMAKE_QDBUSXML2CPP -i dbusserverconnection.h -l DBusServerConnection -a ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN}
-    ic_adaptor_header.output_function = dbus_adaptor_header_output
-    ic_adaptor_header.name = DBUSXML2CPP ADAPTOR HEADER ${QMAKE_FILE_IN}
-    ic_adaptor_header.variable_out = DBUS_ADAPTOR_HEADERS
-    ic_adaptor_header.input = IC_ADAPTOR_LIST
-
-    defineReplace(dbus_adaptor_header_output) {
-        return("$$lower($$section($$list($$basename(1)),.,-2,-2))_adaptor.h")
-    }
-
-    server_adaptor_source.commands = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h -l DBusInputContextConnection -a :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
-    server_adaptor_source.output_function = dbus_adaptor_source_output
-    server_adaptor_source.name = DBUSXML2CPP ADAPTOR SOURCE ${QMAKE_FILE_IN}
-    server_adaptor_source.variable_out = SOURCES
-    server_adaptor_source.input = SERVER_ADAPTOR_LIST
-
-    ic_adaptor_source.commands = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h -l DBusServerConnection -a :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
-    ic_adaptor_source.output_function = dbus_adaptor_source_output
-    ic_adaptor_source.name = DBUSXML2CPP ADAPTOR SOURCE ${QMAKE_FILE_IN}
-    ic_adaptor_source.variable_out = SOURCES
-    ic_adaptor_source.input = IC_ADAPTOR_LIST
-
-    adaptor_moc.commands = $$moc_header.commands
-    adaptor_moc.output = $$moc_header.output
-    adaptor_moc.depends = $$dbus_adaptor_header.output
-    adaptor_moc.input = DBUS_ADAPTOR_HEADERS
-    adaptor_moc.variable_out = GENERATED_SOURCES
-    adaptor_moc.name = $$moc_header.name
-
-    defineReplace(dbus_adaptor_source_output) {
-        return("$$lower($$section($$list($$basename(1)),.,-2,-2))_adaptor.cpp")
-    }
-
-    interface_header.commands = $$QMAKE_QDBUSXML2CPP -i maliit/namespace.h -i maliit/settingdata.h -p ${QMAKE_FILE_OUT}: ${QMAKE_FILE_IN}
-    interface_header.output_function = dbus_interface_header_output
-    interface_header.name = DBUSXML2CPP INTERFACE HEADER ${QMAKE_FILE_IN}
-    interface_header.variable_out = DBUS_INTERFACE_HEADERS
-    interface_header.input = INTERFACE_LIST
-
-    defineReplace(dbus_interface_header_output) {
-        return("$$lower($$section($$list($$basename(1)),.,-2,-2))_interface.h")
-    }
-
-    interface_source.commands = $$QMAKE_QDBUSXML2CPP -i ${QMAKE_FILE_OUT_BASE}.h -p :${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
-    interface_source.output_function = dbus_interface_source_output
-    interface_source.name = DBUSXML2CPP INTERFACE SOURCE ${QMAKE_FILE_IN}
-    interface_source.variable_out = SOURCES
-    interface_source.input = INTERFACE_LIST
-
-    interface_moc.commands = $$moc_header.commands
-    interface_moc.output = $$moc_header.output
-    interface_moc.depends = $$dbus_interface_header.output
-    interface_moc.input = DBUS_INTERFACE_HEADERS
-    interface_moc.variable_out = GENERATED_SOURCES
-    interface_moc.name = $$moc_header.name
-
-    defineReplace(dbus_interface_source_output) {
-        return("$$lower($$section($$list($$basename(1)),.,-2,-2))_interface.cpp")
-    }
-
-    QMAKE_EXTRA_COMPILERS += server_adaptor_header ic_adaptor_header server_adaptor_source ic_adaptor_source adaptor_moc interface_header interface_source interface_moc
-}
-
-glib-dbus-connection {
-    DEFINES += HAVE_GLIB_DBUS
-
-    PRIVATE_HEADERS += \
-        \ # common
-        variantmarshalling.h \
-        \ # input-context
-        glibdbusimserverproxy.h \
-        glibdbusimserverproxy_p.h \
-        mdbusglibinputcontextadaptor.h \
-        \ # server
-        minputcontextglibdbusconnection.h \
-
-    PRIVATE_SOURCES += \
-        \ # common
-        variantmarshalling.cpp \
-        \ # input-context
-        glibdbusimserverproxy.cpp \
-        mdbusglibinputcontextadaptor.cpp \
-        \ # server
-        minputcontextglibdbusconnection.cpp \
-
-    PKGCONFIG += dbus-glib-1
-
-    # Generate dbus glue for server side
-    QMAKE_EXTRA_TARGETS += dbus_glue_server
-    dbus_glue_server.target = $$OUT_PWD/mdbusglibicconnectionserviceglue.h
-    dbus_glue_server.commands = \
-        dbus-binding-tool --prefix=m_dbus_glib_ic_connection --mode=glib-server \
-            --output=$$OUT_PWD/mdbusglibicconnectionserviceglue.h $$DBUS_SERVER_XML
-    dbus_glue_server.output = $$OUT_PWD/mdbusglibicconnectionserviceglue.h
-    dbus_glue_server.depends = $$DBUS_SERVER_XML
-
-    # Use to work around the fact that qmake looks up the target for the generated header wrong
-    QMAKE_EXTRA_TARGETS += fake_dbus_glue_server
-    fake_dbus_glue_server.target = mdbusglibicconnectionserviceglue.h
-    fake_dbus_glue_server.depends = dbus_glue_server
-
-    # Generate dbus glue for input-context side
-    QMAKE_EXTRA_TARGETS += dbus_glue_inputcontext
-    dbus_glue_inputcontext.target = $$OUT_PWD/mdbusglibinputcontextadaptorglue.h
-    dbus_glue_inputcontext.commands = \
-        dbus-binding-tool --prefix=m_dbus_glib_input_context_adaptor --mode=glib-server \
-            --output=$$OUT_PWD/mdbusglibinputcontextadaptorglue.h $$DBUS_CONTEXT_XML
-    dbus_glue_inputcontext.output = $$OUT_PWD/mdbusglibinputcontextadaptorglue.h
-    dbus_glue_inputcontext.depends = $$DBUS_CONTEXT_XML
-
-    # Use to work around the fact that qmake looks up the target for the generated header wrong
-    QMAKE_EXTRA_TARGETS += fake_dbus_glue_inputcontext
-    fake_dbus_glue_inputcontext.target = mdbusglibinputcontextadaptorglue.h
-    fake_dbus_glue_inputcontext.depends = dbus_glue_inputcontext
-
-    GLIB_GENMARSHAL_LIST += maliitmarshalers.list
-
-    OTHER_FILES += maliitmarshalers.list
-
-    glib_genmarshal_header.name = glib-genmarshal header ${QMAKE_FILE_IN}
-    glib_genmarshal_header.commands = glib-genmarshal --prefix=_maliit_marshal --header --g-fatal-warnings ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-    glib_genmarshal_header.output = ${QMAKE_FILE_IN_BASE}.h
-    glib_genmarshal_header.variable_out = PRIVATE_HEADERS
-    glib_genmarshal_header.input = GLIB_GENMARSHAL_LIST
-
-    glib_genmarshal_source.name = glib-genmarshal source ${QMAKE_FILE_IN}
-    glib_genmarshal_source.commands = glib-genmarshal --prefix=_maliit_marshal --body --g-fatal-warnings ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-    glib_genmarshal_source.output = ${QMAKE_FILE_IN_BASE}.c
-    glib_genmarshal_source.variable_out = SOURCES
-    glib_genmarshal_source.input = GLIB_GENMARSHAL_LIST
-
-    QMAKE_EXTRA_COMPILERS += glib_genmarshal_header glib_genmarshal_source
-}
-
-qdbus-dbus-connection|glib-dbus-connection {
-    QT += dbus
-
-    !enable-dbus-activation {
-        DEFINES += NO_DBUS_ACTIVATION
-    }
-
-    PRIVATE_HEADERS += \
-        inputcontextdbusaddress.h \
-        serverdbusaddress.h \
-
-    PRIVATE_SOURCES += \
         inputcontextdbusaddress.cpp \
-        serverdbusaddress.cpp \
 
     # DBus activation
     enable-dbus-activation {
@@ -262,19 +93,4 @@
     $$PUBLIC_SOURCES \
     $$PRIVATE_SOURCES \
 
-target.path += $$LIBDIR
-
-public_headers.path += $$INCLUDEDIR/$$MALIIT_CONNECTION_HEADER
-public_headers.files += $$PUBLIC_HEADERS
-
-OTHER_FILES += maliit-connection.pc.in
-outputFiles(maliit-connection.pc)
-
-install_pkgconfig.path = $${LIBDIR}/pkgconfig
-install_pkgconfig.files = maliit-connection.pc
-
-INSTALLS += target \
-    public_headers \
-    install_pkgconfig \
-
 OTHER_FILES += libmaliit-connection.pri

=== modified file 'connection/connectionfactory.cpp'
--- connection/connectionfactory.cpp	2013-03-21 13:59:07 +0000
+++ connection/connectionfactory.cpp	2013-06-27 13:54:25 +0000
@@ -14,118 +14,35 @@
 
 #include "connectionfactory.h"
 
-#ifndef MALIIT_DISABLE_DBUS
-#ifdef HAVE_GLIB_DBUS
-#include "glibdbusimserverproxy.h"
-#include "minputcontextglibdbusconnection.h"
-#else
-#include "dbusserverconnection.h"
 #include "dbusinputcontextconnection.h"
-#endif
-#endif
-#include "mimdirectserverconnection.h"
 
 #ifdef HAVE_WAYLAND
-#include "minputcontextwestonimprotocolconnection.h"
+#include "waylandinputmethodconnection.h"
 #endif
 
 namespace Maliit {
-#ifndef MALIIT_DISABLE_DBUS
 namespace DBus {
 
-MImServerConnection *createServerConnectionWithDynamicAddress()
-{
-    const QSharedPointer<Maliit::InputContext::DBus::Address> address(new Maliit::InputContext::DBus::DynamicAddress);
-#ifdef HAVE_GLIB_DBUS
-    return new GlibDBusIMServerProxy(address);
-#else
-    return new DBusServerConnection(address);
-#endif
-}
-
-MImServerConnection *createServerConnectionWithFixedAddress(const QString &fixedAddress)
-{
-    const QSharedPointer<Maliit::InputContext::DBus::Address> address(new Maliit::InputContext::DBus::FixedAddress(fixedAddress));
-#ifdef HAVE_GLIB_DBUS
-    return new GlibDBusIMServerProxy(address);
-#else
-    return new DBusServerConnection(address);
-#endif
-}
-
 MInputContextConnection *createInputContextConnectionWithDynamicAddress()
 {
-#ifdef HAVE_GLIB_DBUS
-    std::tr1::shared_ptr<Maliit::Server::DBus::Address> address(new Maliit::Server::DBus::DynamicAddress);
-    return new MInputContextGlibDBusConnection(address, false);
-#else
     QSharedPointer<Maliit::Server::DBus::Address> address(new Maliit::Server::DBus::DynamicAddress);
     return new DBusInputContextConnection(address);
-#endif
 }
 
 MInputContextConnection *createInputContextConnectionWithFixedAddress(const QString &fixedAddress, bool allowAnonymous)
 {
-#ifdef HAVE_GLIB_DBUS
-    std::tr1::shared_ptr<Maliit::Server::DBus::Address> address(new Maliit::Server::DBus::FixedAddress(fixedAddress));
-    return new MInputContextGlibDBusConnection(address, allowAnonymous);
-#else
     Q_UNUSED(allowAnonymous);
     QSharedPointer<Maliit::Server::DBus::Address> address(new Maliit::Server::DBus::FixedAddress(fixedAddress));
     return new DBusInputContextConnection(address);
-#endif
 }
 
 } // namespace DBus
-#endif // MALIIT_DISABLE_DBUS
 
 #ifdef HAVE_WAYLAND
 MInputContextConnection *createWestonIMProtocolConnection()
 {
-    return new MInputContextWestonIMProtocolConnection;
-}
-#endif
-
-QSharedPointer<MImServerConnection> createServerConnection(const QString &connectionType)
-{
-    typedef QSharedPointer<MImServerConnection> ConnectionPtr;
-    static QWeakPointer<MImServerConnection> cached_connection;
-
-    if (ConnectionPtr connection = cached_connection.toStrongRef()) {
-        return connection;
-    }
-
-    if (connectionType.isEmpty()) {
-        qCritical() << "Empty connection type name. Refusing to connect to Maliit server."
-                    << "\nHave you checked the environment variables for loading input method"
-                    << "modules ([QT|GTK]_IM_MODULE)?";
-        return ConnectionPtr();
-    }
-
-    if (connectionType == MALIIT_INPUTCONTEXT_NAME) {
-#ifndef MALIIT_DISABLE_DBUS
-        const QByteArray overriddenAddress = qgetenv("MALIIT_SERVER_ADDRESS");
-        ConnectionPtr connection = ConnectionPtr(overriddenAddress.isEmpty()
-                                                 ? Maliit::DBus::createServerConnectionWithDynamicAddress()
-                                                 : Maliit::DBus::createServerConnectionWithFixedAddress(overriddenAddress));
-        cached_connection = connection;
-
-        return connection;
-#else
-        qCritical("This connection type to Maliit server is not available since DBus support is disabled");
-#endif
-    } else if (connectionType == MALIIT_INPUTCONTEXT_NAME"Direct") {
-        ConnectionPtr connection(new MImDirectServerConnection);
-
-        cached_connection = connection;
-
-        return connection;
-    } else {
-        qCritical() << __PRETTY_FUNCTION__
-                    << "Invalid connection type (" + connectionType + "),"
-                    << "unable to create connection to Maliit server";
-        return ConnectionPtr();
-    }
-}
+    return new WaylandInputMethodConnection;
+}
+#endif
 
 } // namespace Maliit

=== modified file 'connection/connectionfactory.h'
--- connection/connectionfactory.h	2013-03-21 13:59:07 +0000
+++ connection/connectionfactory.h	2013-06-27 13:54:25 +0000
@@ -15,37 +15,20 @@
 #ifndef MALIIT_DBUS_CONNECTIONFACTORY_H
 #define MALIIT_DBUS_CONNECTIONFACTORY_H
 
-#include "mimserverconnection.h"
 #include "minputcontextconnection.h"
 
 namespace Maliit {
-#ifndef MALIIT_DISABLE_DBUS
 namespace DBus {
 
-MImServerConnection *createServerConnectionWithDynamicAddress();
-MImServerConnection *createServerConnectionWithFixedAddress(const QString &address);
-
 MInputContextConnection *createInputContextConnectionWithDynamicAddress();
 MInputContextConnection *createInputContextConnectionWithFixedAddress(const QString &fixedAddress, bool allowAnonymous);
 
 } // namespace DBus
-#endif
 
 #ifdef HAVE_WAYLAND
 MInputContextConnection *createWestonIMProtocolConnection();
 #endif
 
-/*!
-    \brief Create a connection to Maliit server
-    \param connectionType input context name (same as in QT_IM_MODULE environment variable)
-
-    Might return a cached connection.
-
-    If \a connectionType is "Maliit", and MALIIT_SERVER_ADDRESS environment variable is set,
-    uses its value as the server address.
-*/
-QSharedPointer<MImServerConnection> createServerConnection(const QString &connectionType);
-
 } // namespace Maliit
 
 #endif // MALIIT_DBUS_CONNECTIONFACTORY_H

=== modified file 'connection/dbuscustomarguments.cpp'
--- connection/dbuscustomarguments.cpp	2012-07-10 09:00:33 +0000
+++ connection/dbuscustomarguments.cpp	2013-06-27 13:54:25 +0000
@@ -85,3 +85,29 @@
 
     return argument;
 }
+
+QDBusArgument &operator<<(QDBusArgument &arg, const Maliit::PreeditTextFormat &format)
+{
+    arg.beginStructure();
+    arg << format.start
+        << format.length
+        << static_cast<int>(format.preeditFace);
+    arg.endStructure();
+
+    return arg;
+}
+
+const QDBusArgument &operator>>(const QDBusArgument &arg, Maliit::PreeditTextFormat &format)
+{
+    int preedit_face(0);
+
+    arg.beginStructure();
+    arg >> format.start
+        >> format.length
+        >> preedit_face;
+    arg.endStructure();
+    format.preeditFace = static_cast<Maliit::PreeditFace> (preedit_face);
+
+    return arg;
+}
+

=== modified file 'connection/dbuscustomarguments.h'
--- connection/dbuscustomarguments.h	2012-07-10 09:00:33 +0000
+++ connection/dbuscustomarguments.h	2013-06-27 13:54:25 +0000
@@ -19,6 +19,8 @@
 class QDBusArgument;
 class QVariant;
 
+#include <maliit/namespace.h>
+
 
 // MImPluginSettingsEntry marshalling
 QDBusArgument &operator<<(QDBusArgument &argument, const MImPluginSettingsEntry &entry);
@@ -28,4 +30,7 @@
 QDBusArgument &operator<<(QDBusArgument &argument, const MImPluginSettingsInfo &info);
 const QDBusArgument &operator>>(const QDBusArgument &argument, MImPluginSettingsInfo &info);
 
+QDBusArgument &operator<<(QDBusArgument &arg, const Maliit::PreeditTextFormat &format);
+const QDBusArgument &operator>>(const QDBusArgument &arg, Maliit::PreeditTextFormat &format);
+
 #endif // DBUSCUSTOMARGUMENTS_H

=== modified file 'connection/dbusinputcontextconnection.cpp'
--- connection/dbusinputcontextconnection.cpp	2012-08-06 12:48:36 +0000
+++ connection/dbusinputcontextconnection.cpp	2013-06-27 13:54:25 +0000
@@ -26,15 +26,17 @@
 
 namespace
 {
-    const char * const DBusPath = "/com/meego/inputmethod/uiserver1";
-    const char * const DBusInterface = "com.meego.inputmethod.uiserver1";
-
-    const char * const DBusClientPath = "/com/meego/inputmethod/inputcontext";
-    const char * const DBusClientInterface = "com.meego.inputmethod.inputcontext1";
-
-    const char * const DBusLocalPath("/org/freedesktop/DBus/Local");
-    const char * const DBusLocalInterface("org.freedesktop.DBus.Local");
-    const char * const DisconnectedSignal("Disconnected");
+
+const char * const DBusPath = "/com/meego/inputmethod/uiserver1";
+const char * const DBusInterface = "com.meego.inputmethod.uiserver1";
+
+const char * const DBusClientPath = "/com/meego/inputmethod/inputcontext";
+const char * const DBusClientInterface = "com.meego.inputmethod.inputcontext1";
+
+const char * const DBusLocalPath("/org/freedesktop/DBus/Local");
+const char * const DBusLocalInterface("org.freedesktop.DBus.Local");
+const char * const DisconnectedSignal("Disconnected");
+
 }
 
 DBusInputContextConnection::DBusInputContextConnection(const QSharedPointer<Maliit::Server::DBus::Address> &address)
@@ -50,6 +52,8 @@
     qDBusRegisterMetaType<MImPluginSettingsEntry>();
     qDBusRegisterMetaType<MImPluginSettingsInfo>();
     qDBusRegisterMetaType<QList<MImPluginSettingsInfo> >();
+    qDBusRegisterMetaType<Maliit::PreeditTextFormat>();
+    qDBusRegisterMetaType<QList<Maliit::PreeditTextFormat> >();
 
     new Uiserver1Adaptor(this);
 }
@@ -89,6 +93,7 @@
     ComMeegoInputmethodInputcontext1Interface *proxy = mProxys.take(connectionNumber);
     mConnections.remove(connectionNumber);
     delete proxy;
+    handleDisconnection(connectionNumber);
 }
 
 void
@@ -249,6 +254,7 @@
 void
 DBusInputContextConnection::updateInputMethodArea(const QRegion &region)
 {
+    qDebug() << "Updating input method area to" << region;
     ComMeegoInputmethodInputcontext1Interface *proxy = mProxys.value(activeConnection);
     if (proxy) {
         QRect rect = region.boundingRect();

=== modified file 'connection/dbusserverconnection.cpp'
--- connection/dbusserverconnection.cpp	2012-08-06 12:48:36 +0000
+++ connection/dbusserverconnection.cpp	2013-06-27 13:54:25 +0000
@@ -14,6 +14,7 @@
 
 #include "dbusserverconnection.h"
 
+#include <maliit/namespace.h>
 #include <maliit/settingdata.h>
 
 #include "minputmethodcontext1interface_adaptor.h"
@@ -41,13 +42,15 @@
   , mActive(true)
   , pendingResetCalls()
 {
-    new Inputcontext1Adaptor(this);
-
     qDBusRegisterMetaType<MImPluginSettingsEntry>();
     qDBusRegisterMetaType<MImPluginSettingsInfo>();
     qDBusRegisterMetaType<QList<MImPluginSettingsInfo> >();
-
-    connect(mAddress.data(), SIGNAL(addressRecieved(QString)),
+    qDBusRegisterMetaType<Maliit::PreeditTextFormat>();
+    qDBusRegisterMetaType<QList<Maliit::PreeditTextFormat> >();
+
+    new Inputcontext1Adaptor(this);
+
+    connect(mAddress.data(), SIGNAL(addressReceived(QString)),
             this, SLOT(openDBusConnection(QString)));
     connect(mAddress.data(), SIGNAL(addressFetchError(QString)),
             this, SLOT(connectToDBusFailed(QString)));
@@ -90,8 +93,9 @@
 
     connection.registerObject(QString::fromLatin1(InputContextAdaptorPath), this);
 
+#if 0
     connect(mProxy, SIGNAL(invokeAction(QString,QKeySequence)), this, SIGNAL(invokeAction(QString,QKeySequence)));
-
+#endif
     Q_EMIT connected();
 }
 
@@ -151,7 +155,8 @@
     if (!mProxy)
         return;
 
-    mProxy->mouseClickedOnPreedit(pos.x(), pos.y(), preeditRect.x(), preeditRect.y(), preeditRect.width(), preeditRect.height());
+    mProxy->mouseClickedOnPreedit(pos.x(), pos.y(), preeditRect.x(), preeditRect.y(),
+                                  preeditRect.width(), preeditRect.height());
 }
 
 void DBusServerConnection::setPreedit(const QString &text, int cursorPos)
@@ -162,8 +167,7 @@
     mProxy->setPreedit(text, cursorPos);
 }
 
-void DBusServerConnection::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
-                                                   bool focusChanged)
+void DBusServerConnection::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation, bool focusChanged)
 {
     if (!mProxy)
         return;
@@ -259,12 +263,14 @@
     pluginSettingsReceived(info);
 }
 
-void DBusServerConnection::keyEvent(int type, int key, int modifiers, const QString &text, bool autoRepeat, int count, uchar requestType)
+void DBusServerConnection::keyEvent(int type, int key, int modifiers, const QString &text, bool autoRepeat,
+                                    int count, uchar requestType)
 {
     keyEvent(type, key, modifiers, text, autoRepeat, count, static_cast<Maliit::EventRequestType>(requestType));
 }
 
-void DBusServerConnection::notifyExtendedAttributeChanged(int id, const QString &target, const QString &targetItem, const QString &attribute, const QDBusVariant &value)
+void DBusServerConnection::notifyExtendedAttributeChanged(int id, const QString &target, const QString &targetItem,
+                                                          const QString &attribute, const QDBusVariant &value)
 {
     extendedAttributeChanged(id, target, targetItem, attribute, value.variant());
 }

=== modified file 'connection/dbusserverconnection.h'
--- connection/dbusserverconnection.h	2012-07-10 09:00:33 +0000
+++ connection/dbusserverconnection.h	2013-06-27 13:54:25 +0000
@@ -40,19 +40,19 @@
     virtual void mouseClickedOnPreedit(const QPoint &pos, const QRect &preeditRect);
     virtual void setPreedit(const QString &text, int cursorPos);
     virtual void updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
-                                 bool focusChanged);
+                                         bool focusChanged);
     virtual void reset(bool requireSynchronization);
     virtual void appOrientationAboutToChange(int angle);
     virtual void appOrientationChanged(int angle);
     virtual void setCopyPasteState(bool copyAvailable, bool pasteAvailable);
     virtual void processKeyEvent(QEvent::Type keyType, Qt::Key keyCode,
-                         Qt::KeyboardModifiers modifiers,
-                         const QString &text, bool autoRepeat, int count,
-                         quint32 nativeScanCode, quint32 nativeModifiers, unsigned long time);
+                                 Qt::KeyboardModifiers modifiers,
+                                 const QString &text, bool autoRepeat, int count,
+                                 quint32 nativeScanCode, quint32 nativeModifiers, unsigned long time);
     virtual void registerAttributeExtension(int id, const QString &fileName);
     virtual void unregisterAttributeExtension(int id);
     virtual void setExtendedAttribute(int id, const QString &target, const QString &targetItem,
-                              const QString &attribute, const QVariant &value);
+                                      const QString &attribute, const QVariant &value);
     virtual void loadPluginSettings(const QString &descriptionLanguage);
     //! reimpl end
 

=== removed file 'connection/glibdbusimserverproxy.cpp'
--- connection/glibdbusimserverproxy.cpp	2013-01-30 19:57:49 +0000
+++ connection/glibdbusimserverproxy.cpp	1970-01-01 00:00:00 +0000
@@ -1,461 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#include "glibdbusimserverproxy.h"
-#include "mdbusglibinputcontextadaptor.h"
-#include "inputcontextdbusaddress.h"
-#include "maliitmarshalers.h"
-#include <variantmarshalling.h>
-
-#include "glibdbusimserverproxy_p.h"
-
-#include <QPoint>
-#include <QRect>
-#include <QString>
-#include <QDataStream>
-#include <QVariant>
-#include <QTimer>
-#include <QDateTime>
-#include <QDebug>
-#include <QKeySequence>
-
-#include <unistd.h>
-#include <sys/types.h>
-
-#include <dbus/dbus.h>
-
-namespace
-{
-    const char * const DBusPath("/com/meego/inputmethod/uiserver1");
-    const char * const DBusInterface("com.meego.inputmethod.uiserver1");
-    const int ConnectionRetryInterval(6*1000); // in ms
-    const QString icAdaptorPath("/com/meego/inputmethod/inputcontext");
-
-    Maliit::DBusGLib::ConnectionRef toRef(DBusGConnection *connection)
-    {
-        if (!connection)
-            return Maliit::DBusGLib::ConnectionRef();
-
-        return Maliit::DBusGLib::ConnectionRef(connection,
-                                               dbus_g_connection_unref);
-    }
-
-    static bool debugEnabled()
-    {
-        static bool enabled = false;
-        static bool initialized = false;
-
-        if (initialized) {
-            return enabled;
-        }
-
-        QByteArray debugEnvVar = qgetenv("MIC_ENABLE_DEBUG");
-        if (!debugEnvVar.isEmpty() && debugEnvVar != "false") {
-            enabled = true;
-        }
-
-        initialized = true;
-        return enabled;
-    }
-
-    void resetNotifyTrampoline(DBusGProxy *proxy, DBusGProxyCall *callId, gpointer userData)
-    {
-        static_cast<GlibDBusIMServerProxyPrivate *>(userData)->resetNotify(proxy, callId);
-    }
-}
-
-GlibDBusIMServerProxyPrivate::GlibDBusIMServerProxyPrivate(const QSharedPointer<Maliit::InputContext::DBus::Address> &address)
-    : glibObjectProxy(NULL),
-      connection(),
-      active(true),
-      mAddress(address)
-{
-    g_type_init();
-}
-
-GlibDBusIMServerProxyPrivate::~GlibDBusIMServerProxyPrivate()
-{}
-
-void GlibDBusIMServerProxyPrivate::resetNotify(DBusGProxy *proxy, DBusGProxyCall *callId)
-{
-    if (debugEnabled()) qDebug() << "MInputContext" << __PRETTY_FUNCTION__;
-
-    dbus_g_proxy_end_call(proxy, callId, 0, G_TYPE_INVALID);
-    pendingResetCalls.remove(callId);
-}
-
-
-void GlibDBusIMServerProxy::onDisconnectionTrampoline(void */*proxy*/, void *userData)
-{
-    if (debugEnabled()) qDebug() << "MInputContext" << __PRETTY_FUNCTION__;
-    static_cast<GlibDBusIMServerProxy *>(userData)->onDisconnection();
-}
-
-void GlibDBusIMServerProxy::onInvokeActionTrampoline(void *proxy, const char *action, const char *sequence, void *userData)
-{
-    Q_UNUSED(proxy);
-    if (debugEnabled()) qDebug() << "MInputContext" << __PRETTY_FUNCTION__;
-    static_cast<GlibDBusIMServerProxy *>(userData)->onInvokeAction(QString::fromUtf8(action),
-                                                                   QString::fromUtf8(sequence));
-}
-
-GlibDBusIMServerProxy::GlibDBusIMServerProxy(const QSharedPointer<Maliit::InputContext::DBus::Address> &address, QObject *parent)
-    : MImServerConnection(parent),
-      d_ptr(new GlibDBusIMServerProxyPrivate(address))
-{
-    Q_UNUSED(parent);
-    Q_D(GlibDBusIMServerProxy);
-
-    MDBusGlibInputContextAdaptor *adaptor = M_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR(
-            g_object_new(M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR, NULL));
-    adaptor->imServerConnection = this;
-
-    d->inputContextAdaptor = G_OBJECT(adaptor);
-
-    connect(d->mAddress.data(), SIGNAL(addressRecieved(QString)),
-            this, SLOT(openDBusConnection(QString)));
-    connect(d->mAddress.data(), SIGNAL(addressFetchError(QString)),
-            this, SLOT(connectToDBusFailed(QString)));
-
-    dbus_g_thread_init();
-
-    QTimer::singleShot(0, this, SLOT(connectToDBus()));
-}
-
-GlibDBusIMServerProxy::~GlibDBusIMServerProxy()
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    d->active = false;
-
-    Q_FOREACH (DBusGProxyCall *callId, d->pendingResetCalls) {
-        dbus_g_proxy_cancel_call(d->glibObjectProxy, callId);
-    }
-}
-
-
-// Auxiliary connection handling.............................................
-
-void GlibDBusIMServerProxy::connectToDBus()
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (debugEnabled()) qDebug() << "MInputContext" << __PRETTY_FUNCTION__;
-
-    d->mAddress->get();
-}
-
-void GlibDBusIMServerProxy::openDBusConnection(const QString &addressString)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (debugEnabled()) qDebug() << "MInputContext" << __PRETTY_FUNCTION__ << "Address:" << addressString;
-
-    if (addressString.isEmpty()) {
-        QTimer::singleShot(ConnectionRetryInterval, this, SLOT(connectToDBus()));
-        return;
-    }
-
-    DBusError error;
-    dbus_error_init(&error);
-
-    // Input contexts should not share the connection to the maliit server with
-    // each other (even not when they are in the same application). Therefore,
-    // use private connection for IC to server connection.
-    DBusConnection *dbusConnection = dbus_connection_open_private(addressString.toLatin1().data(), &error);
-    if (!dbusConnection) {
-        qWarning("MInputContext: unable to create D-Bus connection: %s", error.message);
-        dbus_error_free(&error);
-        QTimer::singleShot(ConnectionRetryInterval, this, SLOT(connectToDBus()));
-        return;
-    }
-
-    dbus_connection_setup_with_g_main(dbusConnection, 0);
-    d->connection = toRef(dbus_connection_get_g_connection(dbusConnection));
-
-    d->glibObjectProxy = dbus_g_proxy_new_for_peer(d->connection.get(), DBusPath, DBusInterface);
-    if (!d->glibObjectProxy) {
-        qWarning("MInputContext: unable to find the D-Bus service.");
-        d->connection.reset();
-        QTimer::singleShot(ConnectionRetryInterval, this, SLOT(connectToDBus()));
-        return;
-    }
-    g_signal_connect(G_OBJECT(d->glibObjectProxy), "destroy", G_CALLBACK(onDisconnectionTrampoline),
-                     this);
-    dbus_g_object_register_marshaller(_maliit_marshal_VOID__STRING_STRING, G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_add_signal(d->glibObjectProxy, "invokeAction", G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-    dbus_g_proxy_connect_signal(d->glibObjectProxy, "invokeAction", G_CALLBACK(onInvokeActionTrampoline), this, 0);
-
-    dbus_g_connection_register_g_object(d->connection.get(), icAdaptorPath.toLatin1().data(), d->inputContextAdaptor);
-
-    Q_EMIT connected();
-}
-
-void GlibDBusIMServerProxy::connectToDBusFailed(const QString &errorMessage)
-{
-    if (debugEnabled()) qDebug() << "MInputContext" << __PRETTY_FUNCTION__ << errorMessage;
-
-    QTimer::singleShot(ConnectionRetryInterval, this, SLOT(connectToDBus()));
-}
-
-void GlibDBusIMServerProxy::onDisconnection()
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (debugEnabled()) qDebug() << "MInputContext" << __PRETTY_FUNCTION__;
-
-    d->glibObjectProxy = 0;
-    d->connection.reset();
-    Q_EMIT disconnected();
-
-    if (d->active) {
-        QTimer::singleShot(ConnectionRetryInterval, this, SLOT(connectToDBus()));
-    }
-}
-
-void GlibDBusIMServerProxy::onInvokeAction(const QString &action,
-                                           const QString &sequence)
-{
-    Q_EMIT invokeAction(action, QKeySequence::fromString(sequence));
-}
-
-// Remote methods............................................................
-
-void GlibDBusIMServerProxy::activateContext()
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "activateContext",
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::showInputMethod()
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "showInputMethod",
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::hideInputMethod()
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "hideInputMethod",
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::mouseClickedOnPreedit(const QPoint &pos, const QRect &preeditRect)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "mouseClickedOnPreedit",
-                               G_TYPE_INT, pos.x(),
-                               G_TYPE_INT, pos.y(),
-                               G_TYPE_INT, preeditRect.x(),
-                               G_TYPE_INT, preeditRect.y(),
-                               G_TYPE_INT, preeditRect.width(),
-                               G_TYPE_INT, preeditRect.height(),
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::setPreedit(const QString &text, int cursorPos)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "setPreedit",
-                               G_TYPE_STRING, text.toUtf8().data(),
-                               G_TYPE_INT, cursorPos,
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
-                                                    bool focusChanged)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    GHashTable *encodedState = encodeVariantMap(stateInformation);
-    if (encodedState == 0)
-        return;
-
-    GType encodedStateType = dbus_g_type_get_map("GHashTable", G_TYPE_STRING, G_TYPE_VALUE);
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "updateWidgetInformation",
-                               encodedStateType, encodedState,
-                               G_TYPE_BOOLEAN, focusChanged,
-                               G_TYPE_INVALID);
-    g_hash_table_unref(encodedState);
-}
-
-void GlibDBusIMServerProxy::reset(bool requireSynchronization)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-
-    if (requireSynchronization) {
-        DBusGProxyCall *resetCall = dbus_g_proxy_begin_call(d->glibObjectProxy, "reset",
-                                                            resetNotifyTrampoline, d,
-                                                            0, G_TYPE_INVALID);
-        d->pendingResetCalls.insert(resetCall);
-    } else {
-        dbus_g_proxy_call_no_reply(d->glibObjectProxy, "reset",
-                                   G_TYPE_INVALID);
-    }
-}
-
-bool GlibDBusIMServerProxy::pendingResets()
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    return (d->pendingResetCalls.size() > 0);
-}
-
-void GlibDBusIMServerProxy::appOrientationAboutToChange(int angle)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "appOrientationAboutToChange",
-                               G_TYPE_INT, angle,
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::appOrientationChanged(int angle)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "appOrientationChanged",
-                               G_TYPE_INT, angle,
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::setCopyPasteState(bool copyAvailable, bool pasteAvailable)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "setCopyPasteState",
-                               G_TYPE_BOOLEAN, copyAvailable,
-                               G_TYPE_BOOLEAN, pasteAvailable,
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::processKeyEvent(QEvent::Type keyType, Qt::Key keyCode,
-                                            Qt::KeyboardModifiers modifiers,
-                                            const QString &text, bool autoRepeat, int count,
-                                            quint32 nativeScanCode, quint32 nativeModifiers,
-                                            unsigned long time)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "processKeyEvent",
-                               G_TYPE_INT, static_cast<int>(keyType),
-                               G_TYPE_INT, static_cast<int>(keyCode),
-                               G_TYPE_INT, static_cast<int>(modifiers),
-                               G_TYPE_STRING, text.toUtf8().data(),
-                               G_TYPE_BOOLEAN, autoRepeat, G_TYPE_INT, count,
-                               G_TYPE_UINT, nativeScanCode, G_TYPE_UINT, nativeModifiers,
-                               G_TYPE_ULONG, time,
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::registerAttributeExtension(int id, const QString &fileName)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "registerAttributeExtension",
-                               G_TYPE_INT, id,
-                               G_TYPE_STRING, fileName.toUtf8().data(),
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::unregisterAttributeExtension(int id)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "unregisterAttributeExtension",
-                               G_TYPE_INT, id,
-                               G_TYPE_INVALID);
-}
-
-void GlibDBusIMServerProxy::setExtendedAttribute(int id, const QString &target, const QString &targetItem,
-                                                 const QString &attribute, const QVariant &value)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    GValue valueData = {0, {{0}, {0}}};
-    if (!encodeVariant(&valueData, value)) {
-        return;
-    }
-
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "setExtendedAttribute",
-                               G_TYPE_INT, id,
-                               G_TYPE_STRING, target.toUtf8().data(),
-                               G_TYPE_STRING, targetItem.toUtf8().data(),
-                               G_TYPE_STRING, attribute.toUtf8().data(),
-                               G_TYPE_VALUE, &valueData,
-                               G_TYPE_INVALID);
-    g_value_unset(&valueData);
-}
-
-void GlibDBusIMServerProxy::loadPluginSettings(const QString &descriptionLanguage)
-{
-    Q_D(GlibDBusIMServerProxy);
-
-    if (!d->glibObjectProxy) {
-        return;
-    }
-    dbus_g_proxy_call_no_reply(d->glibObjectProxy, "loadPluginSettings",
-                               G_TYPE_STRING, descriptionLanguage.toUtf8().data(),
-                               G_TYPE_INVALID);
-}

=== removed file 'connection/glibdbusimserverproxy.h'
--- connection/glibdbusimserverproxy.h	2012-08-06 12:48:36 +0000
+++ connection/glibdbusimserverproxy.h	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#ifndef GLIBDBUSIMSERVERPROXY_H
-#define GLIBDBUSIMSERVERPROXY_H
-
-#include <QObject>
-#include <QEvent>
-#include <Qt>
-#include <QMap>
-
-#include "mimserverconnection.h"
-#include "inputcontextdbusaddress.h"
-
-#include <QSharedPointer>
-
-class GlibDBusIMServerProxyPrivate;
-
-class QDBusError;
-class QDBusVariant;
-
-/* \brief Glib D-Bus implementation of a connection with the input method server.
- *
- * The input context is exposed over DBus so that the input method server can communicate with it,
- * and methods can be called to communicate with the input method server.
- */
-
-// TODO: rename to MImGlibDBusServerConnection, or similar
-class GlibDBusIMServerProxy: public MImServerConnection
-{
-    Q_OBJECT
-
-public:
-    GlibDBusIMServerProxy(const QSharedPointer<Maliit::InputContext::DBus::Address> &address, QObject *parent = 0);
-    virtual ~GlibDBusIMServerProxy();
-
-    //! reimpl
-    virtual bool pendingResets();
-
-    /* Outbound communication */
-    virtual void activateContext();
-
-    virtual void showInputMethod();
-
-    virtual void hideInputMethod();
-
-    virtual void mouseClickedOnPreedit(const QPoint &pos, const QRect &preeditRect);
-
-    virtual void setPreedit(const QString &text, int cursorPos);
-
-    virtual void updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
-                                 bool focusChanged);
-
-    virtual void reset(bool requireSynchronization);
-
-    virtual void appOrientationAboutToChange(int angle);
-
-    virtual void appOrientationChanged(int angle);
-
-    virtual void setCopyPasteState(bool copyAvailable, bool pasteAvailable);
-
-    virtual void processKeyEvent(QEvent::Type keyType, Qt::Key keyCode,
-                         Qt::KeyboardModifiers modifiers,
-                         const QString &text, bool autoRepeat, int count,
-                         quint32 nativeScanCode, quint32 nativeModifiers, unsigned long time);
-
-    virtual void registerAttributeExtension(int id, const QString &fileName);
-
-    virtual void unregisterAttributeExtension(int id);
-
-    virtual void setExtendedAttribute(int id, const QString &target, const QString &targetItem,
-                              const QString &attribute, const QVariant &value);
-
-    virtual void loadPluginSettings(const QString &descriptionLanguage);
-    //! reimpl end
-
-    void onInvokeAction(const QString &action, const QString &sequence);
-
-private Q_SLOTS:
-    void connectToDBus();
-    void openDBusConnection(const QString &addressString);
-    void connectToDBusFailed(const QString &errorMessage);
-
-private:
-    void onDisconnection();
-    static void onDisconnectionTrampoline(void *proxy, void* userData);
-    static void onInvokeActionTrampoline(void *proxy, const char *action, const char *sequence, void* userData);
-
-    const QScopedPointer<GlibDBusIMServerProxyPrivate> d_ptr;
-    Q_DECLARE_PRIVATE(GlibDBusIMServerProxy)
-};
-
-#endif

=== removed file 'connection/glibdbusimserverproxy_p.h'
--- connection/glibdbusimserverproxy_p.h	2012-07-10 09:00:33 +0000
+++ connection/glibdbusimserverproxy_p.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#ifndef GLIBDBUSIMSERVERPROXY_P_H
-#define GLIBDBUSIMSERVERPROXY_P_H
-
-#include <QSet>
-#include <QSharedPointer>
-#include <dbus/dbus-glib.h>
-
-#include <tr1/memory>
-
-#include "inputcontextdbusaddress.h"
-
-namespace Maliit
-{
-    namespace DBusGLib
-    {
-    // std::tr1::shared_ptr allows to specify a deleter. Hiding it behind a typedef,
-    // as we do not really need all the shared pointer semantics here.
-    typedef std::tr1::shared_ptr<DBusGConnection> ConnectionRef;
-    }
-}
-
-class GlibDBusIMServerProxyPrivate
-{
-
-public:
-    GlibDBusIMServerProxyPrivate(const QSharedPointer<Maliit::InputContext::DBus::Address> &address);
-    ~GlibDBusIMServerProxyPrivate();
-
-public:
-    void resetNotify(DBusGProxy *proxy, DBusGProxyCall *callId);
-
-public:
-    DBusGProxy *glibObjectProxy;
-    Maliit::DBusGLib::ConnectionRef connection;
-    GObject *inputContextAdaptor;
-    bool active;
-    QSet<DBusGProxyCall *> pendingResetCalls;
-    const QSharedPointer<Maliit::InputContext::DBus::Address> mAddress;
-};
-
-
-
-#endif // GLIBDBUSIMSERVERPROXY_P_H

=== removed file 'connection/input-method.xml'
--- connection/input-method.xml	2013-03-21 13:59:07 +0000
+++ connection/input-method.xml	1970-01-01 00:00:00 +0000
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="input_method">
-  <copyright>
-    Copyright © 2012 Intel Corporation
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-
-  <interface name="input_method_context" version="1">
-    <description summary="input method context">
-      Corresponds to a text model on input method side. An input method context
-      is created on text mode activation on the input method side. It allows to
-      receive information about the text model from the application via events.
-      Input method contexts do not keep state after deactivation and should be
-      destroyed after deactivation is handled.
-    </description>
-    <request name="destroy" type="destructor"/>
-    <request name="commit_string">
-      <description summary="commit string">
-        Send the commit string text to the applications text model.
-      </description>
-      <arg name="serial" type="uint"/>
-      <arg name="text" type="string"/>
-      <arg name="index" type="uint"/>
-    </request>
-    <request name="preedit_string">
-      <description summary="pre-edit string">
-        Send the pre-edit string text to the applications text model.
-      </description>
-      <arg name="serial" type="uint"/>
-      <arg name="text" type="string"/>
-      <arg name="commit" type="string"/>
-    </request>
-    <request name="preedit_styling">
-      <arg name="serial" type="uint"/>
-      <arg name="index" type="uint"/>
-      <arg name="length" type="uint"/>
-      <arg name="style" type="uint"/>
-    </request>
-    <request name="preedit_cursor">
-      <description summary="pre-edit cursor">
-        Sets the cursor position inside the composing text (as byte index)
-        relative to the start of the composing text.
-      </description>
-      <arg name="serial" type="uint"/>
-      <arg name="index" type="int"/>
-    </request>
-    <request name="delete_surrounding_text">
-      <arg name="serial" type="uint"/>
-      <arg name="index" type="int"/>
-      <arg name="length" type="uint"/>
-    </request>
-    <request name="modifiers_map">
-      <arg name="map" type="array"/>
-    </request>
-    <request name="keysym">
-      <description summary="keysym">
-        Notify when a key event was sent. Key events should not be used
-        for normal text input operations, which should be done with
-        commit_string, delete_surrounfing_text, etc. The key event follows
-        the wl_keyboard key event convention. State is a XKB keysym, state a
-        wl_keyboard key_state.
-      </description>
-      <arg name="serial" type="uint"/>
-      <arg name="time" type="uint"/>
-      <arg name="sym" type="uint"/>
-      <arg name="state" type="uint"/>
-      <arg name="modifiers" type="uint"/>
-    </request>
-    <request name="grab_keyboard">
-      <description summary="grab hardware keyboard">
-        Allows an input method to receive hardware keyboard input and process
-        key events to generate text events (with pre-edit) over the. This allows
-        input methods which compose multiple key events for inputting text
-        like it is done for CJK languages.
-      </description>
-       <arg name="keyboard" type="new_id" interface="wl_keyboard"/>
-    </request>
-    <request name="key">
-      <arg name="serial" type="uint"/>
-      <arg name="time" type="uint"/>
-      <arg name="key" type="uint"/>
-      <arg name="state" type="uint"/>
-    </request>
-    <request name="modifiers">
-      <arg name="serial" type="uint"/>
-      <arg name="mods_depressed" type="uint"/>
-      <arg name="mods_latched" type="uint"/>
-      <arg name="mods_locked" type="uint"/>
-      <arg name="group" type="uint"/>
-    </request>
-    <event name="surrounding_text">
-      <description summary="surrounding text event">
-        The plain surrounding text around the input position. Cursor is the
-        position within the surrounding text. Anchor is the position of the
-        selection anchor within the surrounding text. If there is no selected
-        text anchor is the same as cursor.
-      </description>
-      <arg name="text" type="string"/>
-      <arg name="cursor" type="uint"/>
-      <arg name="anchor" type="uint"/>
-    </event>
-    <event name="reset">
-      <arg name="serial" type="uint"/>
-    </event>
-    <event name="content_type">
-      <arg name="hint" type="uint"/>
-      <arg name="purpose" type="uint"/>
-    </event>
-    <event name="invoke_action">
-      <arg name="button" type="uint"/>
-      <arg name="index" type="uint"/>
-    </event>
-  </interface>
-
-  <interface name="input_method" version="1">
-    <description summary="input method">
-      An input method object is responsible to compose text in response to
-      input from hardware or virtual keyboards. There is one input method
-      object per seat. On activate there is a new input method context object
-      created which allows the input method to communicate with the text model.
-    </description>
-    <event name="activate">
-      <description summary="activate event">
-        A text model was activated. Creates an input method context object
-        which allows communication with the text model.
-      </description>
-      <arg name="id" type="new_id" interface="input_method_context"/>
-      <arg name="serial" type="uint"/>
-    </event>
-    <event name="deactivate">
-      <description summary="activate event">
-        The text model corresponding to the context argument was deactivated.
-        The input method context should be destroyed after deactivation is
-        handled.
-      </description>
-      <arg name="context" type="object" interface="input_method_context"/>
-    </event>
-  </interface>
-</protocol>

=== modified file 'connection/inputcontextdbusaddress.cpp'
--- connection/inputcontextdbusaddress.cpp	2012-07-10 09:00:33 +0000
+++ connection/inputcontextdbusaddress.cpp	2013-06-27 13:54:25 +0000
@@ -58,7 +58,7 @@
 
 void DynamicAddress::successCallback(const QDBusVariant &address)
 {
-    Q_EMIT addressRecieved(address.variant().toString());
+    Q_EMIT addressReceived(address.variant().toString());
 }
 
 void DynamicAddress::errorCallback(const QDBusError &error)
@@ -73,7 +73,7 @@
 
 void FixedAddress::get()
 {
-    Q_EMIT this->addressRecieved(mAddress);
+    Q_EMIT this->addressReceived(mAddress);
 }
 
 } // namespace DBus

=== modified file 'connection/inputcontextdbusaddress.h'
--- connection/inputcontextdbusaddress.h	2012-07-10 09:00:33 +0000
+++ connection/inputcontextdbusaddress.h	2013-06-27 13:54:25 +0000
@@ -35,7 +35,7 @@
     virtual void get() = 0;
 
 Q_SIGNALS:
-    void addressRecieved(const QString &address);
+    void addressReceived(const QString &address);
     void addressFetchError(const QString &errorMessage);
 };
 

=== modified file 'connection/libmaliit-connection.pri'
--- connection/libmaliit-connection.pri	2013-03-21 13:59:07 +0000
+++ connection/libmaliit-connection.pri	2013-06-27 13:54:25 +0000
@@ -2,8 +2,16 @@
 # The .pro file must define TOP_DIR to be a relative path
 # to the top-level source/build directory, and include config.pri
 
-include($$IN_PWD/../common/libmaliit-common.pri)
+include($$PWD/../common/libmaliit-common.pri)
+include($$PWD/../weston-protocols/libmaliit-weston-protocols.pri)
 
-LIBS += $$TOP_DIR/lib/$$maliitDynamicLib($${MALIIT_CONNECTION_LIB})
-POST_TARGETDEPS += $$TOP_DIR/lib/$$maliitDynamicLib($${MALIIT_CONNECTION_LIB})
+LIBS += $$TOP_DIR/lib/$$maliitStaticLib($${MALIIT_CONNECTION_LIB})
+POST_TARGETDEPS += $$TOP_DIR/lib/$$maliitStaticLib($${MALIIT_CONNECTION_LIB})
 INCLUDEPATH += $$TOP_DIR/connection $$OUT_PWD/$$TOP_DIR/connection
+
+QT += dbus
+
+wayland {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += wayland-client
+}

=== removed file 'connection/maliit-connection.pc.in'
--- connection/maliit-connection.pc.in	2013-03-21 13:59:07 +0000
+++ connection/maliit-connection.pc.in	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-pluginsdir=@MALIIT_PLUGINS_DIR@
-pluginsdatadir=@MALIIT_PLUGINS_DATA_DIR@
-factorypluginsdir=@MALIIT_FACTORY_PLUGINS_DIR@
-
-Name: Maliit Connection
-Description: Shared library for connection between Maliit IC and Maliit Server
-Version: @MALIIT_VERSION@
-Requires: maliit-framework
-Cflags: -I${includedir}/@MALIIT_CONNECTION_HEADER@
-Libs: -L${libdir} -l@MALIIT_CONNECTION_LIB@
-

=== removed file 'connection/maliitmarshalers.list'
--- connection/maliitmarshalers.list	2012-08-06 12:48:36 +0000
+++ connection/maliitmarshalers.list	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-VOID:STRING,STRING

=== removed file 'connection/mdbusglibinputcontextadaptor.cpp'
--- connection/mdbusglibinputcontextadaptor.cpp	2012-08-06 12:48:36 +0000
+++ connection/mdbusglibinputcontextadaptor.cpp	1970-01-01 00:00:00 +0000
@@ -1,250 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#include "mdbusglibinputcontextadaptor.h"
-#include "mimserverconnection.h"
-#include <maliit/settingdata.h>
-
-#include <variantmarshalling.h>
-
-#include <dbus/dbus.h>
-
-G_DEFINE_TYPE(MDBusGlibInputContextAdaptor, m_dbus_glib_input_context_adaptor, G_TYPE_OBJECT)
-
-
-static gboolean m_dbus_glib_input_context_adaptor_activation_lost_event(
-    MDBusGlibInputContextAdaptor *obj, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->activationLostEvent();
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_im_initiated_hide(
-    MDBusGlibInputContextAdaptor *obj, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->imInitiatedHide();
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_commit_string(
-    MDBusGlibInputContextAdaptor *obj, const char *string, gint32 replaceStart,
-    gint32 replaceLength, gint32 cursorPos, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->commitString(QString::fromUtf8(string), replaceStart,
-                                    replaceLength, cursorPos);
-    return TRUE;
-}
-
-QDataStream &operator>>(QDataStream &s, Maliit::PreeditTextFormat &t)
-{
-    int preeditFace;
-    s >> t.start;
-    s >> t.length;
-    s >> preeditFace;
-    t.preeditFace = static_cast<Maliit::PreeditFace>(preeditFace);
-    return s;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_update_preedit(MDBusGlibInputContextAdaptor *obj,
-                                                                 const char *string,
-                                                                 GPtrArray *formatListData,
-                                                                 gint32 replaceStart,
-                                                                 gint32 replaceLength,
-                                                                 gint32 cursorPos, GError **/*error*/)
-{
-    QList<Maliit::PreeditTextFormat> formatList;
-    for (guint i = 0; i < formatListData->len; ++i) {
-        GValueArray *itemData = ((GValueArray**)formatListData->pdata)[i];
-        formatList.push_back(Maliit::PreeditTextFormat(
-                                    g_value_get_int(g_value_array_get_nth(itemData, 0)),
-                                    g_value_get_int(g_value_array_get_nth(itemData, 1)),
-                                    Maliit::PreeditFace(
-                                        g_value_get_int(g_value_array_get_nth(itemData, 2)))));
-    }
-    Q_EMIT obj->imServerConnection->updatePreedit(QString::fromUtf8(string),
-                                     formatList,
-                                     replaceStart,
-                                     replaceLength,
-                                     cursorPos);
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_key_event(
-    MDBusGlibInputContextAdaptor *obj, gint32 type, gint32 key, gint32 modifiers, const char *text,
-    gboolean autoRepeat, gint32 count, guchar requestType, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->keyEvent(type, key, modifiers, QString::fromUtf8(text),
-                                autoRepeat == TRUE, count,
-                                static_cast<Maliit::EventRequestType>(requestType));
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_update_input_method_area(
-    MDBusGlibInputContextAdaptor *obj,
-    gint32 left, gint32 top, gint32 width, gint32 height,
-    GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->updateInputMethodArea(QRect(left, top, width, height));
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_set_global_correction_enabled(
-    MDBusGlibInputContextAdaptor *obj, gboolean value, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->setGlobalCorrectionEnabled(value == TRUE);
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_preedit_rectangle(
-    MDBusGlibInputContextAdaptor *obj, gboolean *valid, gint *x, gint *y,
-    gint *width, gint *height, GError **/*error*/)
-{
-    bool deserializedValidity;
-    QRect rect;
-    Q_EMIT obj->imServerConnection->getPreeditRectangle(rect, deserializedValidity);
-    *valid = deserializedValidity ? TRUE : FALSE;
-    *x = rect.x();
-    *y = rect.y();
-    *width = rect.width();
-    *height = rect.height();
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_set_redirect_keys(
-    MDBusGlibInputContextAdaptor *obj, gboolean enabled, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->setRedirectKeys(enabled == TRUE);
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_set_detectable_auto_repeat(
-    MDBusGlibInputContextAdaptor *obj, gboolean enabled, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->setDetectableAutoRepeat(enabled == TRUE);
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_set_selection(MDBusGlibInputContextAdaptor *obj,
-                                                                gint32 start, gint32 length, GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->setSelection(start,length);
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_selection(
-    MDBusGlibInputContextAdaptor *obj, gboolean *valid, gchar **gdata, GError **/*error*/)
-{
-    bool validity;
-    QString selection;
-    Q_EMIT obj->imServerConnection->getSelection(selection, validity);
-    *valid = validity ? TRUE : FALSE;
-    *gdata = NULL;
-
-    if (validity && !selection.isEmpty()) {
-        *gdata = g_strdup(selection.toUtf8().data());
-    }
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_set_language(
-    MDBusGlibInputContextAdaptor *obj, const char *string,
-    GError **/*error*/)
-{
-    Q_EMIT obj->imServerConnection->setLanguage(QString::fromUtf8(string));
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_notify_extended_attribute_changed(
-        MDBusGlibInputContextAdaptor *obj,
-        gint32 id,
-        const char *target,
-        const char *targetItem,
-        const char *attribute,
-        GValue *valueData,
-        GError **/*error*/)
-{
-    QVariant value;
-    QString error_message;
-    if (decodeVariant(&value, valueData, &error_message)) {
-         Q_EMIT obj->imServerConnection->extendedAttributeChanged(static_cast<int>(id),
-                                                                  QString::fromUtf8(target),
-                                                                  QString::fromUtf8(targetItem),
-                                                                  QString::fromUtf8(attribute),
-                                                                  value);
-    } else {
-        qWarning() << "notify_extended_attribute_changed.arg[4]" + error_message;
-    }
-    return TRUE;
-}
-
-static gboolean m_dbus_glib_input_context_adaptor_plugin_settings_loaded(MDBusGlibInputContextAdaptor *obj,
-                                                                         GPtrArray *settingsData, GError **/*error*/)
-{
-    QList<MImPluginSettingsInfo> settings;
-    for (guint i = 0; i < settingsData->len; ++i) {
-        GValueArray *plugin_data = ((GValueArray**)settingsData->pdata)[i];
-        MImPluginSettingsInfo plugin;
-        GPtrArray *entries_data = (GPtrArray *)g_value_get_boxed(g_value_array_get_nth(plugin_data, 4));
-
-        plugin.description_language = QString::fromUtf8(g_value_get_string(g_value_array_get_nth(plugin_data, 0)));
-        plugin.plugin_name = QString::fromUtf8(g_value_get_string(g_value_array_get_nth(plugin_data, 1)));
-        plugin.plugin_description = QString::fromUtf8(g_value_get_string(g_value_array_get_nth(plugin_data, 2)));
-        plugin.extension_id = g_value_get_int(g_value_array_get_nth(plugin_data, 3));
-
-        for (guint i = 0; i < entries_data->len; ++i) {
-            GValueArray *entry_data = ((GValueArray**)entries_data->pdata)[i];
-            MImPluginSettingsEntry entry;
-
-            QString error_message;
-            if (!decodeVariantMap(&entry.attributes, (GHashTable *)g_value_get_boxed(g_value_array_get_nth(entry_data, 5)), &error_message)) {
-                qWarning() << "m_dbus_glib_input_context_adaptor_plugin_settings_loaded entry attributes:" + error_message;
-
-                return FALSE;
-            }
-
-            entry.description = QString::fromUtf8(g_value_get_string(g_value_array_get_nth(entry_data, 0)));
-            entry.extension_key = QString::fromUtf8(g_value_get_string(g_value_array_get_nth(entry_data, 1)));
-            entry.type = static_cast<Maliit::SettingEntryType>(g_value_get_int(g_value_array_get_nth(entry_data, 2)));
-
-            bool valid = g_value_get_boolean(g_value_array_get_nth(entry_data, 3));
-
-            if (!valid) {
-                entry.value = QVariant();
-            } else if (!decodeVariant(&entry.value, g_value_array_get_nth(entry_data, 4), &error_message)) {
-                qWarning() << "m_dbus_glib_input_context_adaptor_plugin_settings_loaded entry value:" + error_message;
-                return FALSE;
-            }
-
-            plugin.entries.append(entry);
-        }
-
-        settings.append(plugin);
-    }
-    Q_EMIT obj->imServerConnection->pluginSettingsReceived(settings);
-
-    return TRUE;
-}
-
-#include "mdbusglibinputcontextadaptorglue.h"
-
-static void
-m_dbus_glib_input_context_adaptor_init(MDBusGlibInputContextAdaptor */*obj*/)
-{
-}
-
-static void
-m_dbus_glib_input_context_adaptor_class_init(MDBusGlibInputContextAdaptorClass */*klass*/)
-{
-    dbus_g_object_type_install_info(M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR, &dbus_glib_m_dbus_glib_input_context_adaptor_object_info);
-}

=== removed file 'connection/mdbusglibinputcontextadaptor.h'
--- connection/mdbusglibinputcontextadaptor.h	2012-07-10 09:00:33 +0000
+++ connection/mdbusglibinputcontextadaptor.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#ifndef MDBUSGLIBINPUTCONTEXTADAPTOR_H
-#define MDBUSGLIBINPUTCONTEXTADAPTOR_H
-
-#include <glib-object.h>
-
-class MImServerConnection;
-
-//! \brief Glib D-Bus version of an adaptor that exposes MInputContext interface
-//! through D-Bus
-struct MDBusGlibInputContextAdaptor
-{
-    GObject parent;
-    MImServerConnection *imServerConnection;
-};
-
-//! \brief MDBusGlibInputContextAdaptor metaclass
-struct MDBusGlibInputContextAdaptorClass
-{
-    GObjectClass parent;
-};
-
-#define M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR              (m_dbus_glib_input_context_adaptor_get_type())
-#define M_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR(object)           (G_TYPE_CHECK_INSTANCE_CAST((object), M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR, MDBusGlibInputContextAdaptor))
-#define M_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR, MDBusGlibInputContextAdaptorClass))
-#define M_IS_M_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR(object)      (G_TYPE_CHECK_INSTANCE_TYPE((object), M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR))
-#define M_IS_M_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR))
-#define M_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS((obj), M_TYPE_DBUS_GLIB_INPUT_CONTEXT_ADAPTOR, MDBusGlibInputContextAdaptorClass))
-
-
-GType m_dbus_glib_input_context_adaptor_get_type(void);
-
-
-#endif

=== removed file 'connection/mimdirectserverconnection.cpp'
--- connection/mimdirectserverconnection.cpp	2012-07-10 09:00:33 +0000
+++ connection/mimdirectserverconnection.cpp	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#include "mimdirectserverconnection.h"
-
-#include "miminputcontextdirectconnection.h"
-
-namespace {
-    const int firstConnectionId = 1;
-}
-
-MImDirectServerConnection *MImDirectServerConnection::instance()
-{
-    static MImDirectServerConnection singleton;
-
-    return &singleton;
-}
-
-MImDirectServerConnection::MImDirectServerConnection(QObject *parent)
-    : MImServerConnection(parent)
-    , mIcConnection(0)
-    , mConnectionId(firstConnectionId)
-{
-    /* FIXME: Don't hardcode mConnectionId
-    Ideally it should be possible to have multiple IC (and thus server connection)
-    in one process, talking to one imServer, for testing purposes. */
-}
-
-void MImDirectServerConnection::connectTo(MImInputContextDirectConnection *icConnection)
-{
-    if (!icConnection) {
-        qCritical() << __PRETTY_FUNCTION__ << "icConnection cannot be NULL";
-        return;
-    }
-
-    if (icConnection != mIcConnection) {
-        mIcConnection = icConnection;
-        icConnection->connectTo(this);
-    }
-}
-
-void MImDirectServerConnection::activateContext()
-{
-    mIcConnection->activateContext(mConnectionId);
-}
-
-void MImDirectServerConnection::showInputMethod()
-{
-    mIcConnection->showInputMethod(mConnectionId);
-}
-
-void MImDirectServerConnection::hideInputMethod()
-{
-    mIcConnection->hideInputMethod(mConnectionId);
-}
-
-void MImDirectServerConnection::mouseClickedOnPreedit(const QPoint &pos, const QRect &preeditRect)
-{
-    mIcConnection->mouseClickedOnPreedit(mConnectionId, pos, preeditRect);
-}
-
-void MImDirectServerConnection::setPreedit(const QString &text, int cursorPos)
-{
-    mIcConnection->setPreedit(mConnectionId, text, cursorPos);
-}
-
-void MImDirectServerConnection::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
-                                                        bool focusChanged)
-{
-    mIcConnection->updateWidgetInformation(mConnectionId, stateInformation, focusChanged);
-}
-
-void MImDirectServerConnection::reset(bool requireSynchronization)
-{
-    Q_UNUSED(requireSynchronization);
-    mIcConnection->reset(mConnectionId);
-}
-
-bool MImDirectServerConnection::pendingResets()
-{
-    return MImServerConnection::pendingResets();
-}
-
-void MImDirectServerConnection::appOrientationAboutToChange(int angle)
-{
-    mIcConnection->receivedAppOrientationAboutToChange(mConnectionId, angle);
-}
-
-void MImDirectServerConnection::appOrientationChanged(int angle)
-{
-    mIcConnection->receivedAppOrientationChanged(mConnectionId, angle);
-}
-
-void MImDirectServerConnection::setCopyPasteState(bool copyAvailable, bool pasteAvailable)
-{
-    mIcConnection->setCopyPasteState(mConnectionId, copyAvailable, pasteAvailable);
-}
-
-void MImDirectServerConnection::processKeyEvent(QEvent::Type keyType, Qt::Key keyCode,
-                                                Qt::KeyboardModifiers modifiers,
-                                                const QString &text, bool autoRepeat, int count,
-                                                quint32 nativeScanCode, quint32 nativeModifiers,
-                                                unsigned long time)
-{
-    mIcConnection->processKeyEvent(mConnectionId, keyType, keyCode, modifiers, text,
-                                   autoRepeat, count, nativeScanCode, nativeModifiers,
-                                   time);
-}
-
-void MImDirectServerConnection::registerAttributeExtension(int id, const QString &fileName)
-{
-    mIcConnection->registerAttributeExtension(mConnectionId, id, fileName);
-}
-
-void MImDirectServerConnection::unregisterAttributeExtension(int id)
-{
-    mIcConnection->unregisterAttributeExtension(mConnectionId, id);
-}
-
-void MImDirectServerConnection::setExtendedAttribute(int id, const QString &target, const QString &targetItem,
-                                                     const QString &attribute, const QVariant &value)
-{
-    mIcConnection->setExtendedAttribute(mConnectionId, id, target, targetItem, attribute, value);
-}
-
-void MImDirectServerConnection::loadPluginSettings(const QString &descriptionLanguage)
-{
-    mIcConnection->loadPluginSettings(mConnectionId, descriptionLanguage);
-}

=== removed file 'connection/mimdirectserverconnection.h'
--- connection/mimdirectserverconnection.h	2012-07-10 09:00:33 +0000
+++ connection/mimdirectserverconnection.h	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#ifndef MIMDIRECTSERVERCONNECTION_H
-#define MIMDIRECTSERVERCONNECTION_H
-
-#include "mimserverconnection.h"
-
-class MInputContextConnection;
-class MImInputContextDirectConnection;
-
-class MImDirectServerConnection : public MImServerConnection
-{
-    Q_OBJECT
-
-public:
-    static MImDirectServerConnection *instance();
-
-    //! \brief Constructor
-    explicit MImDirectServerConnection(QObject *parent = 0);
-
-    void connectTo(MImInputContextDirectConnection *icConnection);
-
-    //! reimpl
-    virtual void activateContext();
-
-    virtual void showInputMethod();
-
-    virtual void hideInputMethod();
-
-    virtual void mouseClickedOnPreedit(const QPoint &pos, const QRect &preeditRect);
-
-    virtual void setPreedit(const QString &text, int cursorPos);
-
-    virtual void updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
-                                         bool focusChanged);
-
-    virtual void reset(bool requireSynchronization);
-    virtual bool pendingResets();
-
-    virtual void appOrientationAboutToChange(int angle);
-
-    virtual void appOrientationChanged(int angle);
-
-    virtual void setCopyPasteState(bool copyAvailable, bool pasteAvailable);
-
-    virtual void processKeyEvent(QEvent::Type keyType, Qt::Key keyCode,
-                                 Qt::KeyboardModifiers modifiers,
-                                 const QString &text, bool autoRepeat, int count,
-                                 quint32 nativeScanCode, quint32 nativeModifiers, unsigned long time);
-
-    virtual void registerAttributeExtension(int id, const QString &fileName);
-
-    virtual void unregisterAttributeExtension(int id);
-
-    virtual void setExtendedAttribute(int id, const QString &target, const QString &targetItem,
-                                      const QString &attribute, const QVariant &value);
-
-    virtual void loadPluginSettings(const QString &descriptionLanguage);
-    //! reimpl end
-
-private:
-    Q_DISABLE_COPY(MImDirectServerConnection)
-
-    MInputContextConnection *mIcConnection;
-    unsigned int mConnectionId;
-};
-
-#endif // MIMDIRECTSERVERCONNECTION_H

=== removed file 'connection/miminputcontextdirectconnection.cpp'
--- connection/miminputcontextdirectconnection.cpp	2012-08-06 12:48:36 +0000
+++ connection/miminputcontextdirectconnection.cpp	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#include "miminputcontextdirectconnection.h"
-
-#include "mimdirectserverconnection.h"
-
-#include <QtCore>
-#include <QtGui/QKeyEvent>
-
-MImInputContextDirectConnection *MImInputContextDirectConnection::instance()
-{
-    static MImInputContextDirectConnection singleton;
-
-    return &singleton;
-}
-
-MImInputContextDirectConnection::MImInputContextDirectConnection(QObject *parent)
-    : MInputContextConnection(parent)
-    , mServerConnection(0)
-{
-}
-
-void MImInputContextDirectConnection::connectTo(MImDirectServerConnection *serverConnection)
-{
-    if (!serverConnection) {
-        qCritical() << __PRETTY_FUNCTION__ << "serverConnection cannot be NULL";
-        return;
-    }
-
-    if (serverConnection != mServerConnection) {
-        mServerConnection = serverConnection;
-        serverConnection->connectTo(this);
-    }
-}
-
-void MImInputContextDirectConnection::sendPreeditString(const QString &string,
-                                                        const QList<Maliit::PreeditTextFormat> &preeditFormats,
-                                                        int replacementStart,
-                                                        int replacementLength,
-                                                        int cursorPos)
-{
-    Q_EMIT mServerConnection->updatePreedit(string, preeditFormats,
-                                            replacementStart, replacementLength, cursorPos);
-}
-
-void MImInputContextDirectConnection::sendCommitString(const QString &string, int replaceStart,
-                                                       int replaceLength, int cursorPos)
-{
-    Q_EMIT mServerConnection->commitString(string, replaceStart, replaceLength, cursorPos);
-}
-
-void MImInputContextDirectConnection::sendKeyEvent(const QKeyEvent &keyEvent,
-                                                   Maliit::EventRequestType requestType)
-{
-    const int type = static_cast<int>(keyEvent.type());
-    const int key = static_cast<int>(keyEvent.key());
-    const int modifiers = static_cast<int>(keyEvent.modifiers());
-
-    /* TODO: make this API take the QEvent, so we don't have to do convert the argument here
-    in a way that matches the conversion done in MInputContext::keyEvent() */
-    Q_EMIT mServerConnection->keyEvent(type, key, modifiers,
-                                       keyEvent.text().toUtf8().data(),
-                                       keyEvent.isAutoRepeat(), keyEvent.count(),
-                                       requestType);
-}
-
-void MImInputContextDirectConnection::notifyImInitiatedHiding()
-{
-    Q_EMIT mServerConnection->imInitiatedHide();
-}
-
-void MImInputContextDirectConnection::invokeAction(const QString &action, const QKeySequence &sequence)
-{
-    Q_EMIT mServerConnection->invokeAction(action, sequence);
-}
-
-void MImInputContextDirectConnection::setRedirectKeys(bool enabled)
-{
-    Q_EMIT mServerConnection->setRedirectKeys(enabled);
-}
-
-void MImInputContextDirectConnection::setDetectableAutoRepeat(bool enabled)
-{
-    Q_EMIT mServerConnection->setDetectableAutoRepeat(enabled);
-}
-
-void MImInputContextDirectConnection::setGlobalCorrectionEnabled(bool enabled)
-{
-    Q_EMIT mServerConnection->setGlobalCorrectionEnabled(enabled);
-}
-
-void MImInputContextDirectConnection::setSelection(int start, int length)
-{
-    Q_EMIT mServerConnection->setSelection(start, length);
-}
-
-void MImInputContextDirectConnection::updateInputMethodArea(const QRegion &region)
-{
-    Q_EMIT mServerConnection->updateInputMethodArea(region.boundingRect());
-}
-
-void MImInputContextDirectConnection::notifyExtendedAttributeChanged(int id,
-                                                                     const QString &target,
-                                                                     const QString &targetItem,
-                                                                     const QString &attribute,
-                                                                     const QVariant &value)
-{
-    Q_EMIT mServerConnection->extendedAttributeChanged(id, target, targetItem,
-                                                       attribute, value);
-}
-
-void MImInputContextDirectConnection::notifyExtendedAttributeChanged(const QList<int> &clientIds,
-                                                                     int id,
-                                                                     const QString &target,
-                                                                     const QString &targetItem,
-                                                                     const QString &attribute,
-                                                                     const QVariant &value)
-{
-    Q_UNUSED(clientIds);
-
-    Q_EMIT mServerConnection->extendedAttributeChanged(id, target, targetItem,
-                                                       attribute, value);
-}
-
-void MImInputContextDirectConnection::pluginSettingsLoaded(int clientId, const QList<MImPluginSettingsInfo> &info)
-{
-    Q_UNUSED(clientId);
-
-    Q_EMIT mServerConnection->pluginSettingsReceived(info);
-}

=== removed file 'connection/miminputcontextdirectconnection.h'
--- connection/miminputcontextdirectconnection.h	2012-08-06 12:48:36 +0000
+++ connection/miminputcontextdirectconnection.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/* * This file is part of Maliit framework *
- *
- * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
- * All rights reserved.
- *
- * Contact: [e-mail]
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation
- * and appearing in the file LICENSE.LGPL included in the packaging
- * of this file.
- */
-
-#ifndef MIMINPUTCONTEXTDIRECTCONNECTION_H
-#define MIMINPUTCONTEXTDIRECTCONNECTION_H
-
-#include "minputcontextconnection.h"
-
-#include <QtCore>
-
-class MImServerConnection;
-class MImDirectServerConnection;
-
-class MImInputContextDirectConnection : public MInputContextConnection
-{
-    Q_OBJECT
-public:
-    explicit MImInputContextDirectConnection(QObject *parent = 0);
-
-    static MImInputContextDirectConnection *instance();
-
-    void connectTo(MImDirectServerConnection *mServerConnection);
-
-    //! reimpl
-    virtual void sendPreeditString(const QString &string,
-                                   const QList<Maliit::PreeditTextFormat> &preeditFormats,
-                                   int replacementStart = 0,
-                                   int replacementLength = 0,
-                                   int cursorPos = -1);
-    virtual void sendCommitString(const QString &string, int replaceStart = 0,
-                                  int replaceLength = 0, int cursorPos = -1);
-    virtual void sendKeyEvent(const QKeyEvent &keyEvent,
-                              Maliit::EventRequestType requestType
-                              = Maliit::EventRequestBoth);
-    virtual void notifyImInitiatedHiding();
-    virtual void invokeAction(const QString &action, const QKeySequence &sequence);
-    virtual void setRedirectKeys(bool enabled);
-    virtual void setDetectableAutoRepeat(bool enabled);
-    virtual void setGlobalCorrectionEnabled(bool enabled);
-    virtual void setSelection(int start, int length);
-    virtual void updateInputMethodArea(const QRegion &region);
-    virtual void notifyExtendedAttributeChanged(int id,
-                                                const QString &target,
-                                                const QString &targetItem,
-                                                const QString &attribute,
-                                                const QVariant &value);
-    virtual void notifyExtendedAttributeChanged(const QList<int> &clientIds,
-                                                int id,
-                                                const QString &target,
-                                                const QString &targetItem,
-                                                const QString &attribute,
-                                                const QVariant &value);
-    virtual void pluginSettingsLoaded(int clientId, const QList<MImPluginSettingsInfo> &info);
-    //! reimpl end
-
-private:
-    MImServerConnection *mServerConnection;
-};
-
-#endif // MIMINPUTCONTEXTDIRECTCONNECTION_H

=== modified file 'connection/mimserverconnection.cpp'
--- connection/mimserverconnection.cpp	2012-07-10 09:00:33 +0000
+++ connection/mimserverconnection.cpp	2013-06-27 13:54:25 +0000
@@ -43,8 +43,7 @@
     Q_UNUSED(cursorPos);
 }
 
-void MImServerConnection::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation,
-                                                    bool focusChanged)
+void MImServerConnection::updateWidgetInformation(const QMap<QString, QVariant> &stateInformation, bool focusChanged)
 {
     Q_UNUSED(stateInformation);
     Q_UNUSED(focusChanged);
@@ -77,10 +76,10 @@
 }
 
 void MImServerConnection::processKeyEvent(QEvent::Type keyType, Qt::Key keyCode,
-                                            Qt::KeyboardModifiers modifiers,