[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6eed393

The following commit has been merged in the master branch:
commit 6eed393cb5641cd1f8d3451eeab53b4212cce2cc
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Mar 19 01:41:31 2012 +0000

    Restore compatibility with Qt 4.7
---
 dialogs/join-chat-room-dialog.cpp |  5 +++++
 dialogs/join-chat-room-dialog.ui  | 10 ----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/dialogs/join-chat-room-dialog.cpp b/dialogs/join-chat-room-dialog.cpp
index ec87fcd..9dfe2e7 100644
--- a/dialogs/join-chat-room-dialog.cpp
+++ b/dialogs/join-chat-room-dialog.cpp
@@ -64,6 +64,11 @@ JoinChatRoomDialog::JoinChatRoomDialog(Tp::AccountManagerPtr accountManager, QWi
 
     // disable OK button on start
     button(Ok)->setEnabled(false);
+    
+    //set icons
+    ui->addFavoritePushButton->setIcon(KIcon(QLatin1String("list-add")));
+    ui->removeFavoritePushButton->setIcon(KIcon(QLatin1String("list-remove")));
+    
 
     // populate combobox with accounts that support chat rooms
     for (int i = 0; i < m_accounts.count(); ++i) {
diff --git a/dialogs/join-chat-room-dialog.ui b/dialogs/join-chat-room-dialog.ui
index 839d644..3e8418b 100644
--- a/dialogs/join-chat-room-dialog.ui
+++ b/dialogs/join-chat-room-dialog.ui
@@ -62,11 +62,6 @@
              <property name="text">
               <string>Add Room</string>
              </property>
-             <property name="icon">
-              <iconset theme="list-add">
-               <normaloff/>
-              </iconset>
-             </property>
             </widget>
            </item>
            <item>
@@ -77,11 +72,6 @@
              <property name="text">
               <string>Remove Room</string>
              </property>
-             <property name="icon">
-              <iconset theme="list-remove">
-               <normaloff/>
-              </iconset>
-             </property>
             </widget>
            </item>
            <item>

-- 
ktp-contact-list packaging