~ubuntu-branches/ubuntu/utopic/ktp-text-ui/utopic

« back to all changes in this revision

Viewing changes to debian/patches/03_no_redundant_glib_calls.diff

  • Committer: Package Import Robot
  • Author(s): Mark Purcell, Ritesh Raj Sarraf, Diane Trout, Mark Purcell
  • Date: 2013-08-11 11:01:09 UTC
  • mfrom: (1.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20130811110109-3t9ayj39at1do3qc
Tags: 0.6.3-1
[ Ritesh Raj Sarraf ]
* [e26f6a8] drop patch 03_no_redundant_glib_calls.diff
* [459ee64] Drop tests, for now, as they are failing

[ Diane Trout ]
* Update watch file as KDE-Telepathy is now in stable release.
* Bump ktp-common-internals version
* Plasma-widget-telpathy-chat was moved to ktp-desktop-applet
* Add telepathy-logger dependency
* Imported Upstream version 0.6.2.1
* Refresh patches
* Bump ktp-common-internal dependency
* Set Uploaders to Diane Trout and Michał Zając
* Update to Standards-Version 3.9.4. No changes needed.
* Add several plugins to kde-telepathy-text-ui.install
* Add description to 02_ktpchat_soversion.diff
* Merge libktpchat0 into ktp-telepathy-text-ui.
* Override lintian warnings about the libktpchat0 library.

[ Mark Purcell ] 
* Imported Upstream version 0.6.3
* Add myself to Uploaders
* Update Build-Depends: libktpcommoninternalsprivate-dev (>= 0.6.3)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
--- a/lib/logmanager.cpp
 
2
+++ b/lib/logmanager.cpp
 
3
@@ -33,9 +33,6 @@
 
4
 #include <TelepathyLoggerQt4/TextEvent>
 
5
 #include <TelepathyLoggerQt4/CallEvent>
 
6
 #include <TelepathyLoggerQt4/LogManager>
 
7
-
 
8
-#include <glib-object.h>
 
9
-#include <QGlib/Init>
 
10
 #endif
 
11
 
 
12
 #include <TelepathyQt/Types>
 
13
@@ -48,8 +45,6 @@
 
14
     m_fetchAmount(10)
 
15
 {
 
16
 #ifdef TELEPATHY_LOGGER_QT4_FOUND
 
17
-    g_type_init();
 
18
-    QGlib::init();
 
19
     Tpl::init();
 
20
 
 
21
     m_logManager = Tpl::LogManager::instance();
 
22
--- a/logviewer/log-viewer.cpp
 
23
+++ b/logviewer/log-viewer.cpp
 
24
@@ -28,9 +28,6 @@
 
25
 #include <TelepathyLoggerQt4/Entity>
 
26
 #include <TelepathyLoggerQt4/LogManager>
 
27
 
 
28
-#include <glib-object.h>
 
29
-#include <QGlib/Init>
 
30
-
 
31
 #include <QSortFilterProxyModel>
 
32
 
 
33
 #include "entity-model.h"
 
34
@@ -42,8 +39,6 @@
 
35
     ui->setupUi(this);
 
36
     setWindowIcon(KIcon(QLatin1String("documentation")));
 
37
     Tp::registerTypes();
 
38
-    g_type_init();
 
39
-    QGlib::init(); //are these 4 really needed?
 
40
     Tpl::init();
 
41
 
 
42
     m_accountManager = Tp::AccountManager::create();