6 years agoMerge remote-tracking branch 'integration/0.81' into debian debian
Michael Hasselmann [Wed, 15 Feb 2012 07:38:40 +0000 (08:38 +0100)]
Merge remote-tracking branch 'integration/0.81' into debian

6 years agoFixes: NB#298229 - PIN query appears black for several seconds during startup
Jan Arne Petersen [Tue, 14 Feb 2012 08:36:57 +0000 (09:36 +0100)]
Fixes: NB#298229 - PIN query appears black for several seconds during startup

Use QtDBus for getting the peer-to-peer address of the maliit server
asynchronously. Replace the synchronous glib-dbus and gio code.

RevBy: Michael Hasselmann, Jon Nordby

6 years agoFixes: NB#296576 Vkb is not shown in text field, when swype keyboard is enabled ...
Maksim Kirillov [Wed, 8 Feb 2012 14:16:48 +0000 (16:16 +0200)]
Fixes: NB#296576 Vkb is not shown in text field, when swype keyboard is enabled & disabled in a scenario

RevBy: Michael Hasselmann, Viacheslav Sobolev
 The acceptRegionUpdates variable, which happened to control showing
 during plugin switch, was cleared only after some timeout after keyboard
 hide. If user swipes away application with input and then fast switch
 plugin in settings, the new plugin may get unneeded show() call, which can
 bring it to inconsistent state.

 Fixed by introducing another variable dedicated to control showing,
 which is updated without delay.

6 years agoChanges: Ut_MIMPluginManager::testSwitchShow test added
Maksim Kirillov [Tue, 14 Feb 2012 07:46:01 +0000 (09:46 +0200)]
Changes: Ut_MIMPluginManager::testSwitchShow test added

RevBy: Michael Hasselmann, Viacheslav Sobolev
Details: for NB#296576 - Vkb is not shown in text field, when swype keyboard is enabled & disabled in a scenario

6 years agoAdded a NEWS item mentioning the MImSettings changes.
Mattia Barbon [Fri, 10 Feb 2012 13:40:20 +0000 (14:40 +0100)]
Added a NEWS item mentioning the MImSettings changes.

RevBy: Jon Nordby, Michael Hasselmann

6 years agoUpdated the documentation to reflect MImSettings changes.
Mattia Barbon [Fri, 3 Feb 2012 15:58:34 +0000 (16:58 +0100)]
Updated the documentation to reflect MImSettings changes.

RevBy: Jon Nordby, Michael Hasselmann
Documented the backend API interface. Rewritten the documentation for all
methods to avoid mentioning GConf.

Moved some GCOnf-specific implementation details to MImSettingsGConfBackend

6 years agoFix and test set(QVariant()) and unset() equivalence.
Mattia Barbon [Fri, 3 Feb 2012 14:19:00 +0000 (15:19 +0100)]
Fix and test set(QVariant()) and unset() equivalence.

RevBy: Jon Nordby, Michael Hasselmann
Map both calls to backend->unset() and test that both forms delete
the key from the storage.

6 years agoFix mentions of MGConfItem in documentation/log messages.
Mattia Barbon [Fri, 3 Feb 2012 11:57:18 +0000 (12:57 +0100)]
Fix mentions of MGConfItem in documentation/log messages.

RevBy: Jon Nordby, Michael Hasselmann

6 years agoAdded basic tests for MImSettingsQSettingsBackend.
Mattia Barbon [Thu, 2 Feb 2012 18:17:44 +0000 (19:17 +0100)]
Added basic tests for MImSettingsQSettingsBackend.

RevBy: Jon Nordby, Michael Hasselmann

6 years agoAdded a factory interface to create MImSettings backends
Mattia Barbon [Thu, 2 Feb 2012 16:27:04 +0000 (17:27 +0100)]
Added a factory interface to create MImSettings backends

RevBy: Jon Nordby, Michael Hasselmann
This method should only be used when embedding Maliit server directly
in the application, or in unit tests.

6 years agoAdded a compile-time switch to disable the GConf settings backend.
Mattia Barbon [Thu, 2 Feb 2012 16:06:18 +0000 (17:06 +0100)]
Added a compile-time switch to disable the GConf settings backend.

RevBy: Jon Nordby, Michael Hasselmann
When disabled, uses QSettings to store the settings.

6 years agoAdded a MImSettings backend using QSettings.
Mattia Barbon [Thu, 2 Feb 2012 15:33:38 +0000 (16:33 +0100)]
Added a MImSettings backend using QSettings.

RevBy: Jon Nordby, Michael Hasselmann
Uses and application=server to create the
QSettings instance.

Can be used as an alternative to GConf to avoid adding a dependency
on GConf/DBus (for example on an embedded device).

