[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=6d74e00

The following commit has been merged in the master branch:
commit 6d74e001a96bc0009ccdd0af553615f3b643c962
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Feb 23 23:47:23 2012 +0100

    Set XMPP resource if it is not set
---
 plugins/gabble/gabble-account-ui.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index d194bdf..1aa914a 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -30,6 +30,9 @@
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
 #include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
+#include <KCMTelepathyAccounts/ParameterEditModel>
+
+#include <TelepathyQt/ProtocolParameter>
 
 
 GabbleAccountUi::GabbleAccountUi(const QString &serviceName, QObject *parent)
@@ -68,6 +71,11 @@ AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
         ParameterEditModel *model,
         QWidget *parent) const
 {
+    QModelIndex index = model->indexForParameter(model->parameter(QLatin1String("resource")));
+    if (index.isValid() && model->data(index, ParameterEditModel::ValueRole).toString().isEmpty()) {
+        model->setData(index, QString(QLatin1String("kde-telepathy")), ParameterEditModel::ValueRole);
+    }
+
     if (m_serviceName == QLatin1String("google-talk")) {
         return new MainOptionsWidgetGoogleTalk(model, parent);
     } else if (m_serviceName == QLatin1String("facebook")) {

-- 
ktp-accounts-kcm packaging