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

The following commit has been merged in the master branch:
commit af3fe1ace0d7e13c67918c850a72db1e9f9ab5e2
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Jan 2 12:13:53 2012 +0100

    Update display name in Gabble - MSN
---
 plugins/gabble/main-options-widget-msn.cpp | 8 +++++++-
 plugins/gabble/main-options-widget-msn.h   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/gabble/main-options-widget-msn.cpp b/plugins/gabble/main-options-widget-msn.cpp
index 913a808..1caa1d1 100644
--- a/plugins/gabble/main-options-widget-msn.cpp
+++ b/plugins/gabble/main-options-widget-msn.cpp
@@ -21,7 +21,7 @@
 #include "main-options-widget-msn.h"
 
 #include <KCMTelepathyAccounts/ParameterEditModel>
-
+#include <KLocalizedString>
 
 MainOptionsWidgetMSN::MainOptionsWidgetMSN(ParameterEditModel *model,
                                      QWidget *parent)
@@ -51,5 +51,11 @@ bool MainOptionsWidgetMSN::validateParameterValues()
     return true;
 }
 
+void MainOptionsWidgetMSN::updateDefaultDisplayName()
+{
+    // FIXME Move the class Dictionary in common internals and use string from
+    //       Dictionary::instance()->string(QLatin1String("msn"))
+    setDefaultDisplayName(i18n("Windows Live Messenger"));
+}
 
 #include "main-options-widget-msn.moc"
diff --git a/plugins/gabble/main-options-widget-msn.h b/plugins/gabble/main-options-widget-msn.h
index 6d70cbe..27b12b0 100644
--- a/plugins/gabble/main-options-widget-msn.h
+++ b/plugins/gabble/main-options-widget-msn.h
@@ -37,6 +37,7 @@ public:
 
     virtual void submit();
     virtual bool validateParameterValues();
+    virtual void updateDefaultDisplayName();
 private:
     Ui::MainOptionsWidgetMSN *m_ui;
 };

-- 
ktp-accounts-kcm packaging