6 years agoAdded a static method to get the default values associated with some keys.
Mattia Barbon [Thu, 2 Feb 2012 15:12:52 +0000 (16:12 +0100)]
Added a static method to get the default values associated with some keys.

RevBy: Jon Nordby, Michael Hasselmann
The map returned by the method must match the one defined for GConf in

6 years agoTurn MImSettings into a pImpl.
Mattia Barbon [Wed, 1 Feb 2012 18:31:43 +0000 (19:31 +0100)]
Turn MImSettings into a pImpl.

RevBy: Jon Nordby, Michael Hasselmann
Added an abstract MImSettingsBackend class and moved all
the GConf interface code into a separate backend subclass.

6 years agoFixes: Maliit#68 - maliit-server does not always notify IC about InputMethodArea...
Carlos Martín [Thu, 22 Dec 2011 18:34:09 +0000 (19:34 +0100)]
Fixes: Maliit#68 - maliit-server does not always notify IC about InputMethodArea changes

RevBy: Michael Hasselmann, Jan Arne Petersen
When an active VKB is in use and deactivated because HKB has been opened,
InputMethodArea changes were not propagated to input context.

6 years agoUpdate .gitignore files after moving files to connection/
Jon Nordby [Wed, 25 Jan 2012 15:37:15 +0000 (16:37 +0100)]
Update .gitignore files after moving files to connection/

RevBy: Krzesimir Nowak, Jan Arne Petersen

6 years agoFixup linking of libmaliit-connection in maliit-server
Jon Nordby [Wed, 25 Jan 2012 15:22:13 +0000 (16:22 +0100)]
Fixup linking of libmaliit-connection in maliit-server

RevBy: Krzesimir Nowak, Jan Arne Petersen

6 years agoFixup includes and linking of libmaliit-connection in tests
Jon Nordby [Wed, 25 Jan 2012 15:20:13 +0000 (16:20 +0100)]
Fixup includes and linking of libmaliit-connection in tests

RevBy: Krzesimir Nowak, Jan Arne Petersen
A bit ugly at the moment, but for better transparency in
which tests require what things we would need to split
up the code that goes into maliit server further.
For instance by splitting out the input method plugin interface.

6 years agoRemove unneccesary include of MInputContext in GlibDbusImServerProxy
Jon Nordby [Wed, 25 Jan 2012 15:19:23 +0000 (16:19 +0100)]
Remove unneccesary include of MInputContext in GlibDbusImServerProxy

RevBy: Krzesimir Nowak, Jan Arne Petersen
This dependency was removed in previous work, but the
include was apparently forgotten.

6 years agoGive generated dbus glue files unique names
Jon Nordby [Wed, 25 Jan 2012 15:18:10 +0000 (16:18 +0100)]
Give generated dbus glue files unique names

RevBy: Krzesimir Nowak, Jan Arne Petersen
Needed now that they exist in the same folder.

6 years agoMake common produce static lib use it in connection
Jon Nordby [Wed, 25 Jan 2012 15:14:24 +0000 (16:14 +0100)]
Make common produce static lib use it in connection

RevBy: Krzesimir Nowak, Jan Arne Petersen

6 years agoRemove unused legacy dbus service file
Jon Nordby [Tue, 31 Jan 2012 11:52:01 +0000 (12:52 +0100)]
Remove unused legacy dbus service file

RevBy: Krzesimir Nowak, Jan Arne Petersen

6 years agoMove all connection code to connection/ directory
Jon Nordby [Wed, 25 Jan 2012 14:22:16 +0000 (15:22 +0100)]
Move all connection code to connection/ directory

RevBy: Krzesimir Nowak, Jan Arne Petersen
This separates out the dbus dependency we have in this area
from the rest of server and input-context code, and enables
us to add a direct connection between the two.

Also updates the .pro files to reflect the change

6 years agoChanges: move duplicated code into common library
Viacheslav Sobolev [Wed, 18 Jan 2012 15:04:15 +0000 (17:04 +0200)]
Changes: move duplicated code into common library

RevBy: Jarno Malmari, Jon Nordby, Jan Arne Petersen

6 years agoChanges: update cached value of extended attribute on application side
Viacheslav Sobolev [Tue, 17 Jan 2012 11:15:25 +0000 (13:15 +0200)]
Changes: update cached value of extended attribute on application side

RevBy: Jarno Malmari, Jon Nordby, Jan Arne Petersen

6 years agoNew: implemented method to deliver extended attributes from framework to application
Viacheslav Sobolev [Mon, 16 Jan 2012 15:36:28 +0000 (17:36 +0200)]
New: implemented method to deliver extended attributes from framework to application

RevBy: Jarno Malmari, Jon Nordby, Jan Arne Petersen

6 years agoNew: extensions manager sends notification when toolbar attribute is changed
Viacheslav Sobolev [Mon, 16 Jan 2012 13:34:03 +0000 (15:34 +0200)]
New: extensions manager sends notification when toolbar attribute is changed

