Merge lp:~thomas-moenicke/phablet-extras/maliit-framework-wordengine-on into lp:phablet-extras/maliit-framework

[Thomas Moenicke]

enabled word-engine by default in settings file

enabled word-engine by default in settings file

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

Unmerged revisions

1561. By Thomas Moenicke on 2013-07-19

enabled word-engine by default in settings file

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-12 11:38:03 +0000
+++ debian/changelog	2013-07-19 11:47:37 +0000
@@ -1,3 +1,9 @@
+maliit-framework (0.99.trunk.phablet3) saucy; urgency=low
+
+  * enabled word-engine by default in settings file
+
+ -- Thomas Moenicke <thomas@pachamama>  Fri, 19 Jul 2013 13:39:44 +0200
+
 maliit-framework (0.99.trunk.phablet2) saucy; urgency=low
 
   * fix activationLostEvent: keyboard state should be updated and hidden

=== modified file 'debian/server.conf'
--- debian/server.conf	2013-07-12 11:38:03 +0000
+++ debian/server.conf	2013-07-19 11:47:37 +0000
@@ -2,7 +2,7 @@
 onscreen\active=libmaliit-keyboard-plugin.so:en_us
 
 pluginsettings\libmaliit-keyboard-plugin.so\current_style		= ubuntu
-pluginsettings\libmaliit-keyboard-plugin.so\word_engine_enabled		= false
+pluginsettings\libmaliit-keyboard-plugin.so\word_engine_enabled		= true
 
 onscreen\enabled=libmaliit-keyboard-plugin.so:en_gb, \
 libmaliit-keyboard-plugin.so:en_us, \