Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1357360 into lp:ubuntu-keyboard

[Michael Sheldon]

Fix re-entering pre-edit when in the middle of text containing multiple lines.

Fix re-entering pre-edit when in the middle of text containing multiple lines.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:226
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/472/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/98
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/97/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/97

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'plugins/sr/src/src.pro'
--- plugins/sr/src/src.pro	2014-07-28 18:19:04 +0000
+++ plugins/sr/src/src.pro	2014-09-22 13:24:49 +0000
@@ -22,18 +22,20 @@
 # generate database for presage:
 PLUGIN_INSTALL_PATH = $${UBUNTU_KEYBOARD_LIB_DIR}/sr/
 
-lang_db_sr.path = $$PLUGIN_INSTALL_PATH
 lang_db_sr.commands += \
   rm -f $$PWD/database_sr.db && \
   text2ngram -n 1 -l -f sqlite -o $$PWD/database_sr.db $$PWD/free_ebook.txt && \
   text2ngram -n 2 -l -f sqlite -o $$PWD/database_sr.db $$PWD/free_ebook.txt && \
   text2ngram -n 3 -l -f sqlite -o $$PWD/database_sr.db $$PWD/free_ebook.txt
-
 lang_db_sr.files += $$PWD/database_sr.db
-QMAKE_EXTRA_TARGETS += lang_db_sr
+
+lang_db_sr_install.files += $$PWD/database_sr.db
+lang_db_sr_install.path = $$PLUGIN_INSTALL_PATH
+
+QMAKE_EXTRA_TARGETS += lang_db_sr lang_db_sr_install
 
 target.path = $$PLUGIN_INSTALL_PATH
-INSTALLS += target lang_db_sr
+INSTALLS += target lang_db_sr_install
 
 OTHER_FILES += \
     serbianplugin.json \

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-09-10 14:57:52 +0000
+++ src/view/abstracttexteditor.cpp	2014-09-22 13:24:49 +0000
@@ -1069,9 +1069,7 @@
                 singleBackspace();
             }
 
-            text()->setSurrounding(surroundWithoutPreedit);
-            text()->setSurroundingOffset(position);
-            replaceTextWithPreedit(recreatedPreedit, 0, recreatedPreedit.size(), recreatedPreedit.size());
+            replaceTextWithPreedit(recreatedPreedit, 0, 0, recreatedPreedit.size());
         }
 
     }