RevBy: Jarno Malmari, Jon Nordby, Jan Arne Petersen
Details: this notification informs that some toolbar attribute has been changed
by framework or plugin and we could inform application about that change.
We watch on toolbar item if some of its attributes was explicitly changed
by application at least once.

6 years agoChanges: Release version 0.81.3.harmattan1
Aapo Kojo [Thu, 2 Feb 2012 12:33:29 +0000 (14:33 +0200)]
Changes: Release version 0.81.3.harmattan1

RevBy: TrustMe

6 years agoNormalize member variable names in MIMPluginManagerPrivate
Michael Hasselmann [Mon, 30 Jan 2012 12:45:21 +0000 (13:45 +0100)]
Normalize member variable names in MIMPluginManagerPrivate

RevBy: Viacheslav Sobolev, Antti Pulakka
MIMPluginManager uses the PIMPL idiom. For member variable names in the PIMPL
class, this means we can drop the m prefix. That's why mProxyWidget and
mAttributeManager got renamed to proxyWidget and attributeManager.

6 years agoFix lost update problem in MImOnScreen::setAllSubViewsEnabled
Michael Hasselmann [Wed, 18 Jan 2012 15:05:56 +0000 (16:05 +0100)]
Fix lost update problem in MImOnScreen::setAllSubViewsEnabled

RevBy: Viacheslav Sobolev, Antti Pulakka
The sequence of calling
1. setAllSubViewsEnabled(true)
2. setAllSubViewsEnabled(false)
3. enable some layouts via settings
4. setAllSubViewsEnabled(false)
would destroy the update from step 3. That's why we remember the current
override state with an additional flag, and don't modify the subviews at all if
the flag hasn't changed.

6 years agoNew: MImSubViewOverride to track MAttributeExtension for enable-all-subviews override
Michael Hasselmann [Wed, 11 Jan 2012 12:23:40 +0000 (13:23 +0100)]
New: MImSubViewOverride to track MAttributeExtension for enable-all-subviews override

RevBy: Viacheslav Sobolev, Antti Pulakka
We need to make sure that upon destruction of MAttributeExtensions which were
used for the enable-all-subviews override, we actually disable the override.
For that, we attach MImSubViewOverride to MAttributeExtension and let Qt's
QObject ownership do the rest.

6 years agoNew: Remember last active subview as enabled when disabling enable-all-subviews override
Michael Hasselmann [Tue, 10 Jan 2012 18:33:11 +0000 (19:33 +0100)]
New: Remember last active subview as enabled when disabling enable-all-subviews override

RevBy: Viacheslav Sobolev, Antti Pulakka
Improve user friendliness by assuming that last active subview when
enable-all-subviews override gets disabled is also a subview the user wants to
keep enabled (because it most likely has been used).

6 years agoFixes: NB#295883 - All input methods are still installed after tapping the emergency...
Michael Hasselmann [Tue, 10 Jan 2012 18:27:18 +0000 (19:27 +0100)]
Fixes: NB#295883 - All input methods are still installed after tapping the emergency keyboard button in the device lock screen and typing the lock code on system startup

RevBy: Viacheslav Sobolev, Antti Pulakka
This commit allows disabling of enable-all-layouts override.

6 years agoChanges: Guess an active subview from the list of enabled subviews, in case plugin...
Michael Hasselmann [Tue, 10 Jan 2012 17:23:47 +0000 (18:23 +0100)]
Changes: Guess an active subview from the list of enabled subviews, in case plugin was switched

RevBy: Viacheslav Sobolev, Antti Pulakka
It is possible to navigate between plugins without calling
MIMPluginManager::setActivePlugin, which leads to a situation where the active
plugin is asked for the active subview even though the framework never set one
on that plugin instance.

This commit is a workaround which checks active but empty subviews and then
tries to guess an active subview so that MImOnScreenPlugins::activeSubview
doesn't accidentially has to return an empty subview.

6 years agoNew: Example application to enable all input methods
Michael Hasselmann [Mon, 2 Jan 2012 07:29:07 +0000 (08:29 +0100)]
New: Example application to enable all input methods

RevBy: Viacheslav Sobolev, Antti Pulakka

6 years agoFixed: NB#295179 - Create a method to load all input plugins for security lock ui...
Viacheslav Sobolev [Mon, 19 Dec 2011 12:11:54 +0000 (14:11 +0200)]
Fixed: NB#295179 - Create a method to load all input plugins for security lock ui purpose

RevBy: Mohammad Anwari
Details: framework enables all available subviews if application
set special extended attribute to true

6 years agoChanges: Bump version to 0.81.3
Michael Hasselmann [Fri, 27 Jan 2012 12:33:47 +0000 (13:33 +0100)]
Changes: Bump version to 0.81.3

