File httpslave-r3-kdebase-3.5.7.diff of Package kdebase3

Overview Repositories Revisions Requests Users Attributes Meta

File httpslave-r3-kdebase-3.5.7.diff of Package kdebase3

--- kdebase-3.5.7/libkonq/favicons/favicons.cpp.orig	2005-10-10 17:04:21.000000000 +0200
+++ kdebase-3.5.7/libkonq/favicons/favicons.cpp	2007-06-01 22:48:58.000000000 +0200
@@ -63,7 +63,7 @@
     d->faviconsDir.truncate(d->faviconsDir.length()-9); // Strip off "favicons/"
     d->metaData.insert("ssl_no_client_cert", "TRUE");
     d->metaData.insert("ssl_militant", "TRUE");
-    d->metaData.insert("UseCache", "false");
+//     d->metaData.insert("UseCache", "false");
     d->metaData.insert("cookies", "none");
     d->metaData.insert("no-auth", "true");
     d->config = new KSimpleConfig(locateLocal("data", "konqueror/faviconrc"));
--- kdebase-3.5.7/kcontrol/kio/cache_ui.ui.orig	2005-09-10 10:25:10.000000000 +0200
+++ kdebase-3.5.7/kcontrol/kio/cache_ui.ui	2007-06-01 22:48:58.000000000 +0200
@@ -133,6 +133,17 @@
                 </widget>
                 <widget class="QRadioButton">
                     <property name="name">
+                        <cstring>rbCacheIfNotExpired</cstring>
+                    </property>
+                    <property name="text">
+                        <string>&amp;Update cache if expired</string>
+                    </property>
+                    <property name="whatsThis" stdset="0">
+                        <string>Refetch a cached web page if it has expired. A webserver may assign an expiration date; if it does not, the expiration time is set to three minutes. You can still use the reload button to get an up-to-date web page.</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton">
+                    <property name="name">
                         <cstring>rbCacheIfPossible</cstring>
                     </property>
                     <property name="text">
--- kdebase-3.5.7/kcontrol/kio/cache.cpp.orig	2005-10-10 17:03:48.000000000 +0200
+++ kdebase-3.5.7/kcontrol/kio/cache.cpp	2007-06-01 22:48:58.000000000 +0200
@@ -56,14 +56,25 @@
 
   KIO::CacheControl cc = KProtocolManager::cacheControl();
 
-  if (cc==KIO::CC_Verify)
+    switch( cc ) {
+        case KIO::CC_Refresh:
       m_dlg->rbVerifyCache->setChecked( true );
-  else if (cc==KIO::CC_Refresh)
-      m_dlg->rbVerifyCache->setChecked( true );
-  else if (cc==KIO::CC_CacheOnly)
-      m_dlg->rbOfflineMode->setChecked( true );
-  else if (cc==KIO::CC_Cache)
+            break;
+        case KIO::CC_Verify:
+            m_dlg->rbCacheIfNotExpired->setChecked( true );
+            break;
+        case KIO::CC_Cache:
       m_dlg->rbCacheIfPossible->setChecked( true );
+            break;
+        case KIO::CC_CacheOnly:
+            m_dlg->rbOfflineMode->setChecked( true );
+            break;
+        default:
+            m_dlg->rbVerifyCache->setChecked( false );
+            m_dlg->rbCacheIfPossible->setChecked( false );
+            m_dlg->rbOfflineMode->setChecked( false );
+            break;  // Don't select any box
+    }
 
   // Config changed notifications...
   connect ( m_dlg->cbUseCache, SIGNAL(toggled(bool)), SLOT(configChanged()) );
@@ -80,12 +91,16 @@
 
   if ( !m_dlg->cbUseCache->isChecked() )
       KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
-  else if ( m_dlg->rbVerifyCache->isChecked() )
+  else {
+    if ( m_dlg->rbVerifyCache->isChecked() )
       KSaveIOConfig::setCacheControl(KIO::CC_Refresh);
-  else if ( m_dlg->rbOfflineMode->isChecked() )
-      KSaveIOConfig::setCacheControl(KIO::CC_CacheOnly);
+    else if ( m_dlg->rbCacheIfNotExpired->isChecked() )
+      KSaveIOConfig::setCacheControl(KIO::CC_Verify);
   else if ( m_dlg->rbCacheIfPossible->isChecked() )
       KSaveIOConfig::setCacheControl(KIO::CC_Cache);
+    else if ( m_dlg->rbOfflineMode->isChecked() )
+      KSaveIOConfig::setCacheControl(KIO::CC_CacheOnly);
+  }
 
   // Update running io-slaves...
   KSaveIOConfig::updateRunningIOSlaves (this);

Places

File httpslave-r3-kdebase-3.5.7.diff of Package kdebase3

Places