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

List:       kde-commits
Subject:    kdelibs/khtml/java
From:       Koos Vriezen <koos.vriezen () xs4all ! nl>
Date:       2003-08-16 14:46:43
[Download RAW message or body]

CVS commit by vriezen: 

No need to query kpasswdserver when using KIO


  M +8 -1      kjavaappletserver.cpp   1.65
  M +3 -1      kjavaappletserver.h   1.28
  M +24 -20    kjavaappletviewer.cpp   1.20


--- kdelibs/khtml/java/kjavaappletserver.cpp  #1.64:1.65
@@ -107,4 +107,5 @@ private:
    KIOJobMap kiojobs;
    bool javaProcessFailed;
+   bool useKIO;
    //int locked_context;
    //QValueList<QByteArray> java_requests;
@@ -268,5 +269,6 @@ void KJavaAppletServer::setupJava( KJava
     }
 
-    if( config.readBoolEntry( "UseKio", false) )
+    d->useKIO = config.readBoolEntry( "UseKio", false);
+    if( d->useKIO )
     {
         p->setSystemProperty( "kjas.useKio", QString::null );
@@ -640,3 +642,8 @@ void KJavaAppletServer::derefObject( QSt
     process->send( KJAS_DEREF_OBJECT, args );
 }
+
+bool KJavaAppletServer::usingKIO() {
+    return d->useKIO;
+}
+
 #include "kjavaappletserver.moc"

--- kdelibs/khtml/java/kjavaappletserver.h  #1.27:1.28
@@ -139,4 +139,6 @@ public:
     bool callMember(QStringList & args, QStringList & ret_args);
     void derefObject(QStringList & args);
+
+    bool usingKIO();
 protected:
     void setupJava( KJavaProcess* p );

--- kdelibs/khtml/java/kjavaappletviewer.cpp  #1.19:1.20
@@ -231,6 +231,9 @@ KJavaAppletViewer::KJavaAppletViewer (QW
     applet->setCodeBase (codebase);
     applet->setAppletClass (classname);
-    applet->setAppletContext (serverMaintainer->getContext (parent, baseurl));
+    KJavaAppletContext * cxt = serverMaintainer->getContext (parent, baseurl);
+    applet->setAppletContext (cxt);
 
+    if (!cxt->getServer ()->usingKIO ()) {
+        /* if this page needs authentication */
     KIO::AuthInfo info;
     QString errorMsg;
@@ -255,4 +258,5 @@ KJavaAppletViewer::KJavaAppletViewer (QW
         applet->setPassword (authResult.password);
         applet->setAuthName (authResult.realmValue);
+        }
     }
 


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