summaryrefslogtreecommitdiff
path: root/libre/kdelibs-libre/CVE-2014-3494.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-07-22 20:42:36 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-07-22 20:42:36 -0300
commit25f5c16dfc4d136669488be04de90eb4f5687850 (patch)
tree601d19846543774ba633bdc2c63ea01bdffb8344 /libre/kdelibs-libre/CVE-2014-3494.patch
parent913253b36741e368843edddd9d3fb08c914d0161 (diff)
downloadabslibre-25f5c16dfc4d136669488be04de90eb4f5687850.tar.gz
abslibre-25f5c16dfc4d136669488be04de90eb4f5687850.tar.bz2
abslibre-25f5c16dfc4d136669488be04de90eb4f5687850.zip
kde packages: updating libre and nonprism packages to 4.13.3 version
Diffstat (limited to 'libre/kdelibs-libre/CVE-2014-3494.patch')
-rw-r--r--libre/kdelibs-libre/CVE-2014-3494.patch55
1 files changed, 0 insertions, 55 deletions
diff --git a/libre/kdelibs-libre/CVE-2014-3494.patch b/libre/kdelibs-libre/CVE-2014-3494.patch
deleted file mode 100644
index 648d4fd7d..000000000
--- a/libre/kdelibs-libre/CVE-2014-3494.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: David Faure <faure@kde.org>
-Date: Wed, 18 Jun 2014 18:29:04 +0000
-Subject: Don't require a job to handle messageboxes.
-X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
----
-Don't require a job to handle messageboxes.
-
-The POP3 ioslave doesn't have a job when it gets here.
----
-
-
---- a/kio/kio/usernotificationhandler.cpp
-+++ b/kio/kio/usernotificationhandler.cpp
-@@ -19,7 +19,7 @@
- #include "usernotificationhandler_p.h"
-
- #include "slave.h"
--#include "job_p.h"
-+#include "jobuidelegate.h"
-
- #include <kdebug.h>
-
-@@ -76,19 +76,18 @@
-
- if (m_cachedResults.contains(key)) {
- result = *(m_cachedResults[key]);
-- } else if (r->slave->job()) {
-- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job());
-- if (jobPrivate) {
-- result = jobPrivate->requestMessageBox(r->type,
-- r->data.value(MSG_TEXT).toString(),
-- r->data.value(MSG_CAPTION).toString(),
-- r->data.value(MSG_YES_BUTTON_TEXT).toString(),
-- r->data.value(MSG_NO_BUTTON_TEXT).toString(),
-- r->data.value(MSG_YES_BUTTON_ICON).toString(),
-- r->data.value(MSG_NO_BUTTON_ICON).toString(),
-- r->data.value(MSG_DONT_ASK_AGAIN).toString(),
-- r->data.value(MSG_META_DATA).toMap());
-- }
-+ } else {
-+ JobUiDelegate ui;
-+ const JobUiDelegate::MessageBoxType type = static_cast<JobUiDelegate::MessageBoxType>(r->type);
-+ result = ui.requestMessageBox(type,
-+ r->data.value(MSG_TEXT).toString(),
-+ r->data.value(MSG_CAPTION).toString(),
-+ r->data.value(MSG_YES_BUTTON_TEXT).toString(),
-+ r->data.value(MSG_NO_BUTTON_TEXT).toString(),
-+ r->data.value(MSG_YES_BUTTON_ICON).toString(),
-+ r->data.value(MSG_NO_BUTTON_ICON).toString(),
-+ r->data.value(MSG_DONT_ASK_AGAIN).toString(),
-+ r->data.value(MSG_META_DATA).toMap());
- m_cachedResults.insert(key, new int(result));
- }
- } else {
-