From 7632675222607ca5a9b27655ce7a74ba8b508761 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 12 Sep 2013 16:25:31 +0200 Subject: [PATCH 1/2] Use TP_DISABLE_SINGLE_INCLUDE https://bugs.freedesktop.org/show_bug.cgi?id=69311 --- configure.ac | 1 + src/idle-connection-manager.c | 1 - src/idle-connection-manager.h | 2 +- src/idle-connection.c | 10 ---------- src/idle-connection.h | 4 +--- src/idle-contact-info.c | 5 ----- src/idle-contact-info.h | 2 +- src/idle-debug.c | 3 +-- src/idle-handles.c | 3 +-- src/idle-handles.h | 2 +- src/idle-im-channel.c | 2 -- src/idle-im-channel.h | 4 +--- src/idle-im-manager.c | 4 +--- src/idle-muc-channel.c | 9 +-------- src/idle-muc-channel.h | 7 +------ src/idle-muc-manager.c | 4 +--- src/idle-parser.h | 2 +- src/idle-roomlist-manager.c | 5 +---- src/idle-server-connection.c | 2 +- src/idle-text.c | 2 -- src/idle-text.h | 2 +- src/idle.c | 4 +--- src/protocol.c | 2 -- src/protocol.h | 2 +- src/room-config.h | 2 +- tests/test-ctcp-tokenize.c | 2 +- tests/test-text-encode-and-split.c | 2 +- tools/glib-ginterface-gen.py | 2 +- 28 files changed, 22 insertions(+), 70 deletions(-) diff --git a/configure.ac b/configure.ac index 7b6f8f9..c097609 100644 --- a/configure.ac +++ b/configure.ac @@ -93,6 +93,7 @@ PKG_CHECK_MODULES([GLIB], PKG_CHECK_MODULES([DBUS], [dbus-1 >= 0.51, dbus-glib-1 >= 0.51]) +AC_DEFINE([TP_DISABLE_SINGLE_INCLUDE], [], [Disable single header include]) AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_22, [Ignore post 0.22 deprecations]) AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_22, [Prevent post 0.22 APIs]) PKG_CHECK_MODULES([TELEPATHY], [telepathy-glib >= 0.21]) diff --git a/src/idle-connection-manager.c b/src/idle-connection-manager.c index 7413c72..9c13f4c 100644 --- a/src/idle-connection-manager.c +++ b/src/idle-connection-manager.c @@ -23,7 +23,6 @@ #include "idle-connection-manager.h" #include -#include #include "idle-connection.h" #include "idle-handles.h" /* to check for valid nick */ diff --git a/src/idle-connection-manager.h b/src/idle-connection-manager.h index a7908e6..ba965c2 100644 --- a/src/idle-connection-manager.h +++ b/src/idle-connection-manager.h @@ -22,7 +22,7 @@ #define __IDLE_CONNECTION_MANAGER_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/src/idle-connection.c b/src/idle-connection.c index f1a0fbe..90536b5 100644 --- a/src/idle-connection.c +++ b/src/idle-connection.c @@ -28,16 +28,6 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #define IDLE_DEBUG_FLAG IDLE_DEBUG_CONNECTION #include "idle-contact-info.h" #include "idle-ctcp.h" diff --git a/src/idle-connection.h b/src/idle-connection.h index eb9c3f8..bd5f903 100644 --- a/src/idle-connection.h +++ b/src/idle-connection.h @@ -22,9 +22,7 @@ #define __IDLE_CONNECTION_H__ #include -#include -#include -#include +#include #include "idle-parser.h" diff --git a/src/idle-contact-info.c b/src/idle-contact-info.c index 0a9f40a..b056510 100644 --- a/src/idle-contact-info.c +++ b/src/idle-contact-info.c @@ -20,11 +20,6 @@ #include "config.h" #include "idle-contact-info.h" -#include -#include -#include -#include - #define IDLE_DEBUG_FLAG IDLE_DEBUG_CONNECTION #include "idle-debug.h" #include "idle-muc-channel.h" diff --git a/src/idle-contact-info.h b/src/idle-contact-info.h index 8baa198..d81b378 100644 --- a/src/idle-contact-info.h +++ b/src/idle-contact-info.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include "idle-connection.h" diff --git a/src/idle-debug.c b/src/idle-debug.c index 9b7ffcb..95c566c 100644 --- a/src/idle-debug.c +++ b/src/idle-debug.c @@ -21,8 +21,7 @@ #include "idle-debug.h" #include -#include -#include +#include static IdleDebugFlags _flags = 0; diff --git a/src/idle-handles.c b/src/idle-handles.c index 96cb3c8..0996ba6 100644 --- a/src/idle-handles.c +++ b/src/idle-handles.c @@ -25,8 +25,7 @@ #include #include -#include -#include +#include #define IDLE_DEBUG_FLAG IDLE_DEBUG_PARSER #include "idle-debug.h" diff --git a/src/idle-handles.h b/src/idle-handles.h index 4d2aad0..4e59bc3 100644 --- a/src/idle-handles.h +++ b/src/idle-handles.h @@ -22,7 +22,7 @@ #define __IDLE_HANDLES_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/src/idle-im-channel.c b/src/idle-im-channel.c index 0b6ca79..04773d5 100644 --- a/src/idle-im-channel.c +++ b/src/idle-im-channel.c @@ -24,8 +24,6 @@ #include -#include - #define IDLE_DEBUG_FLAG IDLE_DEBUG_IM #include "idle-connection.h" #include "idle-debug.h" diff --git a/src/idle-im-channel.h b/src/idle-im-channel.h index c995c3c..96dee14 100644 --- a/src/idle-im-channel.h +++ b/src/idle-im-channel.h @@ -22,9 +22,7 @@ #define __IDLE_IM_CHANNEL_H__ #include -#include -#include -#include +#include G_BEGIN_DECLS diff --git a/src/idle-im-manager.c b/src/idle-im-manager.c index d883c74..8d7c22d 100644 --- a/src/idle-im-manager.c +++ b/src/idle-im-manager.c @@ -22,9 +22,7 @@ #include "idle-im-manager.h" -#include -#include -#include +#include #define IDLE_DEBUG_FLAG IDLE_DEBUG_IM #include "idle-connection.h" diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c index 6e298aa..f91ca03 100644 --- a/src/idle-muc-channel.c +++ b/src/idle-muc-channel.c @@ -29,14 +29,7 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #define IDLE_DEBUG_FLAG IDLE_DEBUG_MUC #include "idle-connection.h" diff --git a/src/idle-muc-channel.h b/src/idle-muc-channel.h index 7743fca..4b7631a 100644 --- a/src/idle-muc-channel.h +++ b/src/idle-muc-channel.h @@ -24,12 +24,7 @@ #include #include -#include -#include -#include -#include -#include -#include +#include #include "idle-connection.h" diff --git a/src/idle-muc-manager.c b/src/idle-muc-manager.c index fdff375..03a5beb 100644 --- a/src/idle-muc-manager.c +++ b/src/idle-muc-manager.c @@ -24,9 +24,7 @@ #include -#include -#include -#include +#include #define IDLE_DEBUG_FLAG IDLE_DEBUG_MUC #include "idle-connection.h" diff --git a/src/idle-parser.h b/src/idle-parser.h index 7ba333e..cf56490 100644 --- a/src/idle-parser.h +++ b/src/idle-parser.h @@ -23,7 +23,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/src/idle-roomlist-manager.c b/src/idle-roomlist-manager.c index 0dbe133..1ce4652 100644 --- a/src/idle-roomlist-manager.c +++ b/src/idle-roomlist-manager.c @@ -23,10 +23,7 @@ #include "config.h" #include "idle-roomlist-manager.h" -#include -#include -#include -#include +#include #define IDLE_DEBUG_FLAG IDLE_DEBUG_ROOMLIST #include "idle-connection.h" diff --git a/src/idle-server-connection.c b/src/idle-server-connection.c index 66fe3d0..878b199 100644 --- a/src/idle-server-connection.c +++ b/src/idle-server-connection.c @@ -27,7 +27,7 @@ #include #include -#include +#include #define IDLE_DEBUG_FLAG IDLE_DEBUG_NETWORK #include "idle-connection.h" diff --git a/src/idle-text.c b/src/idle-text.c index e54b487..dbda8b0 100644 --- a/src/idle-text.c +++ b/src/idle-text.c @@ -24,8 +24,6 @@ #include #include -#include - #define IDLE_DEBUG_FLAG IDLE_DEBUG_TEXT #include "idle-ctcp.h" #include "idle-debug.h" diff --git a/src/idle-text.h b/src/idle-text.h index 1c9bdf3..fecd722 100644 --- a/src/idle-text.h +++ b/src/idle-text.h @@ -25,7 +25,7 @@ #include -#include +#include #include "idle-connection.h" diff --git a/src/idle.c b/src/idle.c index 8d3706b..62ee898 100644 --- a/src/idle.c +++ b/src/idle.c @@ -20,9 +20,7 @@ #include -#include -#include -#include +#include #include "idle-connection-manager.h" #include "idle-debug.h" diff --git a/src/protocol.c b/src/protocol.c index 8feda4e..489410a 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -23,8 +23,6 @@ #include #include -#include -#include #include "idle-connection.h" #include "idle-handles.h" diff --git a/src/protocol.h b/src/protocol.h index adf58a7..87de737 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -21,7 +21,7 @@ #define IDLE_PROTOCOL_H #include -#include +#include G_BEGIN_DECLS diff --git a/src/room-config.h b/src/room-config.h index 8d2eadb..44c2687 100644 --- a/src/room-config.h +++ b/src/room-config.h @@ -21,7 +21,7 @@ #define IDLE_ROOM_CONFIG_H #include -#include +#include typedef struct _IdleRoomConfig IdleRoomConfig; typedef struct _IdleRoomConfigClass IdleRoomConfigClass; diff --git a/tests/test-ctcp-tokenize.c b/tests/test-ctcp-tokenize.c index 9d15cff..92ceb92 100644 --- a/tests/test-ctcp-tokenize.c +++ b/tests/test-ctcp-tokenize.c @@ -6,7 +6,7 @@ #include #include -#include +#include int main (void) diff --git a/tests/test-text-encode-and-split.c b/tests/test-text-encode-and-split.c index c68439e..d2c4f72 100644 --- a/tests/test-text-encode-and-split.c +++ b/tests/test-text-encode-and-split.c @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/tools/glib-ginterface-gen.py b/tools/glib-ginterface-gen.py index 7843977..8fea5df 100644 --- a/tools/glib-ginterface-gen.py +++ b/tools/glib-ginterface-gen.py @@ -739,7 +739,7 @@ class Generator(object): self.h('#include ') if self.have_properties(nodes): - self.h('#include ') + self.h('#include ') self.h('') self.h('G_BEGIN_DECLS') -- 1.8.3.1