From kde-commits  Tue Oct 19 19:37:59 2004
From: Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date: Tue, 19 Oct 2004 19:37:59 +0000
To: kde-commits
Subject: kdepim/certmanager/kwatchgnupg
Message-Id: <20041019193759.478EF16C6D () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=109821468825646

CVS commit by mutz: 

Sorry for ping-pong committing, but Laurent's commit to KDE_3_3_BRANCH is indeed needed here, too. certmanager/* from HEAD is still supposed to run on KDE 3.2... Without this patch, the code compiles, but the "Configure Shortcuts..." action doesn't do anything.


  M +9 -2      kwatchgnupgmainwin.cpp   1.19
  M +1 -1      kwatchgnupgmainwin.h   1.10


--- kdepim/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp  #1.18:1.19
@@ -48,4 +48,6 @@
 #include <kfiledialog.h>
 #include <kedittoolbar.h>
+#include <kkeydialog.h>
+
 #include <qtextedit.h>
 #include <qdir.h>
@@ -67,5 +69,5 @@ KWatchGnuPGMainWindow::KWatchGnuPGMainWi
   setCentralWidget( mCentralWidget );
 
-  mWatcher = new KProcIO( QTextCodec::codecForMib( 106 /*utf8*/ ) );
+  mWatcher = new KProcIO( QTextCodec::codecForMib( 106 /*utf-8*/ ) );
   connect( mWatcher, SIGNAL( processExited(KProcess*) ),
                    this, SLOT( slotWatcherExited() ) );
@@ -101,5 +103,5 @@ void KWatchGnuPGMainWindow::createAction
   (void)KStdAction::quit( this, SLOT(slotQuit()), actionCollection() );
   (void)KStdAction::preferences( this, SLOT(slotConfigure()), actionCollection() );
-  ( void )KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), actionCollection());
+  ( void )KStdAction::keyBindings(this, SLOT(configureShortcuts()), actionCollection());
   ( void )KStdAction::configureToolbars(this, SLOT(slotConfigureToolbars()), actionCollection());
 
@@ -112,4 +114,9 @@ void KWatchGnuPGMainWindow::createAction
 }
 
+void KWatchGnuPGMainWindow::configureShortcuts()
+{
+  KKeyDialog::configure( actionCollection(), this );
+}
+
 void KWatchGnuPGMainWindow::slotConfigureToolbars()
 {

--- kdepim/certmanager/kwatchgnupg/kwatchgnupgmainwin.h  #1.9:1.10
@@ -57,5 +57,5 @@ public slots:
   void slotConfigure();
   void slotConfigureToolbars();
-
+  void configureShortcuts();
   void slotReadConfig();