diff options
113 files changed, 103 insertions, 122 deletions
diff --git a/examples/client/Makefile.am b/examples/client/Makefile.am index 4e327938a..9e0987b00 100644 --- a/examples/client/Makefile.am +++ b/examples/client/Makefile.am @@ -59,7 +59,6 @@ LDADD = \ AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/client/dbus-tubes/Makefile.am b/examples/client/dbus-tubes/Makefile.am index 0cf7d4473..d30b83b79 100644 --- a/examples/client/dbus-tubes/Makefile.am +++ b/examples/client/dbus-tubes/Makefile.am @@ -15,10 +15,6 @@ LDADD = \ @DBUS_LIBS@ \ @GLIB_LIBS@ -AM_CPPFLAGS = \ - -DTP_DISABLE_SINGLE_INCLUDE \ - $(NULL) - AM_CFLAGS = \ $(ERROR_CFLAGS) \ @DBUS_CFLAGS@ \ diff --git a/examples/client/stream-tubes/Makefile.am b/examples/client/stream-tubes/Makefile.am index f0d772279..5cc7340f6 100644 --- a/examples/client/stream-tubes/Makefile.am +++ b/examples/client/stream-tubes/Makefile.am @@ -16,10 +16,6 @@ LDADD = \ @GLIB_LIBS@ \ $(NULL) -AM_CPPFLAGS = \ - -DTP_DISABLE_SINGLE_INCLUDE \ - $(NULL) - AM_CFLAGS = \ $(ERROR_CFLAGS) \ @DBUS_CFLAGS@ \ diff --git a/examples/cm/call/Makefile.am b/examples/cm/call/Makefile.am index c320ca992..c07aa99eb 100644 --- a/examples/cm/call/Makefile.am +++ b/examples/cm/call/Makefile.am @@ -65,7 +65,6 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/channelspecific/Makefile.am b/examples/cm/channelspecific/Makefile.am index 255295215..a32b51492 100644 --- a/examples/cm/channelspecific/Makefile.am +++ b/examples/cm/channelspecific/Makefile.am @@ -62,7 +62,6 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/contactlist/Makefile.am b/examples/cm/contactlist/Makefile.am index dd6ca3306..8e6472df9 100644 --- a/examples/cm/contactlist/Makefile.am +++ b/examples/cm/contactlist/Makefile.am @@ -58,7 +58,6 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/echo-message-parts/Makefile.am b/examples/cm/echo-message-parts/Makefile.am index 8962ed820..be32c8c05 100644 --- a/examples/cm/echo-message-parts/Makefile.am +++ b/examples/cm/echo-message-parts/Makefile.am @@ -58,7 +58,6 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/extended/Makefile.am b/examples/cm/extended/Makefile.am index 2e00e54b9..98e6c7a2d 100644 --- a/examples/cm/extended/Makefile.am +++ b/examples/cm/extended/Makefile.am @@ -47,7 +47,6 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/cm/no-protocols/Makefile.am b/examples/cm/no-protocols/Makefile.am index 8deb0a054..e3f541831 100644 --- a/examples/cm/no-protocols/Makefile.am +++ b/examples/cm/no-protocols/Makefile.am @@ -42,7 +42,6 @@ LDADD = \ # AM_CPPFLAGS. AM_CPPFLAGS = \ -I${top_srcdir} -I${top_builddir} \ - -DTP_DISABLE_SINGLE_INCLUDE \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(NULL) diff --git a/examples/extensions/Makefile.am b/examples/extensions/Makefile.am index 35c8d588e..5f8d2fd64 100644 --- a/examples/extensions/Makefile.am +++ b/examples/extensions/Makefile.am @@ -9,10 +9,6 @@ tools_dir = $(top_srcdir)/tools -AM_CPPFLAGS = \ - -DTP_DISABLE_SINGLE_INCLUDE \ - $(NULL) - AM_CFLAGS = \ $(ERROR_CFLAGS) \ $(DBUS_CFLAGS) \ diff --git a/telepathy-glib/account-channel-request.h b/telepathy-glib/account-channel-request.h index de95dff11..986221807 100644 --- a/telepathy-glib/account-channel-request.h +++ b/telepathy-glib/account-channel-request.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/account-manager.h b/telepathy-glib/account-manager.h index feb1a42af..4864ee039 100644 --- a/telepathy-glib/account-manager.h +++ b/telepathy-glib/account-manager.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/account-request.h b/telepathy-glib/account-request.h index 9ec441255..fad19d7b4 100644 --- a/telepathy-glib/account-request.h +++ b/telepathy-glib/account-request.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h index 86edbffd2..6dff69538 100644 --- a/telepathy-glib/account.h +++ b/telepathy-glib/account.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/add-dispatch-operation-context.h b/telepathy-glib/add-dispatch-operation-context.h index 25d0e179d..ee740f845 100644 --- a/telepathy-glib/add-dispatch-operation-context.h +++ b/telepathy-glib/add-dispatch-operation-context.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/automatic-client-factory.h b/telepathy-glib/automatic-client-factory.h index ea8c9ae8b..67327a927 100644 --- a/telepathy-glib/automatic-client-factory.h +++ b/telepathy-glib/automatic-client-factory.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-call-channel.h b/telepathy-glib/base-call-channel.h index 8130ccb3c..477f2089a 100644 --- a/telepathy-glib/base-call-channel.h +++ b/telepathy-glib/base-call-channel.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-call-content.h b/telepathy-glib/base-call-content.h index 6ce3a62f4..c3a8d8087 100644 --- a/telepathy-glib/base-call-content.h +++ b/telepathy-glib/base-call-content.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-call-stream.h b/telepathy-glib/base-call-stream.h index ebeab6359..02cfed361 100644 --- a/telepathy-glib/base-call-stream.h +++ b/telepathy-glib/base-call-stream.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-channel.h b/telepathy-glib/base-channel.h index bf3b0f1d3..746cbc462 100644 --- a/telepathy-glib/base-channel.h +++ b/telepathy-glib/base-channel.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-client.h b/telepathy-glib/base-client.h index 582419ab1..9dfc0bfda 100644 --- a/telepathy-glib/base-client.h +++ b/telepathy-glib/base-client.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-connection-manager.h b/telepathy-glib/base-connection-manager.h index 69666e5d5..384c024af 100644 --- a/telepathy-glib/base-connection-manager.h +++ b/telepathy-glib/base-connection-manager.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h index 8e3d7ae09..f8a00c8a2 100644 --- a/telepathy-glib/base-connection.h +++ b/telepathy-glib/base-connection.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-contact-list.h b/telepathy-glib/base-contact-list.h index c2263eac1..e8fea2903 100644 --- a/telepathy-glib/base-contact-list.h +++ b/telepathy-glib/base-contact-list.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-media-call-channel.h b/telepathy-glib/base-media-call-channel.h index 72643c0c5..277a71a3e 100644 --- a/telepathy-glib/base-media-call-channel.h +++ b/telepathy-glib/base-media-call-channel.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-media-call-content.h b/telepathy-glib/base-media-call-content.h index d209dc855..c7e053915 100644 --- a/telepathy-glib/base-media-call-content.h +++ b/telepathy-glib/base-media-call-content.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-media-call-stream.h b/telepathy-glib/base-media-call-stream.h index b8ee262c0..78a45d087 100644 --- a/telepathy-glib/base-media-call-stream.h +++ b/telepathy-glib/base-media-call-stream.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-password-channel.h b/telepathy-glib/base-password-channel.h index 1cabae313..4f9e0b3a0 100644 --- a/telepathy-glib/base-password-channel.h +++ b/telepathy-glib/base-password-channel.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-protocol.h b/telepathy-glib/base-protocol.h index e57b4d963..01e91375e 100644 --- a/telepathy-glib/base-protocol.h +++ b/telepathy-glib/base-protocol.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/base-room-config.h b/telepathy-glib/base-room-config.h index b6f0cc355..e34c99b79 100644 --- a/telepathy-glib/base-room-config.h +++ b/telepathy-glib/base-room-config.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/call-channel.h b/telepathy-glib/call-channel.h index d6cf07e2f..36e93802e 100644 --- a/telepathy-glib/call-channel.h +++ b/telepathy-glib/call-channel.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/call-content-media-description.h b/telepathy-glib/call-content-media-description.h index 8e85dbf93..770114775 100644 --- a/telepathy-glib/call-content-media-description.h +++ b/telepathy-glib/call-content-media-description.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/call-content.h b/telepathy-glib/call-content.h index 8bd3eea98..616b6a0df 100644 --- a/telepathy-glib/call-content.h +++ b/telepathy-glib/call-content.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/call-misc.h b/telepathy-glib/call-misc.h index 5ea50f7c3..e5880b4d5 100644 --- a/telepathy-glib/call-misc.h +++ b/telepathy-glib/call-misc.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/call-stream-endpoint.h b/telepathy-glib/call-stream-endpoint.h index 431bd8a45..5d256a752 100644 --- a/telepathy-glib/call-stream-endpoint.h +++ b/telepathy-glib/call-stream-endpoint.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/call-stream.h b/telepathy-glib/call-stream.h index 6adb07b91..a82064242 100644 --- a/telepathy-glib/call-stream.h +++ b/telepathy-glib/call-stream.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/capabilities.h b/telepathy-glib/capabilities.h index 8d027cb50..31d71ff81 100644 --- a/telepathy-glib/capabilities.h +++ b/telepathy-glib/capabilities.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/channel-dispatch-operation.h b/telepathy-glib/channel-dispatch-operation.h index 4306027a4..9e31e83fc 100644 --- a/telepathy-glib/channel-dispatch-operation.h +++ b/telepathy-glib/channel-dispatch-operation.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/channel-dispatcher.h b/telepathy-glib/channel-dispatcher.h index b6ad6d38c..480e907f4 100644 --- a/telepathy-glib/channel-dispatcher.h +++ b/telepathy-glib/channel-dispatcher.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/channel-iface.h b/telepathy-glib/channel-iface.h index 47bdcb764..05e1cd470 100644 --- a/telepathy-glib/channel-iface.h +++ b/telepathy-glib/channel-iface.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/channel-manager.h b/telepathy-glib/channel-manager.h index 0b06daf30..e0b172f81 100644 --- a/telepathy-glib/channel-manager.h +++ b/telepathy-glib/channel-manager.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/channel-request.h b/telepathy-glib/channel-request.h index 91ec9d057..840e8670f 100644 --- a/telepathy-glib/channel-request.h +++ b/telepathy-glib/channel-request.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h index db3f795f1..77ca0b1ed 100644 --- a/telepathy-glib/channel.h +++ b/telepathy-glib/channel.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/client-factory.h b/telepathy-glib/client-factory.h index 48295bbd4..f007aad21 100644 --- a/telepathy-glib/client-factory.h +++ b/telepathy-glib/client-factory.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/client-message.h b/telepathy-glib/client-message.h index e3ddfc971..ece4f27a3 100644 --- a/telepathy-glib/client-message.h +++ b/telepathy-glib/client-message.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/client.h b/telepathy-glib/client.h index 470100c73..42121a764 100644 --- a/telepathy-glib/client.h +++ b/telepathy-glib/client.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/cm-message.h b/telepathy-glib/cm-message.h index e9db42483..594feada0 100644 --- a/telepathy-glib/cm-message.h +++ b/telepathy-glib/cm-message.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/connection-contact-list.h b/telepathy-glib/connection-contact-list.h index 8a9f99d65..25a95f02c 100644 --- a/telepathy-glib/connection-contact-list.h +++ b/telepathy-glib/connection-contact-list.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h index ac4208671..d4e30da38 100644 --- a/telepathy-glib/connection-manager.h +++ b/telepathy-glib/connection-manager.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h index 0f14c46a4..9b64ff8de 100644 --- a/telepathy-glib/connection.h +++ b/telepathy-glib/connection.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/contact-operations.h b/telepathy-glib/contact-operations.h index 55a377f42..ca9e76a18 100644 --- a/telepathy-glib/contact-operations.h +++ b/telepathy-glib/contact-operations.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/contact-search-result.h b/telepathy-glib/contact-search-result.h index 4e9460277..3db4b7dce 100644 --- a/telepathy-glib/contact-search-result.h +++ b/telepathy-glib/contact-search-result.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/contact-search.h b/telepathy-glib/contact-search.h index 4a9b0a91d..df7ee313a 100644 --- a/telepathy-glib/contact-search.h +++ b/telepathy-glib/contact-search.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/contact.h b/telepathy-glib/contact.h index ed4928c33..8bcbf9868 100644 --- a/telepathy-glib/contact.h +++ b/telepathy-glib/contact.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/contacts-mixin.h b/telepathy-glib/contacts-mixin.h index 6d0f1cc55..96c48b091 100644 --- a/telepathy-glib/contacts-mixin.h +++ b/telepathy-glib/contacts-mixin.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/dbus-properties-mixin.h b/telepathy-glib/dbus-properties-mixin.h index dff7271f5..6d72d0f0a 100644 --- a/telepathy-glib/dbus-properties-mixin.h +++ b/telepathy-glib/dbus-properties-mixin.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/dbus-tube-channel.h b/telepathy-glib/dbus-tube-channel.h index 7d08eaed9..0d61d6029 100644 --- a/telepathy-glib/dbus-tube-channel.h +++ b/telepathy-glib/dbus-tube-channel.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h index df09e51e6..2ca9ce900 100644 --- a/telepathy-glib/dbus.h +++ b/telepathy-glib/dbus.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/debug-client.h b/telepathy-glib/debug-client.h index 0b5d930c3..9377221e2 100644 --- a/telepathy-glib/debug-client.h +++ b/telepathy-glib/debug-client.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/debug-message.h b/telepathy-glib/debug-message.h index eba53b19a..a499cd35d 100644 --- a/telepathy-glib/debug-message.h +++ b/telepathy-glib/debug-message.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/debug-sender.h b/telepathy-glib/debug-sender.h index 068dbbca8..0869e1c62 100644 --- a/telepathy-glib/debug-sender.h +++ b/telepathy-glib/debug-sender.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/debug.h b/telepathy-glib/debug.h index 1d6a9f2eb..506f6928c 100644 --- a/telepathy-glib/debug.h +++ b/telepathy-glib/debug.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h index 572ac2217..0b0bdb59a 100644 --- a/telepathy-glib/defs.h +++ b/telepathy-glib/defs.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/dtmf.h b/telepathy-glib/dtmf.h index b147e816b..386927afe 100644 --- a/telepathy-glib/dtmf.h +++ b/telepathy-glib/dtmf.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/enums.h b/telepathy-glib/enums.h index f6629394b..181fd7194 100644 --- a/telepathy-glib/enums.h +++ b/telepathy-glib/enums.h @@ -22,7 +22,7 @@ #ifndef __TP_ENUMS_H__ #define __TP_ENUMS_H__ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/errors.h b/telepathy-glib/errors.h index 27ddb125a..0e2aab745 100644 --- a/telepathy-glib/errors.h +++ b/telepathy-glib/errors.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/exportable-channel.h b/telepathy-glib/exportable-channel.h index 6bc0384c5..80cb0acde 100644 --- a/telepathy-glib/exportable-channel.h +++ b/telepathy-glib/exportable-channel.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/file-transfer-channel.h b/telepathy-glib/file-transfer-channel.h index cbd645e4f..bc25a3199 100644 --- a/telepathy-glib/file-transfer-channel.h +++ b/telepathy-glib/file-transfer-channel.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/gnio-util.h b/telepathy-glib/gnio-util.h index d82c17da5..b7a2f37ec 100644 --- a/telepathy-glib/gnio-util.h +++ b/telepathy-glib/gnio-util.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/group-mixin.h b/telepathy-glib/group-mixin.h index 8285ca49a..1e3fb40e7 100644 --- a/telepathy-glib/group-mixin.h +++ b/telepathy-glib/group-mixin.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/gtypes.h b/telepathy-glib/gtypes.h index e7d53c766..037c0210b 100644 --- a/telepathy-glib/gtypes.h +++ b/telepathy-glib/gtypes.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/handle-channels-context.h b/telepathy-glib/handle-channels-context.h index aaa28d6a8..0e814f9db 100644 --- a/telepathy-glib/handle-channels-context.h +++ b/telepathy-glib/handle-channels-context.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/handle-repo-dynamic.h b/telepathy-glib/handle-repo-dynamic.h index be4f33f40..cca12f329 100644 --- a/telepathy-glib/handle-repo-dynamic.h +++ b/telepathy-glib/handle-repo-dynamic.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/handle-repo-static.h b/telepathy-glib/handle-repo-static.h index 6ea2b916d..c3af5d1fa 100644 --- a/telepathy-glib/handle-repo-static.h +++ b/telepathy-glib/handle-repo-static.h @@ -21,7 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/handle-repo.h b/telepathy-glib/handle-repo.h index 619b8ecd8..b94367650 100644 --- a/telepathy-glib/handle-repo.h +++ b/telepathy-glib/handle-repo.h @@ -21,7 +21,7 @@ * */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/handle.h b/telepathy-glib/handle.h index 70c94506b..2d3154ac0 100644 --- a/telepathy-glib/handle.h +++ b/telepathy-glib/handle.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/heap.h b/telepathy-glib/heap.h index 426777f1f..6c8a7ca93 100644 --- a/telepathy-glib/heap.h +++ b/telepathy-glib/heap.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/interfaces.h b/telepathy-glib/interfaces.h index 8c5bb6bdf..078c9afbc 100644 --- a/telepathy-glib/interfaces.h +++ b/telepathy-glib/interfaces.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/intset.h b/telepathy-glib/intset.h index 08d02c615..aa2a77851 100644 --- a/telepathy-glib/intset.h +++ b/telepathy-glib/intset.h @@ -20,7 +20,7 @@ * */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/message-mixin.h b/telepathy-glib/message-mixin.h index 7c4fa07c0..ff6cafddf 100644 --- a/telepathy-glib/message-mixin.h +++ b/telepathy-glib/message-mixin.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/message.h b/telepathy-glib/message.h index 951fd170a..4b0601b9d 100644 --- a/telepathy-glib/message.h +++ b/telepathy-glib/message.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/observe-channels-context.h b/telepathy-glib/observe-channels-context.h index 1c8ea4791..af9f77a2a 100644 --- a/telepathy-glib/observe-channels-context.h +++ b/telepathy-glib/observe-channels-context.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/presence-mixin.h b/telepathy-glib/presence-mixin.h index ad16c0e76..e97dbbf60 100644 --- a/telepathy-glib/presence-mixin.h +++ b/telepathy-glib/presence-mixin.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/protocol.h b/telepathy-glib/protocol.h index 321dff472..f151702ab 100644 --- a/telepathy-glib/protocol.h +++ b/telepathy-glib/protocol.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h index f1bff22e8..c0317808c 100644 --- a/telepathy-glib/proxy.h +++ b/telepathy-glib/proxy.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/room-info.h b/telepathy-glib/room-info.h index 0b33bc1f2..0a1fa2fd9 100644 --- a/telepathy-glib/room-info.h +++ b/telepathy-glib/room-info.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/room-list.h b/telepathy-glib/room-list.h index 221b9aa9e..7df3c0d5d 100644 --- a/telepathy-glib/room-list.h +++ b/telepathy-glib/room-list.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/run.h b/telepathy-glib/run.h index 463a3e6f2..f579729cd 100644 --- a/telepathy-glib/run.h +++ b/telepathy-glib/run.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/signalled-message.h b/telepathy-glib/signalled-message.h index 6fa8f45f5..4c163d08e 100644 --- a/telepathy-glib/signalled-message.h +++ b/telepathy-glib/signalled-message.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/simple-approver.h b/telepathy-glib/simple-approver.h index 111c580ff..111a9e79b 100644 --- a/telepathy-glib/simple-approver.h +++ b/telepathy-glib/simple-approver.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/simple-handler.h b/telepathy-glib/simple-handler.h index f378f3736..e76aa78bf 100644 --- a/telepathy-glib/simple-handler.h +++ b/telepathy-glib/simple-handler.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/simple-observer.h b/telepathy-glib/simple-observer.h index f03b2c13f..24aa4fb25 100644 --- a/telepathy-glib/simple-observer.h +++ b/telepathy-glib/simple-observer.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/simple-password-manager.h b/telepathy-glib/simple-password-manager.h index 6842201c6..e22363f1e 100644 --- a/telepathy-glib/simple-password-manager.h +++ b/telepathy-glib/simple-password-manager.h @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/stream-tube-channel.h b/telepathy-glib/stream-tube-channel.h index 26709a5d8..389b5c563 100644 --- a/telepathy-glib/stream-tube-channel.h +++ b/telepathy-glib/stream-tube-channel.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/stream-tube-connection.h b/telepathy-glib/stream-tube-connection.h index 9cba4769e..b7a931e4f 100644 --- a/telepathy-glib/stream-tube-connection.h +++ b/telepathy-glib/stream-tube-connection.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-account-manager.h b/telepathy-glib/svc-account-manager.h index a2daf3412..75c4dc595 100644 --- a/telepathy-glib/svc-account-manager.h +++ b/telepathy-glib/svc-account-manager.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-account.h b/telepathy-glib/svc-account.h index 187323ded..783d05c7a 100644 --- a/telepathy-glib/svc-account.h +++ b/telepathy-glib/svc-account.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-call.h b/telepathy-glib/svc-call.h index b785841ab..97c9367f6 100644 --- a/telepathy-glib/svc-call.h +++ b/telepathy-glib/svc-call.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-channel-dispatch-operation.h b/telepathy-glib/svc-channel-dispatch-operation.h index 2bbe054ec..f361042dc 100644 --- a/telepathy-glib/svc-channel-dispatch-operation.h +++ b/telepathy-glib/svc-channel-dispatch-operation.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-channel-dispatcher.h b/telepathy-glib/svc-channel-dispatcher.h index f8e2cbd8d..fbb59822a 100644 --- a/telepathy-glib/svc-channel-dispatcher.h +++ b/telepathy-glib/svc-channel-dispatcher.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-channel-request.h b/telepathy-glib/svc-channel-request.h index 781d6e03a..dc55336c4 100644 --- a/telepathy-glib/svc-channel-request.h +++ b/telepathy-glib/svc-channel-request.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-channel.h b/telepathy-glib/svc-channel.h index 452a93358..f3f1a8851 100644 --- a/telepathy-glib/svc-channel.h +++ b/telepathy-glib/svc-channel.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-client.h b/telepathy-glib/svc-client.h index c7aab8a61..cbe39dec9 100644 --- a/telepathy-glib/svc-client.h +++ b/telepathy-glib/svc-client.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-connection-manager.h b/telepathy-glib/svc-connection-manager.h index cb5e04cb1..64e09b919 100644 --- a/telepathy-glib/svc-connection-manager.h +++ b/telepathy-glib/svc-connection-manager.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-connection.h b/telepathy-glib/svc-connection.h index 60e8437de..2443f6dfc 100644 --- a/telepathy-glib/svc-connection.h +++ b/telepathy-glib/svc-connection.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-debug.h b/telepathy-glib/svc-debug.h index 682e63117..a65b7f404 100644 --- a/telepathy-glib/svc-debug.h +++ b/telepathy-glib/svc-debug.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-generic.h b/telepathy-glib/svc-generic.h index bcb4775f6..cd59547e3 100644 --- a/telepathy-glib/svc-generic.h +++ b/telepathy-glib/svc-generic.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-properties-interface.h b/telepathy-glib/svc-properties-interface.h index 2cae3d070..46760e7f9 100644 --- a/telepathy-glib/svc-properties-interface.h +++ b/telepathy-glib/svc-properties-interface.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-protocol.h b/telepathy-glib/svc-protocol.h index 8e0b3d631..d8f4f4150 100644 --- a/telepathy-glib/svc-protocol.h +++ b/telepathy-glib/svc-protocol.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/svc-tls.h b/telepathy-glib/svc-tls.h index 8b03e503d..2693a2224 100644 --- a/telepathy-glib/svc-tls.h +++ b/telepathy-glib/svc-tls.h @@ -1,4 +1,4 @@ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h index c4f782978..953ef0c4e 100644 --- a/telepathy-glib/text-channel.h +++ b/telepathy-glib/text-channel.h @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/tls-certificate.h b/telepathy-glib/tls-certificate.h index 0b2886983..c68219640 100644 --- a/telepathy-glib/tls-certificate.h +++ b/telepathy-glib/tls-certificate.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif diff --git a/telepathy-glib/util.h b/telepathy-glib/util.h index 7a67e7c86..bbebe7f2e 100644 --- a/telepathy-glib/util.h +++ b/telepathy-glib/util.h @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) +#if !defined (_TP_IN_META_HEADER) && !defined (_TP_COMPILATION) #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepathy-glib-dbus.h> can be included directly." #endif |