[SCM] khtml packaging branch, master, updated. debian/5.28.0-1-6-gdfa4878

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=93e15bf

The following commit has been merged in the master branch:
commit 93e15bf8eefb0631514bf531fa3db4ae2081f2fe
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Apr 3 11:17:35 2017 +0200

    Add upstream patches for the java permission dialog: java-set-names-in-permission-dialog.patch  java-apply-the-names-to-the-right-buttons.patch
---
 ...java-apply-the-names-to-the-right-buttons.patch | 32 ++++++++++++++++++++
 .../java-set-names-in-permission-dialog.patch      | 34 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 68 insertions(+)

diff --git a/debian/patches/java-apply-the-names-to-the-right-buttons.patch b/debian/patches/java-apply-the-names-to-the-right-buttons.patch
new file mode 100644
index 0000000..b0419b2
--- /dev/null
+++ b/debian/patches/java-apply-the-names-to-the-right-buttons.patch
@@ -0,0 +1,32 @@
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 26 Nov 2016 09:22:23 +0100
+Subject: java: apply the names to the right buttons
+
+Fixes commit 856a96852f566ed7eb855810e347f95003c25017.
+---
+ src/java/kjavaappletserver.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/java/kjavaappletserver.cpp b/src/java/kjavaappletserver.cpp
+index 7ddb48f..d0538e1 100644
+--- a/src/java/kjavaappletserver.cpp
++++ b/src/java/kjavaappletserver.cpp
+@@ -831,15 +831,15 @@ QString PermissionDialog::exec(const QString &cert, const QString &perm)
+     buttonLayout->addWidget(no);
+ 
+     QPushButton *const reject = new QPushButton(i18n("&Reject All"), dialog);
+-    no->setObjectName("reject");
++    reject->setObjectName("reject");
+     buttonLayout->addWidget(reject);
+ 
+     QPushButton *const yes = new QPushButton(i18n("&Yes"), dialog);
+-    no->setObjectName("yes");
++    yes->setObjectName("yes");
+     buttonLayout->addWidget(yes);
+ 
+     QPushButton *const grant = new QPushButton(i18n("&Grant All"), dialog);
+-    no->setObjectName("grant");
++    grant->setObjectName("grant");
+     buttonLayout->addWidget(grant);
+     dialogLayout->addLayout(buttonLayout);
+     dialog->resize(dialog->minimumSizeHint());
diff --git a/debian/patches/java-set-names-in-permission-dialog.patch b/debian/patches/java-set-names-in-permission-dialog.patch
new file mode 100644
index 0000000..76d5fb6
--- /dev/null
+++ b/debian/patches/java-set-names-in-permission-dialog.patch
@@ -0,0 +1,34 @@
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 26 Nov 2016 09:12:18 +0100
+Subject: java: set names in permission dialog
+
+This makes sure the reply from the user is used and sent back.
+---
+ src/java/kjavaappletserver.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/java/kjavaappletserver.cpp b/src/java/kjavaappletserver.cpp
+index 39d43f3..7ddb48f 100644
+--- a/src/java/kjavaappletserver.cpp
++++ b/src/java/kjavaappletserver.cpp
+@@ -826,16 +826,20 @@ QString PermissionDialog::exec(const QString &cert, const QString &perm)
+     buttonLayout->setObjectName("buttonLayout");
+ 
+     QPushButton *const no = new QPushButton(i18n("&No"), dialog);
++    no->setObjectName("no");
+     no->setDefault(true);
+     buttonLayout->addWidget(no);
+ 
+     QPushButton *const reject = new QPushButton(i18n("&Reject All"), dialog);
++    no->setObjectName("reject");
+     buttonLayout->addWidget(reject);
+ 
+     QPushButton *const yes = new QPushButton(i18n("&Yes"), dialog);
++    no->setObjectName("yes");
+     buttonLayout->addWidget(yes);
+ 
+     QPushButton *const grant = new QPushButton(i18n("&Grant All"), dialog);
++    no->setObjectName("grant");
+     buttonLayout->addWidget(grant);
+     dialogLayout->addLayout(buttonLayout);
+     dialog->resize(dialog->minimumSizeHint());
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2000f78
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+java-set-names-in-permission-dialog.patch
+java-apply-the-names-to-the-right-buttons.patch

-- 
khtml packaging