diff --git a/kcms/keyboard/keyboard_daemon.cpp b/kcms/keyboard/keyboard_daemon.cpp --- a/kcms/keyboard/keyboard_daemon.cpp +++ b/kcms/keyboard/keyboard_daemon.cpp @@ -93,9 +93,6 @@ init_keyboard_hardware(); keyboardConfig.load(); - if( keyboardConfig.configureLayouts ) { - XkbHelper::preInitialize(); - } XkbHelper::initializeKeyboardLayouts(keyboardConfig); layoutMemory.configChanged(); diff --git a/kcms/keyboard/xkb_helper.h b/kcms/keyboard/xkb_helper.h --- a/kcms/keyboard/xkb_helper.h +++ b/kcms/keyboard/xkb_helper.h @@ -30,7 +30,6 @@ static bool initializeKeyboardLayouts(KeyboardConfig& config); static bool initializeKeyboardLayouts(const QList& layouts); static bool runConfigLayoutCommand(const QStringList& setxkbmapCommandArguments); - static bool preInitialize(); }; #endif /* XKB_HELPER_H_ */ diff --git a/kcms/keyboard/xkb_helper.cpp b/kcms/keyboard/xkb_helper.cpp --- a/kcms/keyboard/xkb_helper.cpp +++ b/kcms/keyboard/xkb_helper.cpp @@ -182,24 +182,3 @@ } return false; } - -bool XkbHelper::preInitialize() -{ - // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module - - QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus")); - if( ibusExe.isEmpty() ) { - return 0; - } - - KProcess ibusProcess; - ibusProcess << ibusExe << QStringLiteral("exit"); - ibusProcess.setOutputChannelMode(KProcess::SeparateChannels); - int res = ibusProcess.execute(); - - if( res == 0 ) { - qCWarning(KCM_KEYBOARD) << "ibus successfully stopped"; - } - - return 0; -}