[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=18351f8

The following commit has been merged in the master branch:
commit 18351f88c766f301477f04f3736e1614dd4692fb
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu May 26 22:52:09 2011 +0100

    Grouped related slot in main widget header declaration
---
 main-widget.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main-widget.h b/main-widget.h
index c763356..90a65fb 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -68,8 +68,7 @@ public:
 
 public Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);
-    void startTextChannel(const QModelIndex &index);
-    void startFileTransferChannel(const QModelIndex &index);
+
     void onContactListDoubleClick(const QModelIndex &index);
     void onConnectionChanged(const Tp::ConnectionPtr &connection);
     void onAccountConnectionStatusChanged(Tp::ConnectionStatus status);
@@ -87,6 +86,8 @@ public Q_SLOTS:
     void selectAvatarFromAccount(const QString &accountUID);
     void selectAvatarFromAccount();
     void loadAvatarFromFile();
+    void startTextChannel(const QModelIndex &index);
+    void startFileTransferChannel(const QModelIndex &index);
     void startAudioChannel(const QModelIndex &index);
     void startVideoChannel(const QModelIndex &index);
     void onCustomContextMenuRequested(const QPoint &point);

-- 
ktp-contact-list packaging