disable_wallet_3.3.patch

来自「konqueror3 embedded版本, KDE环境下的当家浏览器的嵌入式版」· PATCH 代码 · 共 102 行

--- orig/khtml_part.cpp	2004-10-27 16:45:13.845578336 -0300
+++ ./khtml_part.cpp	2004-10-27 16:49:22.425788400 -0300
@@ -6498,6 +6498,7 @@ void KHTMLPart::restoreScrollPosition()
 
 KWallet::Wallet* KHTMLPart::wallet()
 {
+#ifndef KHTML_NO_WALLET
   // ### close wallet after a certain timeout period automatically
   //      No - KWallet already does this based on user preferences. (GS)
   // ### close wallet after screensaver was enabled
@@ -6532,10 +6533,15 @@ KWallet::Wallet* KHTMLPart::wallet()
     }
   }
   return d->m_wallet;
+#else
+  return 0;
+#endif
+
 }
 
 void KHTMLPart::slotWalletClosed()
 {
+#ifndef KHTML_NO_WALLET
   if (d->m_wallet) {
     d->m_wallet->deleteLater();
     d->m_wallet = 0L;
@@ -6546,10 +6552,12 @@ void KHTMLPart::slotWalletClosed()
     delete d->m_statusBarWalletLabel;
     d->m_statusBarWalletLabel = 0L;
   }
+#endif // KHTML_NO_WALLET
 }
 
 void KHTMLPart::launchWalletManager()
 {
+#ifndef KHTML_NO_WALLET
   if (!DCOPClient::mainClient()->isApplicationRegistered("kwalletmanager")) {
     KApplication::startServiceByDesktopName("kwalletmanager_show");
   } else {
@@ -6557,13 +6565,16 @@ void KHTMLPart::launchWalletManager()
     r.send("show");
     r.send("raise");
   }
+#endif // KHTML_NO_WALLET
 }
 
 void KHTMLPart::walletMenu()
 {
+#ifndef KHTML_NO_WALLET
   KPopupMenu *m = new KPopupMenu(0L);
   m->insertItem(i18n("&Close Wallet"), this, SLOT(slotWalletClosed()));
   m->popup(QCursor::pos());
+#endif // KHTML_NO_WALLET
 }
 
 void KHTMLPart::slotToggleCaretMode()
--- orig/html/html_formimpl.cpp	2004-10-27 16:45:40.582513704 -0300
+++ ./html/html_formimpl.cpp	2004-10-27 16:47:43.838775904 -0300
@@ -52,7 +52,9 @@
 #include <kmessagebox.h>
 #include <kapplication.h>
 #include <klocale.h>
+#ifndef KHTML_NO_WALLET
 #include <kwallet.h>
+#endif //KHTML_NO_WALLET
 #include <netaccess.h>
 #include <kfileitem.h>
 #include <qfile.h>
@@ -364,6 +366,7 @@ static QString calculateAutoFillKey(cons
 
 void HTMLFormElementImpl::doAutoFill()
 {
+#ifndef KHTML_NO_WALLET
     QString key = calculateAutoFillKey(*this);
 
     if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
@@ -394,6 +397,7 @@ void HTMLFormElementImpl::doAutoFill()
             }
         }
     }
+#endif //KHTML_NO_WALLET
 }
 
 void HTMLFormElementImpl::submitFromKeyboard()
@@ -488,6 +492,7 @@ void HTMLFormElementImpl::submit(  )
                     haveTextarea = true;
         }
 
+#ifndef KHTML_NO_WALLET
         QString key = calculateAutoFillKey(*this);
         bool doesnotexist = KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
                                                              KWallet::Wallet::FormDataFolder(), key);
@@ -543,7 +548,7 @@ void HTMLFormElementImpl::submit(  )
                 }
             }
         }
-
+#endif //KHTML_NO_WALLET
         DOMString url(khtml::parseURL(getAttribute(ATTR_ACTION)));
         if(m_post) {
             view->part()->submitForm( "post", url.string(), form_data,