[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=857cd7f

The following commit has been merged in the master branch:
commit 857cd7f1f820f87b926448586b1fa6e3eeef7646
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Feb 28 00:03:31 2012 +0100

    Revert "Set XMPP priority in the same way as resource parameter"
    
    This reverts commit b81ab4a250055648280f4c34f4373155b9b34793.
---
 plugins/gabble/gabble-account-ui.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index ead192f..1331a75 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -76,11 +76,6 @@ 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