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

List:       kde-commits
Subject:    kdewebdev
From:       Andras Mantia <amantia () kde ! org>
Date:       2004-12-19 12:46:45
Message-ID: 20041219124645.E73351BA3A () office ! kde ! org
[Download RAW message or body]

CVS commit by amantia: 

Don't show the security warning dialogs twice. 
Some memory leak fixes.


  M +4 -3      lib/newstuff/security.cpp   1.3
  M +3 -2      lib/newstuff/security.h   1.3
  M +2 -1      quanta/src/quanta.cpp   1.670
  M +2 -1      quanta/utility/tagaction.cpp   1.117


--- kdewebdev/lib/newstuff/security.cpp  #1.2:1.3
@@ -53,5 +53,5 @@ void Security::readKeys()
     KProcIO *readProcess=new KProcIO();
     *readProcess << \
                "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
                
-    connect(readProcess, SIGNAL(processExited(KProcess *)), this, \
SLOT(slotProcessExited())); +    connect(readProcess, SIGNAL(processExited(KProcess \
                *)), this, SLOT(slotProcessExited(KProcess *)));
     connect(readProcess, SIGNAL(readReady(KProcIO *)) ,this, \
SLOT(slotDataArrived(KProcIO *)));  if (!readProcess->start(KProcess::NotifyOnExit, \
true)) @@ -61,5 +61,5 @@ void Security::readKeys()
 }
 
-void Security::slotProcessExited()
+void Security::slotProcessExited(KProcess *process)
 {
    switch (m_runMode)
@@ -72,4 +72,5 @@ void Security::slotProcessExited()
    }
    m_gpgRunning = false;
+   delete process;
 /*
    QMap<QString, KeyStruct>::Iterator it;
@@ -181,5 +182,5 @@ void Security::checkValidity(const QStri
   KProcIO *verifyProcess=new KProcIO();
   *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" \
                << f.dirPath() + "/signature"<< filename;
-  connect(verifyProcess, SIGNAL(processExited(KProcess *)),this, \
SLOT(slotProcessExited())); +  connect(verifyProcess, SIGNAL(processExited(KProcess \
*)),this, SLOT(slotProcessExited(KProcess *)));  connect(verifyProcess, \
SIGNAL(readReady(KProcIO *)),this, SLOT(slotDataArrived(KProcIO *)));  if \
(verifyProcess->start(KProcess::NotifyOnExit,true))

--- kdewebdev/lib/newstuff/security.h  #1.2:1.3
@@ -23,4 +23,5 @@
 
 class KProcIO;
+class KProcess;
 
 struct KeyStruct {
@@ -91,6 +92,6 @@ private:
 
 private slots:
-   void slotProcessExited();
-   void slotDataArrived(KProcIO *);
+   void slotProcessExited(KProcess *process);
+   void slotDataArrived(KProcIO *process);
 
 signals:

--- kdewebdev/quanta/src/quanta.cpp  #1.669:1.670
@@ -3701,7 +3701,8 @@ void QuantaApp::slotGetScriptError(KProc
 }
 /** Notify when process exits*/
-void QuantaApp::slotProcessExited(KProcess* )
+void QuantaApp::slotProcessExited(KProcess* process)
 {
   slotProcessTimeout();
+  delete process;
 }
 

--- kdewebdev/quanta/utility/tagaction.cpp  #1.116:1.117
@@ -485,5 +485,5 @@ QString TagAction::actionText()
 
 
-void TagAction::slotProcessExited(KProcess *)
+void TagAction::slotProcessExited(KProcess *process)
 {
   if (loopStarted)
@@ -493,4 +493,5 @@ void TagAction::slotProcessExited(KProce
   }
   m_appMessages->showMessage( i18n("The \"%1\" script has \
exited.").arg(actionText()) ); +  delete process;
 }
 


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