[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=c94fa6d

The following commit has been merged in the master branch:
commit c94fa6da5e0b32a2e491398a81099de9d1650d8a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Sat Dec 31 14:22:44 2011 +0100

    Update display name in Haze - Aim
---
 plugins/haze/aim-main-options-widget.cpp | 7 ++++++-
 plugins/haze/aim-main-options-widget.h   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/haze/aim-main-options-widget.cpp b/plugins/haze/aim-main-options-widget.cpp
index 99068e2..f404de0 100644
--- a/plugins/haze/aim-main-options-widget.cpp
+++ b/plugins/haze/aim-main-options-widget.cpp
@@ -30,7 +30,7 @@ AimMainOptionsWidget::AimMainOptionsWidget(ParameterEditModel* model, QWidget* p
     m_ui->setupUi(this);
 
     //map the widgets to their data
-    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()));
 }
@@ -40,4 +40,9 @@ AimMainOptionsWidget::~AimMainOptionsWidget()
     delete m_ui;
 }
 
+void AimMainOptionsWidget::updateDefaultDisplayName()
+{
+    setDefaultDisplayName(m_ui->accountLineEdit->text());
+}
+
 #include "aim-main-options-widget.moc"
diff --git a/plugins/haze/aim-main-options-widget.h b/plugins/haze/aim-main-options-widget.h
index b966fb6..b9a2968 100644
--- a/plugins/haze/aim-main-options-widget.h
+++ b/plugins/haze/aim-main-options-widget.h
@@ -35,6 +35,8 @@ class AimMainOptionsWidget
 public:
     explicit AimMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
     virtual ~AimMainOptionsWidget();
+
+    virtual void updateDefaultDisplayName();
 private:
     Ui::AimMainOptionsWidget *m_ui;
 };

-- 
ktp-accounts-kcm packaging