[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=ac0756b

The following commit has been merged in the master branch:
commit ac0756baf911c7cceefbe99eda3e47d6d188b7cf
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Thu Feb 11 21:22:59 2010 +0000

    Tidy up main.cpp
    
    svn path=/trunk/playground/network/telepathy-integration-daemon/; revision=1088894
---
 kpeople/nepomuk-feeder/main.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/kpeople/nepomuk-feeder/main.cpp b/kpeople/nepomuk-feeder/main.cpp
index 8efdcf6..83a18ce 100644
--- a/kpeople/nepomuk-feeder/main.cpp
+++ b/kpeople/nepomuk-feeder/main.cpp
@@ -1,7 +1,8 @@
 /*
  * This file is part of telepathy-integration-daemon
  *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2009-2010 Collabora Ltd. <info at collabora.co.uk>
+ *   @author George Goldberg <george.goldberg at collabora.co.uk>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -32,6 +33,8 @@ extern "C"
 
 #include <Nepomuk/ResourceManager>
 
+#include <TelepathyQt4/Types>
+
 namespace
 {
     static void signal_handler(int signal)
@@ -47,13 +50,20 @@ namespace
 
 int main(int argc, char *argv[])
 {
-    KAboutData aboutData("telepathy-integration-daemon", 0, ki18n("Telepathy Integration Daemon"), "0.1");
+    KAboutData aboutData("telepathy-integration-daemon",
+                         0,
+                         ki18n("Telepathy Integration Daemon"),
+                         "0.1");
 
     KCmdLineArgs::init(argc, argv, &aboutData);
     KUniqueApplication app;
 
+    // Initialise Nepomuk.
     Nepomuk::ResourceManager::instance()->init();
 
+    // Initialise Telepathy.
+    Tp::registerTypes();
+
     // Create an instance of the Telepathy Account Monitor.
     TelepathyAccountMonitor *monitor = new TelepathyAccountMonitor(&app);
 
@@ -66,12 +76,12 @@ int main(int argc, char *argv[])
         kWarning() << "Setting up SIGTERM signal handler failed.";
     }
 
-    // Quite the application when the monitor is destroyed.
+    // Quie the application when the monitor is destroyed.
     QObject::connect(monitor, SIGNAL(destroyed()), &app, SLOT(quit()));
 
     kDebug() << "Let's go...";
 
     // Start event loop.
-    app.exec();
+    return app.exec();
 }
 

-- 
ktp-common-internals packaging