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

[Michael Sheldon]

Fix ImhNoAutoUppercase hint behaviour when switching between apps with autocaps and without.

Fix ImhNoAutoUppercase hint behaviour when switching between apps with autocaps and without.

[Michael Sheldon (michael-sheldon)]

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

 * No, although for testing purposes https://code.launchpad.net/~michael-sheldon/ubuntu-terminal-app/disable-autocaps/+merge/240582 is useful

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:234
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/499/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/124

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

review: Approve (continuous-integration)

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-10-07 15:44:46 +0000
+++ src/plugin/inputmethod.cpp	2014-11-04 17:01:37 +0000
@@ -362,6 +362,8 @@
         updateWordEngine();
     }
 
+    updateAutoCaps();
+
     QString text;
     int position;
     bool ok = d->host->surroundingText(text, position);
@@ -369,7 +371,6 @@
         d->editor.text()->setSurrounding(text);
         d->editor.text()->setSurroundingOffset(position);
 
-        updateAutoCaps();
         checkAutocaps();
         d->previous_position = position;
     }