diff options
author | Michael Palimaka <kensington@gentoo.org> | 2013-01-28 13:27:21 +0000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2013-01-28 13:27:21 +0000 |
commit | ebb08de0928c61747400121f32987be90c6387dc (patch) | |
tree | 4ef393846dfabca52238c4ab9690771a7121d73e /kde-base/konqueror/files | |
parent | Version bump for the 3.0 series (diff) | |
download | historical-ebb08de0928c61747400121f32987be90c6387dc.tar.gz historical-ebb08de0928c61747400121f32987be90c6387dc.tar.bz2 historical-ebb08de0928c61747400121f32987be90c6387dc.zip |
Remove unused patch.
Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C
Diffstat (limited to 'kde-base/konqueror/files')
-rw-r--r-- | kde-base/konqueror/files/konqueror-4.9.3-crash.patch | 134 |
1 files changed, 0 insertions, 134 deletions
diff --git a/kde-base/konqueror/files/konqueror-4.9.3-crash.patch b/kde-base/konqueror/files/konqueror-4.9.3-crash.patch deleted file mode 100644 index 4a653f083cbb..000000000000 --- a/kde-base/konqueror/files/konqueror-4.9.3-crash.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 71f411a4ee7ba98843b9af81f327b67f8294087f Mon Sep 17 00:00:00 2001 -From: Dawit Alemayehu <adawit@kde.org> -Date: Sat, 10 Nov 2012 16:37:15 -0500 -Subject: [PATCH] Do not crash when global policy is changed and the Apply - button is pressed. - -BUG: 307831 -FIXED-IN: 4.9.4 ---- - konqueror/settings/kio/kcookiespolicies.cpp | 43 ++++++++++++++--------------- - konqueror/settings/kio/kcookiespolicies.h | 2 +- - 2 files changed, 21 insertions(+), 24 deletions(-) - -diff --git a/konqueror/settings/kio/kcookiespolicies.cpp b/konqueror/settings/kio/kcookiespolicies.cpp -index 75d265f..48154d3 100644 ---- a/konqueror/settings/kio/kcookiespolicies.cpp -+++ b/konqueror/settings/kio/kcookiespolicies.cpp -@@ -181,14 +181,13 @@ void KCookiesPolicies::addNewPolicy (const QString& domain) - pdlg.setPolicy (KCookieAdvice::Accept); - - if (pdlg.exec() && !pdlg.domain().isEmpty()) { -- QString domain = tolerantFromAce (pdlg.domain().toLatin1()); -- int advice = pdlg.advice(); -+ const QString domain = tolerantFromAce (pdlg.domain().toLatin1()); -+ const int advice = pdlg.advice(); - - if (!handleDuplicate (domain, advice)) { - const char* strAdvice = KCookieAdvice::adviceToStr (advice); -- QTreeWidgetItem* item = new QTreeWidgetItem (mUi.lvDomainPolicy, -- QStringList() << domain << i18n (strAdvice)); -- m_pDomainPolicy.insert (item, strAdvice); -+ new QTreeWidgetItem (mUi.lvDomainPolicy, QStringList() << domain << i18n (strAdvice)); -+ m_pDomainPolicy.insert (domain, strAdvice); - configChanged(); - } - } -@@ -202,25 +201,24 @@ void KCookiesPolicies::addPressed() - - void KCookiesPolicies::changePressed() - { -- QTreeWidgetItem* index = mUi.lvDomainPolicy->currentItem(); -+ QTreeWidgetItem* item = mUi.lvDomainPolicy->currentItem(); - -- if (!index) -+ if (!item) - return; - -- QString oldDomain = index->text (0); -- -+ const QString oldDomain = item->text(0); - KCookiesPolicySelectionDlg pdlg (this); - pdlg.setWindowTitle (i18nc ("@title:window", "Change Cookie Policy")); -- pdlg.setPolicy (KCookieAdvice::strToAdvice (m_pDomainPolicy[index])); -+ pdlg.setPolicy (KCookieAdvice::strToAdvice (m_pDomainPolicy.value(oldDomain))); - pdlg.setEnableHostEdit (true, oldDomain); - - if (pdlg.exec() && !pdlg.domain().isEmpty()) { -- QString newDomain = tolerantFromAce (pdlg.domain().toLatin1()); -- int advice = pdlg.advice(); -+ const QString newDomain = tolerantFromAce (pdlg.domain().toLatin1()); -+ const int advice = pdlg.advice(); - if (newDomain == oldDomain || !handleDuplicate (newDomain, advice)) { -- m_pDomainPolicy[index] = KCookieAdvice::adviceToStr (advice); -- index->setText (0, newDomain); -- index->setText (1, i18n (m_pDomainPolicy[index])); -+ m_pDomainPolicy[newDomain] = KCookieAdvice::adviceToStr (advice); -+ item->setText (0, newDomain); -+ item->setText (1, i18n (m_pDomainPolicy.value(newDomain))); - configChanged(); - } - } -@@ -238,9 +236,9 @@ bool KCookiesPolicies::handleDuplicate (const QString& domain, int advice) - i18nc ("@title:window", "Duplicate Policy"), - KGuiItem (i18n ("Replace"))); - if (res == KMessageBox::Continue) { -- m_pDomainPolicy[item] = KCookieAdvice::adviceToStr (advice); -+ m_pDomainPolicy[domain] = KCookieAdvice::adviceToStr (advice); - item->setText (0, domain); -- item->setText (1, i18n (m_pDomainPolicy[item])); -+ item->setText (1, i18n (m_pDomainPolicy.value(domain))); - configChanged(); - return true; - } else -@@ -260,7 +258,7 @@ void KCookiesPolicies::deletePressed() - if (!nextItem) - nextItem = mUi.lvDomainPolicy->itemAbove (item); - -- m_pDomainPolicy.remove (item); -+ m_pDomainPolicy.remove (item->text(0)); - delete item; - } - -@@ -300,9 +298,9 @@ void KCookiesPolicies::updateDomainList (const QStringList& domainConfig) - splitDomainAdvice (*it, domain, advice); - - if (!domain.isEmpty()) { -- QTreeWidgetItem* index = new QTreeWidgetItem (mUi.lvDomainPolicy, QStringList() << tolerantFromAce (domain.toLatin1()) << -+ QTreeWidgetItem* item = new QTreeWidgetItem (mUi.lvDomainPolicy, QStringList() << tolerantFromAce (domain.toLatin1()) << - i18n (KCookieAdvice::adviceToStr (advice))); -- m_pDomainPolicy[index] = KCookieAdvice::adviceToStr (advice); -+ m_pDomainPolicy[item->text(0)] = KCookieAdvice::adviceToStr (advice); - } - } - -@@ -384,11 +382,10 @@ void KCookiesPolicies::save() - group.writeEntry ("CookieGlobalAdvice", advice); - - QStringList domainConfig; -- QMapIterator<QTreeWidgetItem*, const char*> it (m_pDomainPolicy); -+ QMapIterator<QString, const char*> it (m_pDomainPolicy); - while (it.hasNext()) { - it.next(); -- QTreeWidgetItem* item = it.key(); -- QString policy = tolerantToAce (item->text (0)); -+ QString policy = it.key(); - policy += QLatin1Char (':'); - policy += QLatin1String (it.value()); - domainConfig << policy; -diff --git a/konqueror/settings/kio/kcookiespolicies.h b/konqueror/settings/kio/kcookiespolicies.h -index b035ad5..ee87a94 100644 ---- a/konqueror/settings/kio/kcookiespolicies.h -+++ b/konqueror/settings/kio/kcookiespolicies.h -@@ -73,7 +73,7 @@ private: - private: - int d_itemsSelected; - Ui::KCookiePoliciesUI mUi; -- QMap<QTreeWidgetItem*, const char*> m_pDomainPolicy; -+ QMap<QString, const char*> m_pDomainPolicy; - }; - - #endif // KCOOKIESPOLICIES_H --- -1.8.0 - |