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

The following commit has been merged in the master branch:
commit e9171a7293488eed832049f32a74620ba15046b1
Merge: a71f94149ca1c2d78086ab82ad138cd9091b1d97 d94622462bf659a45fdbc72e1d74cb088722aa05
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Fri Dec 28 01:28:31 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	filters/formatting/ktptextui_message_filter_formatting.desktop
    	logviewer/log-viewer.cpp

 .../ktptextui_message_filter_formatting.desktop    | 99 +++++++++++-----------
 logviewer/main.cpp                                 |  1 +
 2 files changed, 52 insertions(+), 48 deletions(-)

diff --cc logviewer/main.cpp
index e27d2bf,e7eb0b5..d1ddee7
--- a/logviewer/main.cpp
+++ b/logviewer/main.cpp
@@@ -48,32 -42,9 +48,33 @@@ int main(int argc, char *argv[]
  
      KCmdLineArgs::addCmdLineOptions(options);
  
 -    KApplication a;
 -    LogViewer w;
 -    w.show();
 +    KApplication app;
 +
 +    Tp::registerTypes();
 +    Tpl::init();
 +
 +    Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(
 +                                                QDBusConnection::sessionBus(),
 +                                                Tp::Features() << Tp::Account::FeatureCore
++                                                    << Tp::Account::FeatureAvatar
 +						    << Tp::Account::FeatureProfile);
 +
 +    Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(
 +                                                QDBusConnection::sessionBus(),
 +                                                Tp::Features() << Tp::Connection::FeatureCore
 +                                                    << Tp::Connection::FeatureSelfContact
 +                                                    << Tp::Connection::FeatureRoster);
 +
 +    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(
 +                                                Tp::Features()  << Tp::Contact::FeatureAlias
 +                                                    << Tp::Contact::FeatureAvatarData
 +                                                    << Tp::Contact::FeatureSimplePresence
 +                                                    << Tp::Contact::FeatureCapabilities);
 +
 +    Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
 +
 +    LogViewer *logViewer = new LogViewer(accountFactory, connectionFactory, channelFactory, contactFactory);
 +    logViewer->show();
  
 -    return a.exec();
 +    return app.exec();
  }

-- 
ktp-text-ui packaging