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

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdepim/certmanager
From:       David Faure <faure () kde ! org>
Date:       2005-01-27 15:57:49
Message-ID: 20050127155749.8A5D81D1C8 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Emit a DCOP signal when changing the gpgconf configuration data.
Part of the fix for https://intevation.de/roundup/aegypten/issue296


  M +13 -1     certmanager.cpp   1.106.2.3
  M +8 -1      lib/ui/backendconfigwidget.cpp   1.6.2.1


--- kdepim/certmanager/certmanager.cpp  #1.106.2.2:1.106.2.3
@@ -59,4 +59,5 @@
 #include <kleo/hierarchicalkeylistjob.h>
 #include <kleo/refreshkeysjob.h>
+#include <kleo/cryptoconfig.h>
 
 #include <ui/progressdialog.h>
@@ -381,5 +382,16 @@ void CertManager::slotConfigureGpgME() {
   if ( config ) {
     Kleo::CryptoConfigDialog dlg( config );
-    dlg.exec();
+
+    int result = dlg.exec();
+
+    // Forget all data parsed from gpgconf, so that we show updated information
+    // when reopening the configuration dialog.
+    config->clear();
+
+    if ( result == QDialog::Accepted )
+    {
+      // Tell other apps (e.g. kmail) that the gpgconf data might have changed
+      kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", QByteArray() );
+    }
   }
 }

--- kdepim/certmanager/lib/ui/backendconfigwidget.cpp  #1.6:1.6.2.1
@@ -46,4 +46,6 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
+#include <kapplication.h>
+#include <dcopclient.h>
 
 #include <qpushbutton.h>
@@ -304,5 +306,10 @@ void Kleo::BackendConfigWidget::slotConf
   if ( backend && backend->config() ) {
     Kleo::CryptoConfigDialog dlg( backend->config() );
-    dlg.exec();
+    int result = dlg.exec();
+    if ( result == QDialog::Accepted )
+    {
+      // Tell other users of gpgconf (e.g. the s/mime page) that the gpgconf data might have changed
+      kapp->dcopClient()->emitDCOPSignal( "KPIM::CryptoConfig", "changed()", QByteArray() );
+    }
   }
   else // shouldn't happen, button is disabled


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