Various fixes for khotkeys. This resolves issue #326.

1. ensure there is a single khotkeys instance running per session
   instead of per screen (remote multihead related code)
2. allow khotkeys to be run as a kded module
3. make sure that khotkeys run either as a standalone application or as
   a kded module, but not both at the same time
4. do not register khotkeys as a main DCOP entry (like an app) anymore.
   When run as kded module, this was causing kded to be registered as
   khotkeys a second time.

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 94368f4722fa8eae1f7e7cd4b02679a760b0d620)

1 files changed, 4 insertions, 4 deletions

diff --git a/khotkeys/app/kded.h b/khotkeys/app/kded.h
index b2740a3a1..026087abe 100644
--- a/khotkeys/app/kded.h
+++ b/khotkeys/app/kded.h
@@ -12,27 +12,27 @@
 #define _KHOTKEYS_KDED_H_
 
 #include <kdedmodule.h>
-#include <dcopclient.h>
 
 namespace KHotKeys
 {
 
 class Action_data_group;
 
-class KHotKeysModule
-    : public KDEDModule
+class KHotKeysModule : public KDEDModule
     {
     TQ_OBJECT
     K_DCOP
+
     k_dcop:
         ASYNC reread_configuration();
         ASYNC quit(); 
+
     public:
         KHotKeysModule( const TQCString& obj );
         virtual ~KHotKeysModule();
+
     private:
         Action_data_group* actions_root;
-        DCOPClient client;
     };
 
 //***************************************************************************