[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=2b31608

The following commit has been merged in the master branch:
commit 2b31608c9400424f1f32d07a9a1378c00581e9fe
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Sun Jun 17 16:02:23 2012 +0300

    Remove redundant calls to g_type_init() and QGlib::init()
---
 lib/logmanager.cpp       | 5 -----
 logviewer/log-viewer.cpp | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/lib/logmanager.cpp b/lib/logmanager.cpp
index 747a35e..d4736d4 100644
--- a/lib/logmanager.cpp
+++ b/lib/logmanager.cpp
@@ -33,9 +33,6 @@
 #include <TelepathyLoggerQt4/TextEvent>
 #include <TelepathyLoggerQt4/CallEvent>
 #include <TelepathyLoggerQt4/LogManager>
-
-#include <glib-object.h>
-#include <QGlib/Init>
 #endif
 
 #include <TelepathyQt/Types>
@@ -48,8 +45,6 @@ LogManager::LogManager(QObject *parent)
     m_fetchAmount(10)
 {
 #ifdef TELEPATHY_LOGGER_QT4_FOUND
-    g_type_init();
-    QGlib::init();
     Tpl::init();
 
     m_logManager = Tpl::LogManager::instance();
diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index 7e37a40..2b472fa 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -28,9 +28,6 @@
 #include <TelepathyLoggerQt4/Entity>
 #include <TelepathyLoggerQt4/LogManager>
 
-#include <glib-object.h>
-#include <QGlib/Init>
-
 #include <QSortFilterProxyModel>
 
 #include "entity-model.h"
@@ -42,8 +39,6 @@ LogViewer::LogViewer(QWidget *parent) :
     ui->setupUi(this);
     setWindowIcon(KIcon(QLatin1String("documentation")));
     Tp::registerTypes();
-    g_type_init();
-    QGlib::init(); //are these 4 really needed?
     Tpl::init();
 
     m_accountManager = Tp::AccountManager::create();

-- 
ktp-text-ui packaging