diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-09-21 23:02:21 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-09-22 18:58:25 +0900 |
commit | 10675b72c35bd5bf49a6391a89d5a8561b30f5d0 (patch) | |
tree | ae8673b0db27bf706afdd8f1f2825d0e117fb80e /khotkeys/kcontrol/init.cpp | |
parent | 1a8369c842b0f6a8529918827694abc151ee9c92 (diff) | |
download | tdebase-10675b72c35bd5bf49a6391a89d5a8561b30f5d0.tar.gz tdebase-10675b72c35bd5bf49a6391a89d5a8561b30f5d0.zip |
khotkeys: make sure the kded service is controlled only by the Service Manager in TCC.
Also make sure any changes to Input Action is immediately notified to
the kded service.
This resolves issue #537.
1. Fix kded service startup settings.
In TCC --> Regional & Accessibility --> Input Actions --> General
Settings tab, there was a checkbox to "disable the daemon". This was
either quitting or relaunching khotkeys as a standalone application,
overlapping any choice set in the TCC -> TDE Components --> Service
Manager page.
khotkeys is now launched as a kded service, therefore the aforemention
checkbox is no longer required. If a user choose to manually launch
khotkeys as a standalone application, they can disable it by simply
terminating the application (either by killing it or quitting through
DCOP).
2. Notify Input Actions changes to the kded service
If Input Actions are changed, the changes will be notified to either the
kded service or the standalone khotkeys application, depending on which
of the two is running.
3. the kcm_khotkeys_init library has been removed since it is no longer
necessary.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8da4fdbdbc7635014f83bfa1364dfdadcb00677b)
Diffstat (limited to 'khotkeys/kcontrol/init.cpp')
-rw-r--r-- | khotkeys/kcontrol/init.cpp | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp deleted file mode 100644 index 62abad638..000000000 --- a/khotkeys/kcontrol/init.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/**************************************************************************** - - KHotKeys - - Copyright (C) 1999-2001 Lubos Lunak <l.lunak@kde.org> - - Distributed under the terms of the GNU General Public License version 2. - -****************************************************************************/ - -#define _INIT_CPP_ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <dcopref.h> -#include <tdeapplication.h> -#include <tdeconfig.h> -#include <kdebug.h> -#include <stdlib.h> - -extern "C" -{ - TDE_EXPORT void init_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" ); - } - } -} |