[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9d39b89

The following commit has been merged in the master branch:
commit 9d39b891aca118267dc9593d2baca8eb34b789fb
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Oct 25 15:04:53 2012 +0200

    Don't show EditAccountDialog until KWallet is opened
    
    BUG: 308079
    REVIEW: 107033
    FIXED-IN: 0.5.2
---
 src/edit-account-dialog.cpp | 16 +++++++++++++++-
 src/edit-account-dialog.h   |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index a747242..5982e06 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -46,13 +46,14 @@ class EditAccountDialog::Private
 {
 public:
     Private()
-            : item(0), widget(0), reconnectRequired(false)
+            : item(0), widget(0), reconnectRequired(false), kwalletReady(false)
     {
     }
 
     AccountItem *item;
     AccountEditWidget *widget;
     bool reconnectRequired;
+    bool kwalletReady;
 };
 
 EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
@@ -103,6 +104,9 @@ void EditAccountDialog::onWalletOpened(Tp::PendingOperation *op)
                                       doNotConnectOnAdd,
                                       this);
     setMainWidget(d->widget);
+
+    d->kwalletReady = true;
+    show();
 }
 
 void EditAccountDialog::accept()
@@ -192,4 +196,14 @@ void EditAccountDialog::onDisplayNameUpdated(Tp::PendingOperation *op)
     done(KDialog::Accepted);
 }
 
+void EditAccountDialog::setVisible(bool visible)
+{
+    if (visible && d->kwalletReady) {
+	KDialog::setVisible(visible);
+	return;
+    }
+
+    KDialog::setVisible(false);
+}
+
 #include "edit-account-dialog.moc"
diff --git a/src/edit-account-dialog.h b/src/edit-account-dialog.h
index 08a3481..d1c370d 100644
--- a/src/edit-account-dialog.h
+++ b/src/edit-account-dialog.h
@@ -33,6 +33,8 @@ public:
     explicit EditAccountDialog(AccountItem *item, QWidget *parent = 0);
     virtual ~EditAccountDialog();
 
+    virtual void setVisible(bool visible);
+
 private Q_SLOTS:
     void onWalletOpened(Tp::PendingOperation *op);
     void onParametersUpdated(Tp::PendingOperation *op);

-- 
ktp-accounts-kcm packaging