From f52634f4f41243105d0ac3ade3558c1bbff014c7 Mon Sep 17 00:00:00 2001 From: Kevin Krammer Date: Wed, 29 Feb 2012 16:08:38 +0100 Subject: Fixed handling of keyboard info messages. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Country and language values were assigned to in the case of decoding failure but left unchanged in case of success. Thus members mLanguageId and mCountryId remained at "en" and "US" respectively instead of being changed to whatever the keyboard sent. Change-Id: I9f48a55d3c431458426c5c4da8e69600948f219b Reviewed-by: Sean Harmer Reviewed-by: Rafael Roquetto Reviewed-by: Nick Ratelle Reviewed-by: Jørgen Lind --- src/plugins/platforms/blackberry/qbbvirtualkeyboard.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/platforms/blackberry/qbbvirtualkeyboard.cpp b/src/plugins/platforms/blackberry/qbbvirtualkeyboard.cpp index 5e7d1fe..f32d21a 100644 --- a/src/plugins/platforms/blackberry/qbbvirtualkeyboard.cpp +++ b/src/plugins/platforms/blackberry/qbbvirtualkeyboard.cpp @@ -275,15 +275,15 @@ void QBBVirtualKeyboard::handleKeyboardInfoMessage() } if (pps_decoder_get_string(mDecoder, "languageId", &value) != PPS_DECODER_OK) { qCritical("QBBVirtualKeyboard: Keyboard PPS languageId field not found"); - mLanguageId = QString::fromLatin1(value); return; } + mLanguageId = QString::fromLatin1(value); + if (pps_decoder_get_string(mDecoder, "countryId", &value) != PPS_DECODER_OK) { qCritical("QBBVirtualKeyboard: Keyboard PPS size countryId not found"); - mCountryId = QString::fromLatin1(value); return; } - + mCountryId = QString::fromLatin1(value); // HUGE hack, should be removed ASAP. newHeight -= KEYBOARD_SHADOW_HEIGHT; // We want to ignore the 8 pixel shadow above the keyboard. (PR 88400) -- cgit v0.12