[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=8c1e95f

The following commit has been merged in the master branch:
commit 8c1e95f78971c7deae6bc22d1320ca3d4feb649d
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Oct 27 02:09:36 2011 +0200

    Disable save password checkbox if wallet cannot be opened
---
 common              |  2 +-
 password-prompt.cpp | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/common b/common
index c0b6bc9..2f1c749 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c0b6bc91daab6c4992a38191db471513546af25e
+Subproject commit 2f1c74934c855560b7940ee0be758b059dd9940a
diff --git a/password-prompt.cpp b/password-prompt.cpp
index 14a7329..93d47db 100644
--- a/password-prompt.cpp
+++ b/password-prompt.cpp
@@ -36,8 +36,14 @@ PasswordPrompt::PasswordPrompt(const Tp::AccountPtr &account, QWidget *parent)
     ui->title->setPixmap(KIcon(account->iconName()).pixmap(22,22));
 
     KTelepathy::WalletInterface wallet(this->effectiveWinId());
-    if (wallet.hasPassword(account)) {
-        ui->passwordLineEdit->setText(wallet.password(account));
+
+    if (wallet.isOpen()) {
+        ui->savePassword->setChecked(true);
+        if (wallet.hasPassword(account)) {
+            ui->passwordLineEdit->setText(wallet.password(account));
+        }
+    } else {
+        ui->savePassword->setDisabled(true);
     }
 }
 

-- 
ktp-auth-handler packaging