From 5f30e45d97918a8b006ed3c6f97588f2b49aef8f Mon Sep 17 00:00:00 2001
From: Anatoly Mihalchenko <tolik@scand.com>
Date: Tue, 4 Sep 2012 17:53:33 +0300
Subject: [PATCH] SANKORE-523

Changing the languages of the virtual keyboard crashes the software
---
 src/frameworks/UBPlatformUtils_mac.mm | 5 +++++
 src/gui/UBKeyboardPalette_mac.cpp     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm
index 66191a95..d62e9f2e 100644
--- a/src/frameworks/UBPlatformUtils_mac.mm
+++ b/src/frameworks/UBPlatformUtils_mac.mm
@@ -440,6 +440,9 @@ void UBPlatformUtils::initializeKeyboardLayouts()
     int count = CFArrayGetCount(kbds);
     QList<UBKeyboardLocale*> result;
 
+	qDebug() << "initializeKeyboardLayouts";
+	qDebug() << "Found system locales: " << count;
+
     for(int i=0; i<count; i++)
     {
         TISInputSourceRef keyLayoutRef =  (TISInputSourceRef)CFArrayGetValueAtIndex(kbds, i);
@@ -530,6 +533,8 @@ void UBPlatformUtils::initializeKeyboardLayouts()
         const QString resName = ":/images/flags/" + name + ".png";
         QIcon *iconLang = new QIcon(resName);
 
+		qDebug() << "Locale: " << ID << ", name: " << name;
+
         result.append(new UBKeyboardLocale(fullName, name, ID, iconLang, keybt));
     }
 
diff --git a/src/gui/UBKeyboardPalette_mac.cpp b/src/gui/UBKeyboardPalette_mac.cpp
index 3b179c36..a8ca7c72 100644
--- a/src/gui/UBKeyboardPalette_mac.cpp
+++ b/src/gui/UBKeyboardPalette_mac.cpp
@@ -60,6 +60,7 @@ void UBKeyboardPalette::createCtrlButtons()
 void SetMacLocaleByIdentifier(const QString& id)
 {
 	const char * strName = id.toAscii().data();
+
 	CFStringRef iName = CFStringCreateWithCString(NULL, strName, kCFStringEncodingMacRoman );
 
 	CFStringRef keys[] = { kTISPropertyInputSourceCategory, kTISPropertyInputSourceID };