diff options
Diffstat (limited to 'khotkeys/kcontrol')
| -rw-r--r-- | khotkeys/kcontrol/CMakeL10n.txt | 7 | ||||
| -rw-r--r-- | khotkeys/kcontrol/init.cpp | 31 |
2 files changed, 12 insertions, 26 deletions
diff --git a/khotkeys/kcontrol/CMakeL10n.txt b/khotkeys/kcontrol/CMakeL10n.txt deleted file mode 100644 index a51e4afa8..000000000 --- a/khotkeys/kcontrol/CMakeL10n.txt +++ /dev/null @@ -1,7 +0,0 @@ -##### create translation templates ############## - -tde_l10n_create_template( - CATALOG "desktop_files/khotkeys.desktop/" - SOURCES khotkeys.desktop - DESTINATION "${CMAKE_SOURCE_DIR}/translations" -) diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index 14a9c964b..62abad638 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/khotkeys/kcontrol/init.cpp @@ -24,24 +24,17 @@ extern "C" { TDE_EXPORT void init_khotkeys() { - TDEConfig cfg( "khotkeysrc", true ); - cfg.setGroup( "Main" ); - if( !cfg.readBoolEntry( "Autostart", false )) - return; - // Non-xinerama multhead support in KDE is just a hack - // involving forking apps per-screen. Don't bother with - // kded modules in such case. - TQCString multiHead = getenv("TDE_MULTIHEAD"); - if (multiHead.lower() == "true") - kapp->tdeinitExec( "khotkeys" ); - else - { - DCOPRef ref( "kded", "kded" ); - if( !ref.call( "loadModule", TQCString( "khotkeys" ))) - { - kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl; - kapp->tdeinitExec( "khotkeys" ); - } - } + TDEConfig cfg( "khotkeysrc", true ); + cfg.setGroup( "Main" ); + if( !cfg.readBoolEntry( "Autostart", false )) + { + return; + } + DCOPRef ref( "kded", "kded" ); + if( !ref.call( "loadModule", TQCString( "khotkeys" ))) + { + kdWarning( 1217 ) << "Loading of khotkeys module failed." << endl; + kapp->tdeinitExec( "khotkeys" ); + } } } |