[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=872fa73

The following commit has been merged in the master branch:
commit 872fa73d671a4e2562fb76e0b2a0eba1c8048dec
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Feb 10 13:25:04 2015 +0100

    [otr-proxy] Connect the QDialogButtonBox to the QDialog
    
    Otherwise has no effect
---
 lib/proxy-service.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/proxy-service.cpp b/lib/proxy-service.cpp
index 9f9a8a7..06f4ec5 100644
--- a/lib/proxy-service.cpp
+++ b/lib/proxy-service.cpp
@@ -51,6 +51,8 @@ class KeyGenDialog : public QDialog
             buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok, this);
             buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
             mainLayout->addWidget(buttonBox);
+            connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+            connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
             this->setWindowTitle(i18n("Please wait"));
 
@@ -232,8 +234,7 @@ void ProxyService::onKeyGenerationFinished(const QDBusObjectPath &accountPath, b
     }
     it.value()->setFinished(error);
     it.value()->unblock();
-    connect(it.value(), SIGNAL(closeClicked()), SLOT(onDialogClosed()));
-    connect(it.value(), SIGNAL(okClicked()), SLOT(onDialogClosed()));
+    connect(it.value(), SIGNAL(finished(int)), SLOT(onDialogClosed()));
 
     Q_EMIT keyGenerationFinished(d->am->accountForObjectPath(accountPath.path()), error);
 }

-- 
ktp-text-ui packaging