6 years agoFixes: MALIIT#14 - Maliit requires glib/gio 2.26+
Jon Nordby [Mon, 23 Jan 2012 11:45:01 +0000 (12:45 +0100)]
Fixes: MALIIT#14 - Maliit requires glib/gio 2.26+

RevBy: Jan Arne Petersen, Michael Hasselmann
Fall back to dbus-glib for GTK+ input context
when gdbus is not available. Based on contributed
fix for the Qt input context.

6 years agoFix qmake's warning about unmatched quotes in HELP.
Krzesimir Nowak [Wed, 25 Jan 2012 14:32:03 +0000 (15:32 +0100)]
Fix qmake's warning about unmatched quotes in HELP.

RevBy: TrustMe

6 years agoAdded build-time check for Glib in Qt4 input context
Mattia Barbon [Tue, 24 Jan 2012 11:39:41 +0000 (12:39 +0100)]
Added build-time check for Glib in Qt4 input context

RevBy: Jan Arne Petersen, Michael Hasselmann
Without the support, Maliit will fail at runtime with the error:

    g_thread_init() must be called before dbus_threads_init()

6 years agoOnly link X11 libraries when building for X11.
Mattia Barbon [Tue, 24 Jan 2012 11:39:00 +0000 (12:39 +0100)]
Only link X11 libraries when building for X11.

RevBy: Jan Arne Petersen, Michael Hasselmann

6 years agoCheck for NULL pointers in custom dbus connection deleter
Jon Nordby [Tue, 24 Jan 2012 15:40:57 +0000 (16:40 +0100)]
Check for NULL pointers in custom dbus connection deleter

RevBy: TrustMe
Added in hope that it will fix a crasher issue that
only occurs on some platforms.

6 years agoUse G_VALUE_INIT to avoid compile warning
Jon Nordby [Mon, 23 Jan 2012 15:12:28 +0000 (16:12 +0100)]
Use G_VALUE_INIT to avoid compile warning

RevBy: TrustMe
Does not exist in glib < 2.30 and this code path is for those
versions, so copy the definition and use it conditionally.

6 years agoPartial: MALIIT#14 - Maliit requires glib/gio 2.26+
Carlos Martín [Mon, 19 Dec 2011 20:01:23 +0000 (21:01 +0100)]
Partial: MALIIT#14 - Maliit requires glib/gio 2.26+

RevBy: Jon Nordby, Jan Arne Petersen
Fall back to dbus-glib in the Qt input context
when gdbus is not available.

6 years agoAllow QML plugins to add custom import paths for QML files and QML modules
Michael Hasselmann [Sat, 17 Dec 2011 15:16:01 +0000 (16:16 +0100)]
Allow QML plugins to add custom import paths for QML files and QML modules

RevBy: Jon Nordby, Krzesimir Nowak
When reimplementing the C++ plugin wrapper for QML input methods, one can use
the (unstable!) static MInputMethodQuickPlugin::setQmlImportPaths() function.
Safest way is to reimplement MInputMethodQuickPlugin::createInputMethod() and
to set the import paths just before calling the parent implementation:

    MAbstractInputMethod *
    MyQmlWrapperPlugin::createInputMethod(MAbstractInputMethodHost *host,
                                          QWidget *mainWindow)
        QStringList paths();

        MInputMethodQuickPlugin::createInputMethod(host, mainWindow);

6 years agoChanges: Sync with upstream release version Maliit 0.81 - "Into the Wild"
Aapo Kojo [Tue, 17 Jan 2012 09:31:19 +0000 (11:31 +0200)]
Changes: Sync with upstream release version Maliit 0.81 - "Into the Wild"

6 years agoUpdate news to mention dbus activation being optional
Jon Nordby [Fri, 13 Jan 2012 16:19:20 +0000 (17:19 +0100)]
Update news to mention dbus activation being optional

RevBy: TrustMe

6 years agoFixes: MALIIT#73 - Make dbus-x11 an optional dependency
Jon Nordby [Wed, 11 Jan 2012 16:13:35 +0000 (17:13 +0100)]
Fixes: MALIIT#73 - Make dbus-x11 an optional dependency

RevBy: Jan Arne Petersen, Michael Hasselmann
Makes dbus activation optional. If integrating Maliit well
with the system, the service manager (ex: systemd) will be
reponsible for starting and restarting maliit-server.
This means that dbus-launch shipped in dbus-x11 is no longer needed.

Use qmake CONFIG+=disable-dbus-activation to disable.

6 years agoFixes: Use the QPA platform implementation when compiling for Qt Embedded (QWS).
Mattia Barbon [Thu, 5 Jan 2012 16:48:08 +0000 (17:48 +0100)]
Fixes: Use the QPA platform implementation when compiling for Qt Embedded (QWS).

RevBy: Jon Nordby, Jan Arne Petersen

