diff options
author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-07-02 14:59:47 +0200 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-07-03 12:10:01 +0200 |
commit | 1c45faf788f2acd337f4adf23ea4f3f6a003f085 (patch) | |
tree | 5d70461f1760b12be77051499b968c5dd568ae53 /telepathy-logger | |
parent | 4b7a97be0f8250af48c5b9f97cace813bc64c0f8 (diff) | |
download | telepathy-logger-1c45faf788f2acd337f4adf23ea4f3f6a003f085.tar.gz |
Disable single include of telepathy-glib headers
Diffstat (limited to 'telepathy-logger')
23 files changed, 27 insertions, 49 deletions
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am index 4809af4..1ad4bb8 100644 --- a/telepathy-logger/Makefile.am +++ b/telepathy-logger/Makefile.am @@ -14,7 +14,8 @@ AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ -DG_LOG_DOMAIN=\"tp-logger\" \ -DTPL_DATA_DIR=\"$(PACKAGE_NAME)\" \ - $(TPL_CFLAGS) \ + -DTP_DISABLE_SINGLE_INCLUDE \ + $(TPL_CFLAGS) \ $(DISABLE_DEPRECATED) \ $(WARN_CFLAGS) diff --git a/telepathy-logger/call-event.c b/telepathy-logger/call-event.c index 47516f3..fe4b446 100644 --- a/telepathy-logger/call-event.c +++ b/telepathy-logger/call-event.c @@ -23,7 +23,7 @@ #include "call-event-internal.h" #include <glib-object.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "entity.h" #include "event.h" diff --git a/telepathy-logger/channel-factory-internal.h b/telepathy-logger/channel-factory-internal.h index 50b95c2..01fdb19 100644 --- a/telepathy-logger/channel-factory-internal.h +++ b/telepathy-logger/channel-factory-internal.h @@ -22,8 +22,7 @@ #define __TPL_CHANNEL_FACTORY_H__ #include <glib-object.h> -#include <telepathy-glib/connection.h> -#include <telepathy-glib/account.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/channel-internal.h> diff --git a/telepathy-logger/channel-factory.c b/telepathy-logger/channel-factory.c index 0fe69b6..60ad7ef 100644 --- a/telepathy-logger/channel-factory.c +++ b/telepathy-logger/channel-factory.c @@ -21,7 +21,7 @@ #include "config.h" #include "channel-factory-internal.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/text-channel-internal.h> diff --git a/telepathy-logger/channel-internal.h b/telepathy-logger/channel-internal.h index b2d23f3..c98501f 100644 --- a/telepathy-logger/channel-internal.h +++ b/telepathy-logger/channel-internal.h @@ -24,9 +24,7 @@ #include <gio/gio.h> #include <glib.h> #include <glib-object.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/connection.h> -#include <telepathy-glib/channel.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/telepathy-logger/conf.c b/telepathy-logger/conf.c index fea99fa..d9e21fb 100644 --- a/telepathy-logger/conf.c +++ b/telepathy-logger/conf.c @@ -24,7 +24,7 @@ #include <glib.h> #include <gio/gio.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG TPL_DEBUG_CONF #include <telepathy-logger/debug-internal.h> diff --git a/telepathy-logger/dbus-service-internal.h b/telepathy-logger/dbus-service-internal.h index e7883ce..d3d0dda 100644 --- a/telepathy-logger/dbus-service-internal.h +++ b/telepathy-logger/dbus-service-internal.h @@ -22,7 +22,7 @@ #define __TPL_DBUS_SERVICE_H__ #include <glib-object.h> -#include <telepathy-glib/dbus-properties-mixin.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/log-manager.h> diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c index 5dcacc5..9300c0e 100644 --- a/telepathy-logger/dbus-service.c +++ b/telepathy-logger/dbus-service.c @@ -25,10 +25,8 @@ #include <sys/stat.h> #include <glib.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/svc-generic.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <telepathy-logger/event-internal.h> #include <telepathy-logger/text-event.h> diff --git a/telepathy-logger/debug-internal.h b/telepathy-logger/debug-internal.h index 1ea214a..8d39bcc 100644 --- a/telepathy-logger/debug-internal.h +++ b/telepathy-logger/debug-internal.h @@ -26,7 +26,7 @@ #include <string.h> #include <glib.h> -#include <telepathy-glib/defs.h> +#include <telepathy-glib/telepathy-glib.h> #ifdef ENABLE_DEBUG diff --git a/telepathy-logger/debug.c b/telepathy-logger/debug.c index 6bf370b..7b38564 100644 --- a/telepathy-logger/debug.c +++ b/telepathy-logger/debug.c @@ -21,7 +21,7 @@ #include "config.h" #include "telepathy-logger/debug-internal.h" -#include <telepathy-glib/debug.h> +#include <telepathy-glib/telepathy-glib.h> #ifdef ENABLE_DEBUG diff --git a/telepathy-logger/entity-internal.h b/telepathy-logger/entity-internal.h index de6f8b4..d9c6eef 100644 --- a/telepathy-logger/entity-internal.h +++ b/telepathy-logger/entity-internal.h @@ -24,7 +24,7 @@ #include <telepathy-logger/entity.h> #include <glib-object.h> -#include <telepathy-glib/contact.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS #define TPL_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TPL_TYPE_ENTITY, TplEntityClass)) diff --git a/telepathy-logger/entity.c b/telepathy-logger/entity.c index b0e114d..e2e3240 100644 --- a/telepathy-logger/entity.c +++ b/telepathy-logger/entity.c @@ -22,7 +22,7 @@ #include "entity.h" #include "entity-internal.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #define DEBUG_FLAG TPL_DEBUG_ENTITY #include <telepathy-logger/debug-internal.h> diff --git a/telepathy-logger/entity.h b/telepathy-logger/entity.h index 2a79b50..5f61b99 100644 --- a/telepathy-logger/entity.h +++ b/telepathy-logger/entity.h @@ -22,7 +22,7 @@ #define __TPL_ENTITY_H__ #include <glib-object.h> -#include <telepathy-glib/contact.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS #define TPL_TYPE_ENTITY (tpl_entity_get_type ()) diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c index f11a58e..b4b92dd 100644 --- a/telepathy-logger/log-manager.c +++ b/telepathy-logger/log-manager.c @@ -30,8 +30,7 @@ #include <gio/gio.h> #include <glib/gstdio.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/conf-internal.h> #include <telepathy-logger/entity-internal.h> diff --git a/telepathy-logger/log-manager.h b/telepathy-logger/log-manager.h index 777c7a7..6946653 100644 --- a/telepathy-logger/log-manager.h +++ b/telepathy-logger/log-manager.h @@ -24,7 +24,7 @@ #include <gio/gio.h> #include <glib-object.h> -#include <telepathy-glib/account.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/event.h> diff --git a/telepathy-logger/log-store-internal.h b/telepathy-logger/log-store-internal.h index bbb5c51..1003656 100644 --- a/telepathy-logger/log-store-internal.h +++ b/telepathy-logger/log-store-internal.h @@ -23,7 +23,7 @@ #define __TPL_LOG_STORE_H__ #include <glib-object.h> -#include <telepathy-glib/account.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/event.h> #include <telepathy-logger/log-manager.h> diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c index cf1b9ee..488f48b 100644 --- a/telepathy-logger/log-store-pidgin.c +++ b/telepathy-logger/log-store-pidgin.c @@ -26,9 +26,7 @@ #include <string.h> #include <stdio.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "log-store-internal.h" #include "log-store-pidgin-internal.h" diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c index 907191f..bde4ca5 100644 --- a/telepathy-logger/log-store-xml.c +++ b/telepathy-logger/log-store-xml.c @@ -33,11 +33,8 @@ #include <glib-object.h> #include <libxml/parser.h> #include <libxml/tree.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/account-manager.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/defs.h> -#include <telepathy-glib/util.h> + +#include <telepathy-glib/telepathy-glib.h> #include "telepathy-logger/call-event.h" #include "telepathy-logger/call-event-internal.h" diff --git a/telepathy-logger/observer-internal.h b/telepathy-logger/observer-internal.h index 972b03b..13d31c2 100644 --- a/telepathy-logger/observer-internal.h +++ b/telepathy-logger/observer-internal.h @@ -23,8 +23,7 @@ #include <glib-object.h> -#include <telepathy-glib/base-client.h> -#include <telepathy-glib/dbus-properties-mixin.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/channel-internal.h> #include <telepathy-logger/channel-factory-internal.h> diff --git a/telepathy-logger/observer.c b/telepathy-logger/observer.c index 0be6f65..5ca1cb5 100644 --- a/telepathy-logger/observer.c +++ b/telepathy-logger/observer.c @@ -22,13 +22,8 @@ #include "observer-internal.h" #include <glib.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/svc-client.h> -#include <telepathy-glib/account-manager.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <telepathy-logger/channel-internal.h> #include <telepathy-logger/channel-factory-internal.h> diff --git a/telepathy-logger/text-channel-internal.h b/telepathy-logger/text-channel-internal.h index 2e4a8ab..20a98f0 100644 --- a/telepathy-logger/text-channel-internal.h +++ b/telepathy-logger/text-channel-internal.h @@ -26,11 +26,7 @@ */ #include <glib-object.h> -#include <telepathy-glib/account.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/connection.h> -#include <telepathy-glib/contact.h> -#include <telepathy-glib/text-channel.h> +#include <telepathy-glib/telepathy-glib.h> #include "channel-internal.h" diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c index fa98eba..c79c723 100644 --- a/telepathy-logger/text-channel.c +++ b/telepathy-logger/text-channel.c @@ -23,9 +23,7 @@ #include "text-channel-internal.h" #include <glib.h> -#include <telepathy-glib/contact.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/proxy.h> +#include <telepathy-glib/telepathy-glib.h> #include "action-chain-internal.h" #include "channel-internal.h" diff --git a/telepathy-logger/text-event.c b/telepathy-logger/text-event.c index 3e7e188..47dae65 100644 --- a/telepathy-logger/text-event.c +++ b/telepathy-logger/text-event.c @@ -23,7 +23,7 @@ #include "text-event-internal.h" #include <glib-object.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include <telepathy-logger/event.h> #include <telepathy-logger/event-internal.h> |