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

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

    Fix kdetalk profile and plugin
    
    Forcing the server address is wrong, the server is using a DNS SRV record
    (you can check with: $ host -a -t SRV _xmpp-client._tcp.kdetalk.net)
---
 data/profiles/kde-talk.profile                  | 2 +-
 plugins/gabble/main-options-widget-kde-talk.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/profiles/kde-talk.profile b/data/profiles/kde-talk.profile
index 99eacd2..96749ac 100644
--- a/data/profiles/kde-talk.profile
+++ b/data/profiles/kde-talk.profile
@@ -8,7 +8,7 @@
   <name>KDE Talk</name>
 
   <parameters>
-    <parameter name="server"  type="s" mandatory="1">kdetalk.net</parameter>
+    <parameter name="server"  type="s" mandatory="1" />
     <parameter name="port"    type="u" mandatory="1">5222</parameter>
     <!-- This is necessary until we have a SSL handler -->
     <parameter name="ignore-ssl-errors" type="b" mandatory="1">1</parameter>
diff --git a/plugins/gabble/main-options-widget-kde-talk.cpp b/plugins/gabble/main-options-widget-kde-talk.cpp
index ad1399f..bd60004 100644
--- a/plugins/gabble/main-options-widget-kde-talk.cpp
+++ b/plugins/gabble/main-options-widget-kde-talk.cpp
@@ -23,7 +23,9 @@
 #include "ui_main-options-widget-kde-talk.h"
 
 #include <KCMTelepathyAccounts/ParameterEditModel>
-#include <KDE/KDebug>
+
+
+const QString serverAddress = QLatin1String("kdetalk.net");
 
 MainOptionsWidgetKDETalk::MainOptionsWidgetKDETalk(ParameterEditModel *model,
                                                    QWidget *parent)
@@ -58,10 +60,8 @@ void MainOptionsWidgetKDETalk::submit()
     if (index.isValid()) {
         QString account = m_ui->accountLineEdit->text();
 
-        //append "@kdetalk.net" (fetching the address from the default params for as much future compatiability as possible)
+        //append "@kdetalk.net"
         account.append(QLatin1Char('@'));
-        QString serverAddress = parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("server"))).data().toString();
-        kDebug() << "Server Address:" << serverAddress;
         account.append(serverAddress);
 
         //update the model with the account value from the text box.

-- 
ktp-accounts-kcm packaging