6 years agoFixes: do not use X11 plugin host implementation for Qt Embedded (QWS).
Mattia Barbon [Thu, 5 Jan 2012 16:43:45 +0000 (17:43 +0100)]
Fixes: do not use X11 plugin host implementation for Qt Embedded (QWS).

RevBy: Jon Nordby, Jan Arne Petersen

6 years agoChanges: Bump version to
Michael Hasselmann [Thu, 22 Dec 2011 21:32:58 +0000 (22:32 +0100)]
Changes: Bump version to

6 years agoFixes: Use correct qmake binary when creating SDK
Michael Hasselmann [Thu, 22 Dec 2011 21:28:26 +0000 (22:28 +0100)]
Fixes: Use correct qmake binary when creating SDK

RevBy: TrustMe
Certain distros like to make fun of developers by renaming build tools without
providing fallbacks.

6 years agoChanges: Bump version to 0.81.2
Michael Hasselmann [Thu, 22 Dec 2011 20:27:16 +0000 (21:27 +0100)]
Changes: Bump version to 0.81.2

6 years agoFixes: NB#290871 - meego-im-uiserver requires credentials from X
Jan Arne Petersen [Thu, 22 Dec 2011 12:07:39 +0000 (13:07 +0100)]
Fixes: NB#290871 - meego-im-uiserver requires credentials from X

RevBy: TrustMe
Add xserver-security-policy::capture-drawables credential.

6 years agoChanges: Release 0.80.8.harmattan17
Mohammad Anwari [Thu, 22 Dec 2011 13:27:31 +0000 (15:27 +0200)]
Changes: Release 0.80.8.harmattan17

6 years agoFixes: Add missing header to plainqt example application for Qt 4.8
Mattia Barbon [Thu, 15 Dec 2011 18:13:21 +0000 (19:13 +0100)]
Fixes: Add missing header to plainqt example application for Qt 4.8

RevBy: Jon Nordby, Michael Hasselmann

6 years agoNew: M_IM_DEFAULT[_HW]_PLUGIN configuration variables to set default plugins
Luis Araujo [Mon, 12 Dec 2011 12:09:17 +0000 (07:39 -0430)]
New: M_IM_DEFAULT[_HW]_PLUGIN configuration variables to set default plugins

RevBy: Jon Nordby, Michael Hasselmann
Makes packaging for different platforms easier, since default plugin(s) and
default subview (through M_IM_DEFAULT_SUBVIEW) are now available as configure
options. Nemo Mobile for instance uses its own Nemo Keyboard as default plugin.
Check "$ qmake HELP=1" for more options.

