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

The following commit has been merged in the master branch:
commit a4a361355855446077225929756abbf995f1ed5f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Dec 30 17:50:24 2011 +0100

    Update display name in Gabble - Google Talk
---
 plugins/gabble/main-options-widget-googletalk.cpp | 7 ++++++-
 plugins/gabble/main-options-widget-googletalk.h   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/gabble/main-options-widget-googletalk.cpp b/plugins/gabble/main-options-widget-googletalk.cpp
index ed97bff..c721dfd 100644
--- a/plugins/gabble/main-options-widget-googletalk.cpp
+++ b/plugins/gabble/main-options-widget-googletalk.cpp
@@ -28,7 +28,7 @@ MainOptionsWidgetGoogleTalk::MainOptionsWidgetGoogleTalk(ParameterEditModel *mod
     m_ui = new Ui::MainOptionsWidgetGoogleTalk;
     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()));
 }
@@ -38,4 +38,9 @@ MainOptionsWidgetGoogleTalk::~MainOptionsWidgetGoogleTalk()
     delete m_ui;
 }
 
+void MainOptionsWidgetGoogleTalk::updateDefaultDisplayName()
+{
+    setDefaultDisplayName(m_ui->accountLineEdit->text());
+}
+
 #include "main-options-widget-googletalk.moc"
diff --git a/plugins/gabble/main-options-widget-googletalk.h b/plugins/gabble/main-options-widget-googletalk.h
index b73df11..f327a03 100644
--- a/plugins/gabble/main-options-widget-googletalk.h
+++ b/plugins/gabble/main-options-widget-googletalk.h
@@ -36,6 +36,7 @@ public:
                                QWidget *parent = 0);
     virtual ~MainOptionsWidgetGoogleTalk();
 
+    virtual void updateDefaultDisplayName();
 private:
     Ui::MainOptionsWidgetGoogleTalk *m_ui;
 };

-- 
ktp-accounts-kcm packaging