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

List:       kde-bugs-dist
Subject:    [Bug 54121] security certificate not stored "forever"
From:       George Staikos <staikos () kde ! org>
Date:       2003-03-10 3:21:55
[Download RAW message or body]

------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
     
http://bugs.kde.org/show_bug.cgi?id=54121     
staikos@kde.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From staikos@kde.org  2003-03-10 04:21 -------
Subject: kdebase/kcontrol/konqhtml

CVS commit by staikos: 

Make "cancel" work.

CCMAIL: 54121-done@bugs.kde.org


  M +8 -3      pluginopts.cpp   1.24


--- kdebase/kcontrol/konqhtml/pluginopts.cpp  #1.23:1.24
@@ -259,6 +259,4 @@ void KPluginOptions::scan()
     }
 
-    // find nspluginscan executable
-    m_progress = new QProgressDialog( i18n("Scanning for plugins"), i18n("Cancel"), 100, this );
     KProcIO* nspluginscan = new KProcIO;
     QString scanExe = KGlobal::dirs()->findExe("nspluginscan");
@@ -272,4 +270,7 @@ void KPluginOptions::scan()
         return;
     }
+
+    // find nspluginscan executable
+    m_progress = new QProgressDialog( i18n("Scanning for plugins"), i18n("Cancel"), 100, this );
     m_progress->setProgress( 5 );
 
@@ -281,4 +282,6 @@ void KPluginOptions::scan()
     connect(nspluginscan, SIGNAL(processExited(KProcess *)),
             this, SLOT(scanDone()));
+    connect(m_progress, SIGNAL(cancelled()), this, SLOT(scanDone()));
+
     if (nspluginscan->start())
        kapp->enter_loop();
@@ -290,4 +293,5 @@ void KPluginOptions::scan()
     load();
     delete m_progress;
+    m_progress = 0;
 }
 
@@ -295,5 +299,6 @@ void KPluginOptions::progress(KProcIO *p
 {
     QString line;
-    while(proc->readln(line) > 0);
+    while(proc->readln(line) > 0)
+        ;
     m_progress->setProgress(line.stripWhiteSpace().toInt());
 }
[prev in list] [next in list] [prev in thread] [next in thread]