head	1.2;
access;
symbols
	pkgsrc-2014Q3:1.1.0.4
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.2;
locks; strict;
comment	@// @;


1.2
date	2014.11.13.10.31.07;	author markd;	state dead;
branches;
next	1.1;
commitid	56B9CUCDa3iJK0Yx;

1.1
date	2014.07.24.21.30.10;	author markd;	state Exp;
branches
	1.1.2.1;
next	;
commitid	a5E6MSrLqEK30GJx;

1.1.2.1
date	2014.07.24.21.30.10;	author tron;	state dead;
branches;
next	1.1.2.2;
commitid	bBtyw1TsBWFveRJx;

1.1.2.2
date	2014.07.26.07.19.59;	author tron;	state Exp;
branches;
next	;
commitid	bBtyw1TsBWFveRJx;


desc
@@


1.2
log
@Update to KDE SC 4.14.3
@
text
@$NetBSD: patch-kio_kio_usernotificationhandler.cpp,v 1.1 2014/07/24 21:30:10 markd Exp $

http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
Don't require a job to handle messageboxes.
http://www.kde.org/info/security/advisory-20140618-1.txt

--- kio/kio/usernotificationhandler.cpp.orig	2014-01-02 19:26:52.000000000 +0000
+++ kio/kio/usernotificationhandler.cpp
@@@@ -20,6 +20,7 @@@@
 
 #include "slave.h"
 #include "job_p.h"
+#include "jobuidelegate.h"
 
 #include <kdebug.h>
 
@@@@ -76,19 +77,18 @@@@ void UserNotificationHandler::processReq
 
         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 {
@


1.1
log
@Fix for http://www.kde.org/info/security/advisory-20140618-1.txt
Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-kio_kio_usernotificationhandler.cpp was added on branch pkgsrc-2014Q2 on 2014-07-26 07:19:59 +0000
@
text
@d1 48
@


1.1.2.2
log
@Pullup ticket #4462 - requested by markd
x11/kdelibs4: security patch

Revisions pulled up:
- x11/kdelibs4/Makefile                                         1.71
- x11/kdelibs4/distinfo                                         1.41
- x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp 1.1

---
   Module Name:	pkgsrc
   Committed By:	markd
   Date:		Thu Jul 24 21:30:10 UTC 2014

   Modified Files:
   	pkgsrc/x11/kdelibs4: Makefile distinfo
   Added Files:
   	pkgsrc/x11/kdelibs4/patches: patch-kio_kio_usernotificationhandler.cpp

   Log Message:
   Fix for http://www.kde.org/info/security/advisory-20140618-1.txt
   Bump PKGREVISION.
@
text
@a0 48
$NetBSD$

http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
Don't require a job to handle messageboxes.
http://www.kde.org/info/security/advisory-20140618-1.txt

--- kio/kio/usernotificationhandler.cpp.orig	2014-01-02 19:26:52.000000000 +0000
+++ kio/kio/usernotificationhandler.cpp
@@@@ -20,6 +20,7 @@@@
 
 #include "slave.h"
 #include "job_p.h"
+#include "jobuidelegate.h"
 
 #include <kdebug.h>
 
@@@@ -76,19 +77,18 @@@@ void UserNotificationHandler::processReq
 
         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 {
@