Please note, however, that the current default HWKB plugin
( offers no HWKB functionality. See also
MALIIT#42 - Maliit Keyboard doesn't have hardware keyboard integration.

6 years agoFixes: SDK creation fails if libmaliit is not installed
Jon Nordby [Tue, 13 Dec 2011 12:24:35 +0000 (13:24 +0100)]
Fixes: SDK creation fails if libmaliit is not installed

RevBy: Michael Hasselmann, Jan Arne Petersen
More recent Qt versions will fail if a pkg-config package
that is used by the build is not found at qmake time. This
caused the SDK creation script to bail out early, but this
was hidden due to redirecting all errors to /dev/null

Making cleaning errors fatal also shows that we are also
trying to clean the examples when there is nothing to clean
(happens on out-of-tree builds).

6 years agoFixes: Docs/SDK installed to wrong location if destination directory exists
Jon Nordby [Tue, 13 Dec 2011 12:01:45 +0000 (13:01 +0100)]
Fixes: Docs/SDK installed to wrong location if destination directory exists

RevBy: Michael Hasselmann, Jan Arne Petersen
Creates built directories that will be installed at qmake time.

If the directory to install does not exist at qmake time,
qmake will generate install rules like these:
cp -f -r /home/jon/temp/qmake/build/built_dir /home/jon/temp/qmake/./somediretory/soemdir/built_dir

Works as-expected when /home/jon/temp/qmake/./somediretory/soemdir
does not exist, but not when it exists (installs one level deeper).
Typically happens when running make install multiple times.

6 years agoFixes: SDK example applications fails in legacy-mode
Jon Nordby [Tue, 13 Dec 2011 10:39:00 +0000 (11:39 +0100)]
Fixes: SDK example applications fails in legacy-mode

RevBy: Michael Hasselmann, Jan Arne Petersen
libmaliit is required also for legacy-mode.

6 years agoRead package version from dedicated VERSION file
Jon Nordby [Tue, 13 Dec 2011 23:26:35 +0000 (00:26 +0100)]
Read package version from dedicated VERSION file

RevBy: Michael Hasselmann, Jan Arne Petersen
Makes it easy to find where to update version,
and to read and set the it programatically.

6 years agoChanges: Also generate .md5 file for tarball on make dist
Jon Nordby [Tue, 13 Dec 2011 23:10:15 +0000 (00:10 +0100)]
Changes: Also generate .md5 file for tarball on make dist

RevBy: Michael Hasselmann, Jan Arne Petersen

6 years agoUse new Maliit reference plugin by default
Michael Hasselmann [Wed, 14 Dec 2011 12:36:52 +0000 (13:36 +0100)]
Use new Maliit reference plugin by default

RevBy: Jon Nordby

6 years agoFixes: NEMO#14 - VKB opens even if HWKB is already open
Vesa-Matti Hartikainen [Thu, 8 Dec 2011 10:48:19 +0000 (12:48 +0200)]
Fixes: NEMO#14 - VKB opens even if HWKB is already open

Store activeState on setState calls.
RevBy: Michael Hasselmann, Jon Nordby

6 years agoChanges: Try to make test relying on dbus more reliable
Jon Nordby [Mon, 12 Dec 2011 14:11:59 +0000 (15:11 +0100)]
Changes: Try to make test relying on dbus more reliable

RevBy: Jan Arne Petersen
Don't assume that the DBus message will be instantly dispatched,
so wait a bit before trying to process it.

When running on buildbot in a virtual X server,
Ut_MIMPluginManager::testDBusSetCalls() failed 4 out of 5 times.
With this change it succeeded 20 consecutive runs in the same

Not really a proper fix, as the test is still racy, but
at least much more reliable this way.

6 years agoSkip tests not applying for Qt 5
Jan Arne Petersen [Mon, 12 Dec 2011 11:12:42 +0000 (12:12 +0100)]
Skip tests not applying for Qt 5

RevBy: Jon Nordby
Ut_Maliit_InputMethod::testRequestInputMethodPanel and
Ut_Maliit_InputMethod::testCloseInputMethodPanel do not apply in Qt 5
because the implementation changed. Skip them in Qt 5.

6 years agoFixes: Crash happening during initiated hide in Gtk+ app.
Krzesimir Nowak [Fri, 9 Dec 2011 14:07:04 +0000 (15:07 +0100)]
Fixes: Crash happening during initiated hide in Gtk+ app.

Pass an address of user_data pointer, not the pointer itself.
It was not caught by compiler due to behaviour of void pointers
in C representing any type.

RevBy: TrustMe

6 years agoChanges: Use --update-cache flag for gtk-query-immodules-3.0.
Krzesimir Nowak [Mon, 5 Dec 2011 14:02:42 +0000 (15:02 +0100)]
Changes: Use --update-cache flag for gtk-query-immodules-3.0.

RevBy: Jan Arne Petersen, Jon Nordby

6 years agoFixes: enforce-install-prefix for legacy mode
Jon Nordby [Thu, 8 Dec 2011 12:54:26 +0000 (13:54 +0100)]
Fixes: enforce-install-prefix for legacy mode

RevBy: TrustMe
Some .prf files only installed in legacy mode did
not respect CONFIG+=enforce-install-prefix

6 years agoNew: Build option for enforcing install prefix for all files
Jon Nordby [Mon, 5 Dec 2011 16:20:29 +0000 (17:20 +0100)]
New: Build option for enforcing install prefix for all files

RevBy: Michael Hasselmann
Usage: CONFIG+=enforce-install-prefix M_IM_PREFIX=my_prefix
Used for testing to ensure that every installed file
exists underneath my_prefix, also those that have their
destination typically decided by the location of other
software like DBus, Qt and Gtk+.

6 years agoFixes: Copy/paste error in GTK+ 2 im cache update for Fedora
Jon Nordby [Mon, 5 Dec 2011 15:29:21 +0000 (16:29 +0100)]
Fixes: Copy/paste error in GTK+ 2 im cache update for Fedora

RevBy: Michael Hasselmann
Most likely had no negative effect, but still wrong.

6 years agoChanges: Bump version to
Michael Hasselmann [Wed, 7 Dec 2011 16:48:58 +0000 (17:48 +0100)]
Changes: Bump version to

6 years agoFixes: Build failure in GTK+ IC on older dbus-glib
Jon Nordby [Wed, 7 Dec 2011 15:41:16 +0000 (16:41 +0100)]
Fixes: Build failure in GTK+ IC on older dbus-glib

RevBy: Michael Hasselmann
Use a gpointer instead of typedeffing the DBusGConnection,
as the struct has different names on older dbus-glib version,
leading to build failure:

/usr/include/dbus-1.0/dbus/dbus-glib.h:38:33: error: redefinition of typedef 'DBusGConnection'
meego-imcontext-dbus.h:28:33: note: previous declaration of 'DBusGConnection' was here

Introduced by 0901b5450be6afa109c1fcc3932d26aa233d4b1f

6 years agoChanges: Bump version to 0.81.1
Michael Hasselmann [Wed, 7 Dec 2011 15:08:31 +0000 (16:08 +0100)]
Changes: Bump version to 0.81.1

6 years agoAbort server if no plugins found
Jan Arne Petersen [Mon, 5 Dec 2011 15:40:13 +0000 (16:40 +0100)]
Abort server if no plugins found

RevBy: Michael Hasselmann
Currently plugins are only loaded at start of the server so it does not
make sense to run the server without any plugins. Therefore abort
maliit-server if there are no plugins found.

6 years agoChanges: Use a static, non-installed lib for common GTK+ IC code
Jon Nordby [Mon, 5 Dec 2011 13:36:44 +0000 (14:36 +0100)]
Changes: Use a static, non-installed lib for common GTK+ IC code

RevBy: Jan Arne Petersen
The library is not public, so this simplifies things a bit
for packagers. Also rename to include gtk in the name,
to better illustrate its purpose/usage.

6 years agoUpdate NEWS
Michael Hasselmann [Fri, 2 Dec 2011 23:57:20 +0000 (00:57 +0100)]
Update NEWS

RevBy: TrustMe

6 years agoNew: M_IM_PLUGINS_DATA_DIR variable to give plugins distinct data directories
Michael Hasselmann [Fri, 2 Dec 2011 23:50:03 +0000 (00:50 +0100)]
New: M_IM_PLUGINS_DATA_DIR variable to give plugins distinct data directories

RevBy: Jan Arne Petersen
Plugins can install packages and data in /usr/share/maliit/plugins.  The prefix
(which is also added to the QML import path) can be queried through
"$ pkg-config --variable pluginsdatadir maliit-plugins-0.80".

6 years agoOnly allow to start one maliit-server per session
Jan Arne Petersen [Mon, 5 Dec 2011 14:17:03 +0000 (15:17 +0100)]
Only allow to start one maliit-server per session

RevBy: Jon Nordby
Check if org.maliit.server service is already registered and exit if it

Fixes: MALIIT#48

MALIIT#48 - It is possible to have more than one maliit-server per

6 years agoUnfocus Gtk+ widget if VKB is swiped down.
Krzesimir Nowak [Mon, 5 Dec 2011 13:18:54 +0000 (14:18 +0100)]
Unfocus Gtk+ widget if VKB is swiped down.

Fixes: MALIIT#31 - On closing IM with GTK+ applications, user
has to unfocus manually to be able to invoke IM again.
RevBy: Jon Nordby

6 years agoUse QtWidgets in addition for examples in Qt 5
Jan Arne Petersen [Thu, 1 Dec 2011 15:10:04 +0000 (16:10 +0100)]
Use QtWidgets in addition for examples in Qt 5

RevBy: Michael Hasselmann, Jon Nordby
Currently we require QtWidgets in addition to QtGui in Qt 5. So add it
to the QT build option for Qt 5.

6 years agoUse QtWidgets in addition to QtGui in Qt 5
Jan Arne Petersen [Thu, 1 Dec 2011 15:12:27 +0000 (16:12 +0100)]
Use QtWidgets in addition to QtGui in Qt 5

RevBy: Michael Hasselmann, Jon Nordby
Currently we require QtWidgets in addition to QtGui in Qt 5. So add a
QT_WIDGETS build option to config.pri which contains gui for Qt 4 and
gui widgets for Qt 5. Use QT_WIDGETS wherever we require it (except
examples, see next commit).

6 years agoDo not build the Qt input context on Qt 5
Jan Arne Petersen [Thu, 1 Dec 2011 15:07:54 +0000 (16:07 +0100)]
Do not build the Qt input context on Qt 5

RevBy: Michael Hasselmann, Jon Nordby
There is a new platform input system in Qt 5 so do not build the Qt 4
input context on Qt 5. Also do not build the related tests.

6 years agoDo not set the input context in example in Qt 5
Jan Arne Petersen [Thu, 1 Dec 2011 15:06:02 +0000 (16:06 +0100)]
Do not set the input context in example in Qt 5

RevBy: Michael Hasselmann, Jon Nordby
There is no QInputContextFactory anymore in Qt 5 so do not explicitly set
the input context there.

6 years agoUse static method call QApplication::desktop()
Jan Arne Petersen [Thu, 1 Dec 2011 15:02:34 +0000 (16:02 +0100)]
Use static method call QApplication::desktop()

RevBy: Michael Hasselmann, Jon Nordby
Instead of calling desktop() from qApp instance, just call the static
QApplication::desktop() function.

6 years agoRemove unneccesary QX11Info includes in examples
Jan Arne Petersen [Thu, 1 Dec 2011 15:00:23 +0000 (16:00 +0100)]
Remove unneccesary QX11Info includes in examples

RevBy: Michael Hasselmann, Jon Nordby

6 years agoUse individual includes in examples
Jan Arne Petersen [Thu, 1 Dec 2011 14:57:23 +0000 (15:57 +0100)]
Use individual includes in examples

RevBy: Michael Hasselmann, Jon Nordby
Do not include QtGui but instead use individual includes. Allows to also
work in Qt 5 where widgets are moved from QtGui to QtWidgets.

6 years agoUse ::const_iterator when required
Jan Arne Petersen [Thu, 1 Dec 2011 14:52:28 +0000 (15:52 +0100)]
Use ::const_iterator when required

RevBy: Michael Hasselmann, Jon Nordby
Use AttributeExtensionContainer::const_iterator instead of
AttributeExtensionContainer::iterator in const methods.

6 years agoAdd support for Qt 5 in Maliit::InputMethod
Jan Arne Petersen [Thu, 1 Dec 2011 14:40:08 +0000 (15:40 +0100)]
Add support for Qt 5 in Maliit::InputMethod

RevBy: Michael Hasselmann, Jon Nordby
Use QInputPanel on Qt 5 to show/hide the input panel.

6 years agoChanges: Added LD_LIBRARY_PATH to find for tests
Rakesh Cherian [Fri, 2 Dec 2011 11:49:34 +0000 (13:49 +0200)]
Changes: Added LD_LIBRARY_PATH to find for tests

RevBy: TrustMe

6 years agoFix dependency errors in
Jan Arne Petersen [Thu, 1 Dec 2011 09:19:54 +0000 (10:19 +0100)]
Fix dependency errors in

RevBy: TrustMe
Fix wrong dependencies in which brake make install.

6 years agoRemove* files on make clean in helloworld example
Jon Nordby [Wed, 30 Nov 2011 23:53:24 +0000 (00:53 +0100)]
Remove* files on make clean in helloworld example

RevBy: TrustMe

6 years agoFixes: MALIIT#33 - maliit-sdk make clean fix and .obj/.moc removal
Luis Araujo [Wed, 30 Nov 2011 23:36:33 +0000 (00:36 +0100)]
Fixes: MALIIT#33 - maliit-sdk make clean fix and .obj/.moc removal

RevBy: Jon Nordby

6 years agoUse a lib template and extra compiler for sdk
Jan Arne Petersen [Wed, 30 Nov 2011 15:30:56 +0000 (16:30 +0100)]
Use a lib template and extra compiler for sdk

RevBy: Jon Nordby
Change sdk from extra target to extra compiler and add a dummy lib
target instead of the subdirs template. Fixes MALIIT#16.

MALIIT#16 - root owned directory ./sdk/build/maliit-sdk is created on
make install

6 years agoUse a lib template and extra compiler for doc
Jan Arne Petersen [Wed, 30 Nov 2011 15:29:40 +0000 (16:29 +0100)]
Use a lib template and extra compiler for doc

RevBy: Jon Nordby
Change doc from extra target to extra compiler and add a dummy lib
target. Fixes build warnings.

6 years agoAdd missing strings.h include to debug.c
Jan Arne Petersen [Wed, 30 Nov 2011 15:28:49 +0000 (16:28 +0100)]
Add missing strings.h include to debug.c

RevBy: Jon Nordby
Add strings.h include to debug.c to fix a build warning.

6 years agoCompile MImMeegoIndicator only in legacy mode
Jan Arne Petersen [Fri, 25 Nov 2011 23:28:19 +0000 (00:28 +0100)]
Compile MImMeegoIndicator only in legacy mode

RevBy: Jon Nordby
MImMeegoIndicator is currently only used on Harmattan so compile and use
it only in legacy mode.

6 years agoAdd new MIndicatorServiceClient class
Jan Arne Petersen [Fri, 25 Nov 2011 23:10:14 +0000 (00:10 +0100)]
Add new MIndicatorServiceClient class

RevBy: Jon Nordby
Allows different indicator implementations for different platforms. Also
use new Maliit::InputModeIndicator enum instead of the legacy
MInputMethod::InputModeIndicator one.

6 years agoMove Meego specific indicator into different file
Jan Arne Petersen [Fri, 25 Nov 2011 16:27:45 +0000 (17:27 +0100)]
Move Meego specific indicator into different file

RevBy: Jon Nordby
Move mindicatorserviceclient.* away to make room for a new file (see
commits after this).

6 years agoStandardized debug output for Maliit - NEWS
Jan Arne Petersen [Tue, 29 Nov 2011 14:27:12 +0000 (15:27 +0100)]
Standardized debug output for Maliit - NEWS

RevBy: Jon Nordby
Update the NEWS file to add information about the new MALIIT_DEBUG
environment variable.

MALIIT#32 - Inconsistent logging from Maliit server, Maliit GTK+ and
Maliit Qt IM