[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=d2aac60

The following commit has been merged in the master branch:
commit d2aac601bb6b1f65e3ddf5fbd370a388eb3817dc
Author: Diane Trout <diane at ghic.org>
Date:   Mon Nov 4 17:28:20 2013 +0100

    Fix a a signal/slot signature mistmatch Tp::ContactPtr to KTp::ContactPtr
    
    Signature updates for change from Tp::ContactPtr to KTp::ContactPtr
    
    The signal signature for ContactGridWidget::selectionChanged changed in ktp-common-internals and so the connection to the OK button in the UI never got the message to enable itself.
    
    BUG: 327137
    FIXED-IN: 0.7.1
    REVIEW: 113605
---
 mainwindow.cpp | 6 +++---
 mainwindow.h   | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 87fb0f7..5d78b68 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -130,8 +130,8 @@ MainWindow::MainWindow(const KUrl::List &urls, QWidget *parent) :
     ui->recipientVLayout->addWidget(m_contactGridWidget);
 
     connect(m_contactGridWidget,
-            SIGNAL(selectionChanged(Tp::AccountPtr,Tp::ContactPtr)),
-            SLOT(onContactSelectionChanged(Tp::AccountPtr,Tp::ContactPtr)));
+            SIGNAL(selectionChanged(Tp::AccountPtr,KTp::ContactPtr)),
+            SLOT(onContactSelectionChanged(Tp::AccountPtr,KTp::ContactPtr)));
 
     ui->buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
     connect(ui->buttonBox, SIGNAL(accepted()), SLOT(onDialogAccepted()));
@@ -171,7 +171,7 @@ void MainWindow::onDialogAccepted()
     }
 }
 
-void MainWindow::onContactSelectionChanged(Tp::AccountPtr account, Tp::ContactPtr contact)
+void MainWindow::onContactSelectionChanged(Tp::AccountPtr account, KTp::ContactPtr contact)
 {
     Q_UNUSED(account)
     Q_UNUSED(contact)
diff --git a/mainwindow.h b/mainwindow.h
index 397f6b9..7055e00 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -26,6 +26,7 @@
 #include <KUrl>
 
 #include <TelepathyQt/AccountManager>
+#include <KTp/contact.h>
 
 
 namespace Ui {
@@ -53,7 +54,7 @@ private Q_SLOTS:
     void onDialogAccepted();
     void onPreviewLoaded(const KFileItem &item, const QPixmap &preview);
     void onPreviewFailed(const KFileItem &item);
-    void onContactSelectionChanged(Tp::AccountPtr account, Tp::ContactPtr contact);
+    void onContactSelectionChanged(Tp::AccountPtr account, KTp::ContactPtr contact);
     void slotFileTransferFinished(Tp::PendingOperation *op);
 
 private:

-- 
ktp-send-file packaging