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

The following commit has been merged in the master branch:
commit b81ab4a250055648280f4c34f4373155b9b34793
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Feb 27 19:57:02 2012 +0100

    Set XMPP priority in the same way as resource parameter
---
 plugins/gabble/gabble-account-ui.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index 1331a75..ead192f 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -76,6 +76,11 @@ AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
         model->setData(resourceIndex, QString::fromLatin1("kde-telepathy"), ParameterEditModel::ValueRole);
     }
 
+    QModelIndex priorityIndex = model->indexForParameter(model->parameter(QLatin1String("priority")));
+    if (priorityIndex.isValid() && model->data(priorityIndex, ParameterEditModel::ValueRole).toInt() == 0) {
+        model->setData(priorityIndex, 5, ParameterEditModel::ValueRole);
+    }
+
     if (m_serviceName == QLatin1String("google-talk")) {
         return new MainOptionsWidgetGoogleTalk(model, parent);
     } else if (m_serviceName == QLatin1String("facebook")) {

-- 
ktp-accounts-kcm packaging