[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/certmanager/kwatchgnupg
From:       Laurent Montel <montel () kde ! org>
Date:       2004-09-09 15:51:04
Message-ID: 20040909155104.C6A4E1773 () office ! kde ! org
[Download RAW message or body]

CVS commit by mlaurent: 

Backport compatibility with kdelibs-3.2


  M +7 -1      kwatchgnupgmainwin.cpp   1.16
  M +1 -1      kwatchgnupgmainwin.h   1.8


--- kdepim/certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp  #1.15:1.16
@@ -52,4 +52,5 @@
 #include <qeventloop.h>
 #include <qtimer.h>
+#include <kkeydialog.h>
 
 #define WATCHGNUPGBINARY "watchgnupg"
@@ -100,5 +101,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());
 
@@ -111,4 +112,9 @@ void KWatchGnuPGMainWindow::createAction
 }
 
+void KWatchGnuPGMainWindow::configureShortcuts()
+{
+  KKeyDialog::configure( actionCollection(), this );
+}
+
 void KWatchGnuPGMainWindow::slotConfigureToolbars()
 {

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


[prev in list] [next in list] [prev in thread] [next in thread]