[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=56c50bb

The following commit has been merged in the master branch:
commit 56c50bb64c366ffb13a2f3cf3c0b634b0b672908
Author: Alin M Elena <alinm.elena at gmail.com>
Date:   Wed Nov 23 11:33:11 2011 +0000

    sorted whitespaces
---
 app/chat-window.cpp | 14 +++++++-------
 app/chat-window.h   |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 06342cd..d423965 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -280,7 +280,7 @@ void ChatWindow::onCurrentIndexChanged(int index)
         setShareDesktopEnabled(true);
         /// TODO re-activate check when invitation to chat has been sorted out
         setInviteToChatEnabled(false);
-        
+
     } else {
         setAudioCallEnabled(false);
         setFileTransferEnabled(false);
@@ -288,7 +288,7 @@ void ChatWindow::onCurrentIndexChanged(int index)
         setShareDesktopEnabled(false);
         /// TODO re-activate check when invitation to chat has been sorted out
         setInviteToChatEnabled(false);
-        
+
     }
 }
 
@@ -513,7 +513,7 @@ void ChatWindow::setupCustomActions()
 
     KAction *shareDesktopAction = new KAction(KIcon(QLatin1String("krfb")), i18n("Share My &Desktop"), this);
     connect(shareDesktopAction, SIGNAL(triggered()), this, SLOT(onShareDesktopTriggered()));
-    
+
     // add custom actions to the collection
     actionCollection()->addAction(QLatin1String("separator"), separator);
     actionCollection()->addAction(QLatin1String("next-tab"), nextTabAction);
@@ -617,17 +617,17 @@ void ChatWindow::startVideoCall(const Tp::AccountPtr& account, const Tp::Contact
                                                                                       true,
                                                                                       QDateTime::currentDateTime(),
                                                                                       QLatin1String(PREFERRED_AUDIO_VIDEO_HANDLER));
-    
+
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }
 
 void ChatWindow::startShareDesktop(const Tp::AccountPtr& account, const Tp::ContactPtr& contact)
 {
     Tp::PendingChannelRequest* channelRequest = account->createStreamTube(contact,
-                                                                          QLatin1String("rfb"), 
-                                                                          QDateTime::currentDateTime(), 
+                                                                          QLatin1String("rfb"),
+                                                                          QDateTime::currentDateTime(),
                                                                           QLatin1String(PREFERRED_RFB_HANDLER));
-    
+
     connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 }
 
diff --git a/app/chat-window.h b/app/chat-window.h
index 2fb2298..6cbc425 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -139,7 +139,7 @@ private:
      * @param contact contact with whom to start the video call
      */
     void startVideoCall(const Tp::AccountPtr &account, const Tp::ContactPtr &contact);
-    
+
     /** starts a desktop sharing session with given contact
      * @param account account starting the desktop share
      * @param contact contact with whom to start desktop share

-- 
ktp-text-ui packaging