[SCM] kio packaging branch, master, updated. 17a04a2aad26a68df70fa84e06d600825914ee87

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b10339f4dffea914c821d149046f9586f277694c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Jan 26 15:04:18 2015 +0100

    Delete unused patch: upstream_kurlrequester-dialog-accept-handling.diff
---
 debian/patches/series                              |  0
 ...tream_kurlrequester-dialog-accept-handling.diff | 74 ----------------------
 2 files changed, 74 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/upstream_kurlrequester-dialog-accept-handling.diff b/debian/patches/upstream_kurlrequester-dialog-accept-handling.diff
deleted file mode 100644
index 8409c54..0000000
--- a/debian/patches/upstream_kurlrequester-dialog-accept-handling.diff
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Harald Sitter <sitter at kde.org>
-Date: Tue, 08 Jul 2014 15:45:04 +0000
-Subject: fix kurlrequester dialog accept handling
-X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=bffdd7fa0c03f255bded5071e39f50c768891eca
-Origin: upstream, http://quickgit.kde.org/?p=kio.git&a=commit&h=bffdd7fa0c03f255bded5071e39f50c768891eca
-Bug: http://bugs.kde.org/337226
----
-fix kurlrequester dialog accept handling
-
-switch to qdialog::accepted signal, rename slot (on private class) and
-remove accepted check in slot
-
-BUG: 337226
-REVIEW: 119174
----
-
-
---- a/src/widgets/kurlrequester.cpp
-+++ b/src/widgets/kurlrequester.cpp
-@@ -213,7 +213,7 @@
-     // slots
-     void _k_slotUpdateUrl();
-     void _k_slotOpenDialog();
--    void _k_slotFileDialogFinished();
-+    void _k_slotFileDialogAccepted();
- 
-     QUrl m_startDir;
-     KUrlRequester *m_parent; // TODO: rename to 'q'
-@@ -408,18 +408,16 @@
-     }
- }
- 
--void KUrlRequester::KUrlRequesterPrivate::_k_slotFileDialogFinished()
-+void KUrlRequester::KUrlRequesterPrivate::_k_slotFileDialogAccepted()
- {
-     if (!myFileDialog) {
-         return;
-     }
- 
--    if (myFileDialog->result() == QDialog::Accepted) {
--        QUrl newUrl = myFileDialog->selectedUrls().first();
--        if (newUrl.isValid()) {
--            m_parent->setUrl(newUrl);
--            emit m_parent->urlSelected(url());
--        }
-+    QUrl newUrl = myFileDialog->selectedUrls().first();
-+    if (newUrl.isValid()) {
-+        m_parent->setUrl(newUrl);
-+        emit m_parent->urlSelected(url());
-     }
- }
- 
-@@ -466,7 +464,7 @@
-         d->applyFileMode(d->myFileDialog, d->fileDialogMode);
- 
-         d->myFileDialog->setWindowModality(d->fileDialogModality);
--        connect(d->myFileDialog, SIGNAL(finished()), SLOT(_k_slotFileDialogFinished()));
-+        connect(d->myFileDialog, SIGNAL(accepted()), SLOT(_k_slotFileDialogAccepted()));
-     }
- 
-     return d->myFileDialog;
-
---- a/src/widgets/kurlrequester.h
-+++ b/src/widgets/kurlrequester.h
-@@ -328,7 +328,7 @@
- 
-     Q_PRIVATE_SLOT(d, void _k_slotUpdateUrl())
-     Q_PRIVATE_SLOT(d, void _k_slotOpenDialog())
--    Q_PRIVATE_SLOT(d, void _k_slotFileDialogFinished())
-+    Q_PRIVATE_SLOT(d, void _k_slotFileDialogAccepted())
- 
- };
- 
-

-- 
kio packaging