[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=0c331c8

The following commit has been merged in the master branch:
commit 0c331c8a9090be3a1c2606f9d4c304c9b8dd555a
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Tue Jul 16 17:44:13 2013 +0200

    Replace ICQ button with KDETalk
    
    Since David fixed the KDETalk plugin, and now registering a new account
    works, it makes sense to "promote" it and add it in the first page.
    I think ICQ is not that special compared to other accounts in the second
    page, therefore it is replaced it with KDETalk.
    
    Reviewed-by: David Edmundson
---
 .../simple-profile-select-widget.cpp                 |  4 ++--
 .../simple-profile-select-widget.ui                  | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index a53f8a6..b5bee34 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -67,15 +67,15 @@ SimpleProfileSelectWidget::SimpleProfileSelectWidget(ProfileListModel *profileLi
 
     // Add buttons to the SignalMapper
     d->signalMapper->setMapping(d->ui->buttonJabber,   QLatin1String("jabber"));
+    d->signalMapper->setMapping(d->ui->buttonKDETalk,  QLatin1String("kde-talk"));
     d->signalMapper->setMapping(d->ui->buttonGTalk,    QLatin1String("google-talk"));
     d->signalMapper->setMapping(d->ui->buttonFacebook, QLatin1String("facebook"));
-    d->signalMapper->setMapping(d->ui->buttonIcq,      QLatin1String("haze-icq"));
 
     // Connect buttons to the SignalMapper
     connect(d->ui->buttonJabber,   SIGNAL(clicked()), d->signalMapper, SLOT(map()));
+    connect(d->ui->buttonKDETalk,  SIGNAL(clicked()), d->signalMapper, SLOT(map()));
     connect(d->ui->buttonGTalk,    SIGNAL(clicked()), d->signalMapper, SLOT(map()));
     connect(d->ui->buttonFacebook, SIGNAL(clicked()), d->signalMapper, SLOT(map()));
-    connect(d->ui->buttonIcq,      SIGNAL(clicked()), d->signalMapper, SLOT(map()));
     connect(d->ui->buttonOthers,   SIGNAL(clicked()), this,            SIGNAL(othersChosen()));
 
     connect(d->signalMapper,SIGNAL(mapped(QString)),
diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.ui b/src/KCMTelepathyAccounts/simple-profile-select-widget.ui
index 366eb5a..7b46cdd 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.ui
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.ui
@@ -67,7 +67,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QCommandLinkButton" name="buttonGTalk">
+      <widget class="QCommandLinkButton" name="buttonKDETalk">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -75,12 +75,10 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Google Talk</string>
+        <string>KDETalk</string>
        </property>
        <property name="icon">
-        <iconset theme="im-google-talk">
-         <normaloff/>
-        </iconset>
+        <iconset theme="kde"/>
        </property>
        <property name="iconSize">
         <size>
@@ -91,7 +89,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QCommandLinkButton" name="buttonFacebook">
+      <widget class="QCommandLinkButton" name="buttonGTalk">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -99,10 +97,10 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>Facebook Chat</string>
+        <string>Google Talk</string>
        </property>
        <property name="icon">
-        <iconset theme="im-facebook">
+        <iconset theme="im-google-talk">
          <normaloff/>
         </iconset>
        </property>
@@ -115,7 +113,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QCommandLinkButton" name="buttonIcq">
+      <widget class="QCommandLinkButton" name="buttonFacebook">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
          <horstretch>0</horstretch>
@@ -123,10 +121,10 @@
         </sizepolicy>
        </property>
        <property name="text">
-        <string>ICQ</string>
+        <string>Facebook Chat</string>
        </property>
        <property name="icon">
-        <iconset theme="im-icq">
+        <iconset theme="im-facebook">
          <normaloff/>
         </iconset>
        </property>

-- 
ktp-accounts-kcm packaging