[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:14:31 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=02c752b
The following commit has been merged in the master branch:
commit 02c752b474b016694210301401732a0278022190
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Feb 9 18:18:30 2012 +0100
Save the url instead of getting it from parsed args
Fix crash when started with no args
---
mainwindow.cpp | 8 +++-----
mainwindow.h | 1 +
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5005195..3af5748 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -25,7 +25,6 @@
#include <KFileItemList>
#include <KIO/PreviewJob>
#include <KApplication>
-#include <KCmdLineArgs>
#include <KMimeType>
#include <KDebug>
#include <KMessageBox>
@@ -106,6 +105,7 @@ QSize ContactGridDelegate::sizeHint(const QStyleOptionViewItem &option, const QM
MainWindow::MainWindow(const KUrl &url, QWidget *parent) :
QWidget(parent),
ui(new Ui::MainWindow),
+ m_url(url),
m_accountsModel(0)
{
Tp::registerTypes();
@@ -207,10 +207,8 @@ void MainWindow::onDialogAccepted()
}
// start sending file
- QString filePath (KCmdLineArgs::parsedArgs()->arg(0));
- kDebug() << "FILE TO SEND: " << filePath;
-
- Tp::FileTransferChannelCreationProperties fileTransferProperties(filePath, KMimeType::findByFileContent(filePath)->name());
+ kDebug() << "FILE TO SEND: " << m_url.path();
+ Tp::FileTransferChannelCreationProperties fileTransferProperties(m_url.path(), KMimeType::findByFileContent(m_url.path())->name());
Tp::PendingChannelRequest* channelRequest = sendingAccount->createFileTransfer(contact,
fileTransferProperties,
diff --git a/mainwindow.h b/mainwindow.h
index 3e7c70a..7bb60df 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -52,6 +52,7 @@ private slots:
private:
Ui::MainWindow *ui;
+ KUrl m_url;
AccountsModel *m_accountsModel;
Tp::AccountManagerPtr m_accountManager;
--
ktp-send-file packaging
More information about the pkg-kde-commits
mailing list