[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=8e5db41

The following commit has been merged in the master branch:
commit 8e5db4146552c4f1ddb23549a8ede56459edaef8
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Wed Dec 28 11:02:21 2011 +0100

    Update display name in Butterfly
---
 plugins/butterfly/main-options-widget.cpp | 7 ++++++-
 plugins/butterfly/main-options-widget.h   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/butterfly/main-options-widget.cpp b/plugins/butterfly/main-options-widget.cpp
index 7e48007..7c782e1 100644
--- a/plugins/butterfly/main-options-widget.cpp
+++ b/plugins/butterfly/main-options-widget.cpp
@@ -28,7 +28,7 @@ MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
     m_ui = new Ui::MainOptionsWidget;
     m_ui->setupUi(this);
 
-    handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+    handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel, true);
     handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
 
     QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
@@ -39,4 +39,9 @@ MainOptionsWidget::~MainOptionsWidget()
     delete m_ui;
 }
 
+void MainOptionsWidget::updateDefaultDisplayName()
+{
+    setDefaultDisplayName(m_ui->accountLineEdit->text());
+}
+
 #include "main-options-widget.moc"
diff --git a/plugins/butterfly/main-options-widget.h b/plugins/butterfly/main-options-widget.h
index 19a44c8..467e226 100644
--- a/plugins/butterfly/main-options-widget.h
+++ b/plugins/butterfly/main-options-widget.h
@@ -34,6 +34,7 @@ public:
                                QWidget *parent = 0);
     virtual ~MainOptionsWidget();
 
+    virtual void updateDefaultDisplayName();
 private:
     Q_DISABLE_COPY(MainOptionsWidget);
     Ui::MainOptionsWidget *m_ui;

-- 
ktp-accounts-kcm packaging