[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=3d5c518

The following commit has been merged in the master branch:
commit 3d5c518d945cab338578cb520c43cd96fb1c6088
Author: David Edmundson <david at davidedmundson.co.uk>
Date:   Wed Feb 27 03:26:13 2013 +0000

    Remove WLM from wizard page
    
    MSN is being dropped, we still support it, but it shouldn't be one of our main options
    
    BUG: 315446
    FIXED-IN: 0.6.0
    REVIEW: 109093
---
 .../simple-profile-select-widget.cpp               |  2 --
 .../simple-profile-select-widget.ui                | 26 +---------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index 5f9a516..a53f8a6 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -70,14 +70,12 @@ SimpleProfileSelectWidget::SimpleProfileSelectWidget(ProfileListModel *profileLi
     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"));
-    d->signalMapper->setMapping(d->ui->buttonMsn,      QLatin1String("msn"));
 
     // Connect buttons to the SignalMapper
     connect(d->ui->buttonJabber,   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->buttonMsn,      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 5ad8e79..5263fda 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.ui
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>339</width>
+    <width>359</width>
     <height>396</height>
    </rect>
   </property>
@@ -139,30 +139,6 @@
       </widget>
      </item>
      <item>
-      <widget class="QCommandLinkButton" name="buttonMsn">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Windows Live Messenger</string>
-       </property>
-       <property name="icon">
-        <iconset theme="im-msn">
-         <normaloff/>
-        </iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>32</width>
-         <height>32</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item>
       <widget class="QCommandLinkButton" name="buttonOthers">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Minimum">

-- 
ktp-accounts-kcm packaging