disable_wallet_3.4.patch

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

--- khtml_part.cpp.orig	2005-03-01 18:53:20.856410765 +0100
+++ khtml_part.cpp	2005-03-01 18:56:57.247322571 +0100
@@ -6921,6 +6921,7 @@ void KHTMLPart::restoreScrollPosition()
 
 void KHTMLPart::openWallet(DOM::HTMLFormElementImpl *form)
 {
+#ifndef KHTML_NO_WALLET
   KHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
@@ -6956,11 +6957,13 @@ void KHTMLPart::openWallet(DOM::HTMLForm
   }
   assert(form);
   d->m_wq->callers.append(KHTMLWalletQueue::Caller(form, form->getDocument()));
+#endif // KHTML_NO_WALLET
 }
 
 
 void KHTMLPart::saveToWallet(const QString& key, const QMap<QString,QString>& data)
 {
+#ifndef KHTML_NO_WALLET
   KHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
@@ -6995,10 +6998,12 @@ void KHTMLPart::saveToWallet(const QStri
     connect(d->m_wq, SIGNAL(walletOpened(KWallet::Wallet*)), this, SLOT(walletOpened(KWallet::Wallet*)));
   }
   d->m_wq->savers.append(qMakePair(key, data));
+#endif // KHTML_NO_WALLET
 }
 
 
 void KHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) {
+#ifndef KHTML_NO_WALLET
   KHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
@@ -7012,10 +7017,12 @@ void KHTMLPart::dequeueWallet(DOM::HTMLF
   if (d->m_wq) {
     d->m_wq->callers.remove(KHTMLWalletQueue::Caller(form, form->getDocument()));
   }
+#endif // KHTML_NO_WALLET
 }
 
 
 void KHTMLPart::walletOpened(KWallet::Wallet *wallet) {
+#ifndef KHTML_NO_WALLET
   assert(!d->m_wallet);
   assert(d->m_wq);
 
@@ -7044,11 +7051,13 @@ void KHTMLPart::walletOpened(KWallet::Wa
     QToolTip::remove(d->m_statusBarWalletLabel);
   }
   QToolTip::add(d->m_statusBarWalletLabel, i18n("The wallet '%1' is open and being used for form data and passwords.").arg(KWallet::Wallet::NetworkWallet()));
+#endif // KHTML_NO_WALLET
 }
 
 
 KWallet::Wallet *KHTMLPart::wallet()
 {
+#ifndef KHTML_NO_WALLET
   KHTMLPart *p;
 
   for (p = parentPart(); p && p->parentPart(); p = p->parentPart())
@@ -7057,12 +7066,14 @@ KWallet::Wallet *KHTMLPart::wallet()
   if (p)
     return p->wallet();
 
+#endif // KHTML_NO_WALLET
   return d->m_wallet;
 }
 
 
 void KHTMLPart::slotWalletClosed()
 {
+#ifndef KHTML_NO_WALLET
   if (d->m_wallet) {
     d->m_wallet->deleteLater();
     d->m_wallet = 0L;
@@ -7073,10 +7084,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 {
@@ -7084,13 +7097,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()
--- /home/lmonta/kde/kdelibs-34/khtml/html/html_formimpl.cpp	2005-02-20 18:36:46.000000000 +0100
+++ html/html_formimpl.cpp	2005-03-02 17:38:15.771106600 +0100
@@ -420,6 +420,7 @@ static QString calculateAutoFillKey(cons
 
 void HTMLFormElementImpl::doAutoFill()
 {
+#ifndef KHTML_NO_WALLET
     const QString key = calculateAutoFillKey(*this);
 
     if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
@@ -429,10 +430,12 @@ void HTMLFormElementImpl::doAutoFill()
 
     // assert(view())
     getDocument()->view()->part()->openWallet(this);
+#endif // KHTML_NO_WALLET
 }
 
 
 void HTMLFormElementImpl::walletOpened(KWallet::Wallet *w) {
+#ifndef KHTML_NO_WALLET
     assert(w);
     const QString key = calculateAutoFillKey(*this);
     if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) {
@@ -458,6 +461,7 @@ void HTMLFormElementImpl::walletOpened(K
     }
 
     getDocument()->setFocusNode(last);
+#endif // KHTML_NO_WALLET
 }
 
 void HTMLFormElementImpl::submitFromKeyboard()
@@ -496,6 +500,7 @@ void HTMLFormElementImpl::submitFromKeyb
 
 void HTMLFormElementImpl::gatherWalletData()
 {
+#ifndef KHTML_NO_WALLET
     KHTMLView* const view = getDocument()->view();
     // check if we have any password input's
     m_walletMap.clear();
@@ -519,6 +524,7 @@ void HTMLFormElementImpl::gatherWalletDa
                 m_haveTextarea = true;
         }
     }
+#endif // KHTML_NO_WALLET
 }
 
 
@@ -592,6 +598,7 @@ void HTMLFormElementImpl::submit(  )
                 }
             }
 
+#ifndef KHTML_NO_WALLET
             if ( doesnotexist || !w || login_changed ) {
                 // TODO use KMessageBox::questionYesNoCancel() again, if you can pass a KGuiItem for Cancel
                 KDialogBase* const dialog = new KDialogBase(i18n("Save Login Information"),
@@ -619,6 +626,7 @@ void HTMLFormElementImpl::submit(  )
                     view->addNonPasswordStorableSite(formUrl.host());
                 }
             }
+#endif // KHTML_NO_WALLET
         }
 
         const DOMString url(khtml::parseURL(getAttribute(ATTR_ACTION)));