summaryrefslogtreecommitdiffstats
path: root/kxkb/kxkb.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kxkb/kxkb.cpp')
-rw-r--r--kxkb/kxkb.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp
index bbfa4d87e..3d04824ad 100644
--- a/kxkb/kxkb.cpp
+++ b/kxkb/kxkb.cpp
@@ -106,10 +106,11 @@ int KXKBApp::newInstance()
bool KXKBApp::settingsRead()
{
- XkbOptions options = kxkbConfig.getKXkbOptions();
- if( !m_extension->setXkbOptions(options) ) {
- kdDebug() << "Setting XKB options failed!" << endl;
- }
+ kxkbConfig.load(KxkbConfig::LOAD_ALL);
+ XkbOptions options = kxkbConfig.getKXkbOptions();
+ if (!m_extension->setXkbOptions(options)) {
+ kdWarning() << "Setting XKB options failed!" << endl;
+ }
if ( kxkbConfig.m_useKxkb == false ) {
kapp->quit();
@@ -168,7 +169,7 @@ void KXKBApp::initTray()
{
if (!m_tray)
{
- m_tray = new KxkbSystemTray();
+ m_tray = new KxkbSystemTray(&kxkbConfig);
connect(m_tray, TQ_SIGNAL(menuActivated(int)), this, TQ_SLOT(menuActivated(int)));
connect(m_tray, TQ_SIGNAL(toggled()), this, TQ_SLOT(nextLayout()));
}