[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=5015460

The following commit has been merged in the master branch:
commit 5015460c6fbd9696bf482e53e7cb94b64097db12
Author: Niels Ole Salscheider <niels_ole at salscheider-online.de>
Date:   Fri Mar 25 15:36:10 2016 +0100

    Instantiate QApplication before calling sessionBus()
    
    Otherwise, the names can be available on the bus before the objects
    are registered with QtDBus. This causes the text-ui to be empty when
    started from ktp-contact-list with qt 5.6.
    
    REVIEW: 127493
---
 app/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/main.cpp b/app/main.cpp
index 2afd684..b62c56b 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -51,6 +51,8 @@ int main(int argc, char *argv[])
     Tp::registerTypes();
     KTp::registerOtrTypes();
 
+    Tp::SharedPtr<TelepathyChatUi> app(new TelepathyChatUi(argc, argv));
+
     Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
     channelFactory->addCommonFeatures(Tp::Channel::FeatureCore);
 
@@ -64,7 +66,6 @@ int main(int argc, char *argv[])
 
     Tp::ClientRegistrarPtr registrar = Tp::ClientRegistrar::create(KTp::accountFactory(), KTp::connectionFactory(), channelFactory, KTp::contactFactory());
 
-    Tp::SharedPtr<TelepathyChatUi> app(new TelepathyChatUi(argc, argv));
     Tp::AbstractClientPtr handler = Tp::AbstractClientPtr(app);
     registrar->registerClient(handler, QLatin1String(KTP_TEXTUI_CLIENT_NAME));
 

-- 
ktp-text-ui packaging