Merge lp:~thomas-moenicke/phablet-extras/maliit-framework-git into lp:~sergiusens/phablet-extras/maliit-framework-packaging

[Thomas Moenicke]

  fixed string in json file, should be maliitphablet in order to pick the right plugin

  fixed string in json file, should be maliitphablet in order to pick the right plugin

=== modified file 'debian/patches/0001-rename_input_context.patch'
--- debian/patches/0001-rename_input_context.patch	2013-07-12 19:19:12 +0000
+++ debian/patches/0001-rename_input_context.patch	2013-07-16 10:40:31 +0000
@@ -4,8 +4,8 @@
 
 Index: maliit-framework-0.99+git20130702+97e8335/input-context/input-context.pro
 ===================================================================
---- maliit-framework-0.99+git20130702+97e8335.orig/input-context/input-context.pro	2013-07-04 15:28:02.656372642 -0300
-+++ maliit-framework-0.99+git20130702+97e8335/input-context/input-context.pro	2013-07-04 15:35:43.648353255 -0300
+--- maliit-framework-0.99+git20130702+97e8335.orig/input-context/input-context.pro	2013-07-16 09:57:37.000000000 +0000
++++ maliit-framework-0.99+git20130702+97e8335/input-context/input-context.pro	2013-07-16 09:57:37.000000000 +0000
 @@ -5,7 +5,7 @@
  QT += dbus gui-private quick
  TEMPLATE = lib
@@ -17,8 +17,8 @@
  
 Index: maliit-framework-0.99+git20130702+97e8335/input-context/main.cpp
 ===================================================================
---- maliit-framework-0.99+git20130702+97e8335.orig/input-context/main.cpp	2013-07-04 15:28:02.656372642 -0300
-+++ maliit-framework-0.99+git20130702+97e8335/input-context/main.cpp	2013-07-04 15:35:17.344354362 -0300
+--- maliit-framework-0.99+git20130702+97e8335.orig/input-context/main.cpp	2013-07-16 09:57:37.000000000 +0000
++++ maliit-framework-0.99+git20130702+97e8335/input-context/main.cpp	2013-07-16 09:57:37.000000000 +0000
 @@ -32,7 +32,7 @@
  {
      Q_UNUSED(paramList);
@@ -28,3 +28,14 @@
          return new MInputContext;
      }
      return 0;
+
+
+Index: maliit-framework-0.99+git20130702+97e8335/input-context/maliit.json
+===================================================================
+--- maliit-framework-0.99+git20130702+97e8335.orig/input-context/maliit.json	2013-07-16 10:28:11.000000000 +0000
++++ maliit-framework-0.99+git20130702+97e8335/input-context/maliit.json		2013-07-16 10:29:24.000000000 +0000
+@@ -1,3 +1,3 @@
+ {
+-    "Keys": [ "maliit" ]
++    "Keys": [ "maliitphablet" ]
+ }

=== added file 'debian/patches/0004-fix_activationlostevent.patch'
--- debian/patches/0004-fix_activationlostevent.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0004-fix_activationlostevent.patch	2013-07-16 10:40:31 +0000
@@ -0,0 +1,19 @@
+Index: maliit-framework/input-context/minputcontext.cpp
+===================================================================
+--- maliit-framework.orig/input-context/minputcontext.cpp	2013-07-05 14:03:09.713553608 +0200
++++ maliit-framework/input-context/minputcontext.cpp	2013-07-12 17:16:31.708912452 +0200
+@@ -369,10 +369,14 @@
+ 
+ void MInputContext::activationLostEvent()
+ {
++    if (debug) qDebug() << InputContextName << "in" << __PRETTY_FUNCTION__;
++
+     // This method is called when activation was gracefully lost.
+     // There is similar cleaning up done in onDBusDisconnection.
+     active = false;
+     inputPanelState = InputPanelHidden;
++
++    updateInputMethodArea(QRect());
+ }
+ 
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-05 12:26:51 +0000
+++ debian/patches/series	2013-07-16 10:40:31 +0000
@@ -1,3 +1,4 @@
 0001-rename_input_context.patch
 0002-ubuntu_session_type.patch
 0003-prediction.patch
+0004-fix_activationlostevent.patch