[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=972ebf5

The following commit has been merged in the master branch:
commit 972ebf585862bc646ed105868accb7fa9cf40f05
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Sep 19 04:01:19 2011 +0100

    Use loginName for nickname and fullName for first-name for Salut
---
 salut/salut-main-options-widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/salut/salut-main-options-widget.cpp b/salut/salut-main-options-widget.cpp
index 6e7138b..12c7706 100644
--- a/salut/salut-main-options-widget.cpp
+++ b/salut/salut-main-options-widget.cpp
@@ -40,7 +40,8 @@ SalutMainOptionsWidget::SalutMainOptionsWidget(ParameterEditModel *model, QWidge
     // the current users full name
     if(m_ui->firstnameLineEdit->text().isEmpty()) {
         KUser user = KUser();
-        m_ui->nicknameLineEdit->setText(user.property(KUser::FullName).toString());
+        m_ui->firstnameLineEdit->setText(user.property(KUser::FullName).toString());
+        m_ui->nicknameLineEdit->setText(user.loginName());
     }
 
     QTimer::singleShot(0, m_ui->firstnameLineEdit, SLOT(setFocus()));

-- 
ktp-accounts-kcm packaging