[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=9e28194

The following commit has been merged in the master branch:
commit 9e28194909d2ddff6ea8839e696a962f16bc451f
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Jun 7 10:47:04 2011 +0200

    Move Tp::ClientRegistrar in main
---
 src/filetransfer-handler.cpp | 19 -------------------
 src/filetransfer-handler.h   |  2 --
 src/main.cpp                 | 20 ++++++++++++++++++++
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/filetransfer-handler.cpp b/src/filetransfer-handler.cpp
index 029e117..592a0ef 100644
--- a/src/filetransfer-handler.cpp
+++ b/src/filetransfer-handler.cpp
@@ -19,7 +19,6 @@
 #include "handle-incoming-file-transfer-channel-job.h"
 #include "handle-outgoing-file-transfer-channel-job.h"
 
-#include <TelepathyQt4/ClientRegistrar>
 #include <TelepathyQt4/ChannelFactory>
 #include <TelepathyQt4/ChannelClassSpecList>
 #include <TelepathyQt4/ChannelClassSpec>
@@ -44,24 +43,6 @@ FileTransferHandler::FileTransferHandler(QObject *parent) : QObject(parent),
     Tp::AbstractClientHandler(Tp::ChannelClassSpecList() << Tp::ChannelClassSpec::incomingFileTransfer()
                                                          << Tp::ChannelClassSpec::outgoingFileTransfer())
 {
-    Tp::AccountFactoryPtr accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus());
-
-    Tp::ConnectionFactoryPtr  connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus());
-
-    Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
-    channelFactory->addCommonFeatures(Tp::Channel::FeatureCore);
-    channelFactory->addFeaturesForIncomingFileTransfers(Tp::FileTransferChannel::FeatureCore);
-    channelFactory->addFeaturesForOutgoingFileTransfers(Tp::FileTransferChannel::FeatureCore);
-
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create();
-
-
-    registrar = Tp::ClientRegistrar::create(accountFactory,
-                                            connectionFactory,
-                                            channelFactory,
-                                            contactFactory);
-    registrar->registerClient(Tp::AbstractClientPtr(Tp::SharedPtr<FileTransferHandler>(this)),
-                              QLatin1String("KDE.FileTransfer"));
 }
 
 
diff --git a/src/filetransfer-handler.h b/src/filetransfer-handler.h
index 394a0af..d01c308 100644
--- a/src/filetransfer-handler.h
+++ b/src/filetransfer-handler.h
@@ -49,9 +49,7 @@ private Q_SLOTS:
     void onInfoMessage(KJob* job, const QString &plain, const QString &rich);
     void handleResult(KJob* job);
 
-
 private:
-    Tp::ClientRegistrarPtr registrar;
 };
 
 #endif // TELEPATHY_KDE_FILETRANSFER_HANDLER_H
diff --git a/src/main.cpp b/src/main.cpp
index 4082e67..5d0ce08 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,6 +22,8 @@
 #include <KAboutData>
 #include <KCmdLineArgs>
 #include <KApplication>
+#include <TelepathyQt4/ClientRegistrar>
+#include <TelepathyQt4/FileTransferChannel>
 
 int main(int argc, char* argv[])
 {
@@ -41,7 +43,25 @@ int main(int argc, char* argv[])
     Tp::enableWarnings(true);
 
 
+    Tp::AccountFactoryPtr accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus());
+
+    Tp::ConnectionFactoryPtr  connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus());
+
+    Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
+    channelFactory->addCommonFeatures(Tp::Channel::FeatureCore);
+    channelFactory->addFeaturesForIncomingFileTransfers(Tp::FileTransferChannel::FeatureCore);
+    channelFactory->addFeaturesForOutgoingFileTransfers(Tp::FileTransferChannel::FeatureCore);
+
+    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create();
+
+    Tp::ClientRegistrarPtr registrar = Tp::ClientRegistrar::create(accountFactory,
+                                                                   connectionFactory,
+                                                                   channelFactory,
+                                                                   contactFactory);
+
     Tp::SharedPtr<FileTransferHandler> fth = Tp::SharedPtr<FileTransferHandler>(new FileTransferHandler);
+    registrar->registerClient(Tp::AbstractClientPtr(fth),
+                              QLatin1String("KDE.FileTransfer"));
 
     return app.exec();
 }

-- 
ktp-filetransfer-handler packaging