diff options
46 files changed, 72 insertions, 121 deletions
diff --git a/mission-control-plugins/dbus-acl.h b/mission-control-plugins/dbus-acl.h index dda620af..deba7b72 100644 --- a/mission-control-plugins/dbus-acl.h +++ b/mission-control-plugins/dbus-acl.h @@ -26,7 +26,7 @@ #endif #include <dbus/dbus-glib-lowlevel.h> -#include <telepathy-glib/dbus.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/mission-control-plugins/dispatch-operation-policy.h b/mission-control-plugins/dispatch-operation-policy.h index a5587217..0ec87248 100644 --- a/mission-control-plugins/dispatch-operation-policy.h +++ b/mission-control-plugins/dispatch-operation-policy.h @@ -26,8 +26,7 @@ #endif #include <mission-control-plugins/dispatch-operation.h> - -#include <telepathy-glib/client.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/mission-control-plugins/dispatch-operation.c b/mission-control-plugins/dispatch-operation.c index 69c39708..cbe1f21b 100644 --- a/mission-control-plugins/dispatch-operation.c +++ b/mission-control-plugins/dispatch-operation.c @@ -42,9 +42,8 @@ #include <mission-control-plugins/mission-control-plugins.h> #include <mission-control-plugins/implementation.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> GType mcp_dispatch_operation_get_type (void) diff --git a/mission-control-plugins/dispatch-operation.h b/mission-control-plugins/dispatch-operation.h index 649c57cd..7cb4dd64 100644 --- a/mission-control-plugins/dispatch-operation.h +++ b/mission-control-plugins/dispatch-operation.h @@ -25,7 +25,7 @@ #error Use <mission-control-plugins/mission-control-plugins.h> instead #endif -#include <telepathy-glib/channel.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/mission-control-plugins/request.c b/mission-control-plugins/request.c index 3ca1a2a0..36dac1dc 100644 --- a/mission-control-plugins/request.c +++ b/mission-control-plugins/request.c @@ -31,8 +31,8 @@ #include <mission-control-plugins/mission-control-plugins.h> #include <mission-control-plugins/implementation.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> GType mcp_request_get_type (void) diff --git a/plugins/mcp-dbus-aegis-acl.c b/plugins/mcp-dbus-aegis-acl.c index 74492bb8..1eda98e6 100644 --- a/plugins/mcp-dbus-aegis-acl.c +++ b/plugins/mcp-dbus-aegis-acl.c @@ -29,9 +29,9 @@ #define DEBUG(_f, ...) MCP_DEBUG (MCP_DEBUG_DBUS_ACL, _f, ##__VA_ARGS__) #include <dbus/dbus-glib.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/defs.h> + +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <mission-control-plugins/mission-control-plugins.h> diff --git a/server/mc-server.c b/server/mc-server.c index 033ef873..21dcef8a 100644 --- a/server/mc-server.c +++ b/server/mc-server.c @@ -37,7 +37,6 @@ #endif #include <telepathy-glib/telepathy-glib.h> -#include <telepathy-glib/debug-sender.h> #include "mcd-service.h" diff --git a/src/channel-utils.c b/src/channel-utils.c index 1cf0744a..74a62a86 100644 --- a/src/channel-utils.c +++ b/src/channel-utils.c @@ -28,9 +28,8 @@ #include "channel-utils.h" -#include <telepathy-glib/channel.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "mcd-channel.h" #include "mcd-debug.h" diff --git a/src/channel-utils.h b/src/channel-utils.h index 01428cc9..0dcb5062 100644 --- a/src/channel-utils.h +++ b/src/channel-utils.h @@ -28,7 +28,8 @@ #define CHANNEL_UTILS_H #include <glib.h> -#include <telepathy-glib/channel.h> + +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/client-registry.c b/src/client-registry.c index 126e6718..4874182f 100644 --- a/src/client-registry.c +++ b/src/client-registry.c @@ -23,7 +23,6 @@ #include "client-registry.h" -#include <telepathy-glib/handle-repo-dynamic.h> #include <telepathy-glib/telepathy-glib.h> #include "mcd-debug.h" diff --git a/src/client-registry.h b/src/client-registry.h index 5b9ade3c..88f19569 100644 --- a/src/client-registry.h +++ b/src/client-registry.h @@ -23,8 +23,8 @@ #define MCD_CLIENT_REGISTRY_H #include <glib-object.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/handle-repo.h> + +#include <telepathy-glib/telepathy-glib.h> #include "mcd-client-priv.h" diff --git a/src/connectivity-monitor.c b/src/connectivity-monitor.c index 0ab8272e..27ae0690 100644 --- a/src/connectivity-monitor.c +++ b/src/connectivity-monitor.c @@ -42,7 +42,7 @@ #include <upower.h> #endif -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "mcd-debug.h" diff --git a/src/kludge-transport.c b/src/kludge-transport.c index f5906fa8..c8e2ba1d 100644 --- a/src/kludge-transport.c +++ b/src/kludge-transport.c @@ -21,7 +21,7 @@ #include "kludge-transport.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "mcd-debug.h" diff --git a/src/mcd-account-addressing.c b/src/mcd-account-addressing.c index a810cbea..490a9dae 100644 --- a/src/mcd-account-addressing.c +++ b/src/mcd-account-addressing.c @@ -25,9 +25,8 @@ #include "mcd-account-addressing.h" -#include <telepathy-glib/gtypes.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 "mcd-account.h" #include "mcd-account-priv.h" diff --git a/src/mcd-account-conditions.c b/src/mcd-account-conditions.c index b598c86e..8a6af964 100644 --- a/src/mcd-account-conditions.c +++ b/src/mcd-account-conditions.c @@ -30,9 +30,8 @@ #include <string.h> #include <glib/gstdio.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "mcd-account.h" #include "mcd-account-priv.h" diff --git a/src/mcd-account-manager-sso.c b/src/mcd-account-manager-sso.c index 68a4ba83..45a7cbe5 100644 --- a/src/mcd-account-manager-sso.c +++ b/src/mcd-account-manager-sso.c @@ -23,7 +23,7 @@ #include "mcd-account-manager-sso.h" #include "mcd-debug.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include <string.h> #include <ctype.h> diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c index 77c9cea9..c71d8087 100644 --- a/src/mcd-account-manager.c +++ b/src/mcd-account-manager.c @@ -31,14 +31,8 @@ #include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/enums.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/svc-account.h> -#include <telepathy-glib/util.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-account-manager.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "mcd-account-manager-priv.h" #include "mcd-storage.h" diff --git a/src/mcd-account-manager.h b/src/mcd-account-manager.h index 3726a8cb..a249b194 100644 --- a/src/mcd-account-manager.h +++ b/src/mcd-account-manager.h @@ -24,7 +24,7 @@ #ifndef __MCD_ACCOUNT_MANAGER_H__ #define __MCD_ACCOUNT_MANAGER_H__ -#include <telepathy-glib/dbus.h> +#include <telepathy-glib/telepathy-glib.h> #include "mission-control-plugins/mission-control-plugins.h" #include "mcd-storage.h" diff --git a/src/mcd-account-requests.c b/src/mcd-account-requests.c index 36e98ec3..84aaeb10 100644 --- a/src/mcd-account-requests.c +++ b/src/mcd-account-requests.c @@ -31,10 +31,8 @@ #include <dbus/dbus-glib-lowlevel.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/svc-channel-request.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "mcd-account.h" #include "mcd-account-priv.h" diff --git a/src/mcd-account.c b/src/mcd-account.c index 00135a6c..aa04007c 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -31,12 +31,7 @@ #include <dbus/dbus.h> #include <glib/gstdio.h> #include <telepathy-glib/telepathy-glib.h> - -/* will become telepathy-glib-dbus.h when we depend on 0.19.0 */ -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-account.h> -#include <telepathy-glib/svc-generic.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "mcd-account-priv.h" #include "mcd-account-conditions.h" diff --git a/src/mcd-account.h b/src/mcd-account.h index ea1a7cdb..06c6dfa7 100644 --- a/src/mcd-account.h +++ b/src/mcd-account.h @@ -24,8 +24,7 @@ #ifndef __MCD_ACCOUNT_H__ #define __MCD_ACCOUNT_H__ -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/enums.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS #define MCD_TYPE_ACCOUNT (mcd_account_get_type ()) diff --git a/src/mcd-channel.c b/src/mcd-channel.c index e5e895d2..e32281e8 100644 --- a/src/mcd-channel.c +++ b/src/mcd-channel.c @@ -39,12 +39,8 @@ #include "mcd-channel.h" -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-channel-request.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "channel-utils.h" #include "mcd-account-priv.h" diff --git a/src/mcd-channel.h b/src/mcd-channel.h index e56f3f62..cdfac247 100644 --- a/src/mcd-channel.h +++ b/src/mcd-channel.h @@ -29,8 +29,7 @@ #include <glib.h> #include <glib-object.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/dbus-properties-mixin.h> +#include <telepathy-glib/telepathy-glib.h> #include "mcd-mission.h" diff --git a/src/mcd-client-priv.h b/src/mcd-client-priv.h index 94cada4d..00b5f32e 100644 --- a/src/mcd-client-priv.h +++ b/src/mcd-client-priv.h @@ -29,9 +29,7 @@ #include <glib.h> #include <glib-object.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/client.h> -#include <telepathy-glib/handle-repo.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/mcd-client.c b/src/mcd-client.c index 497bdaa2..7cb9e8a3 100644 --- a/src/mcd-client.c +++ b/src/mcd-client.c @@ -28,13 +28,10 @@ #include <errno.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/defs.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> + #include <telepathy-glib/proxy-subclass.h> -#include <telepathy-glib/util.h> #include "channel-utils.h" #include "mcd-channel-priv.h" diff --git a/src/mcd-connection-plugin.h b/src/mcd-connection-plugin.h index cf41d7ee..3ab255b5 100644 --- a/src/mcd-connection-plugin.h +++ b/src/mcd-connection-plugin.h @@ -30,7 +30,7 @@ #include <glib-object.h> #include "mcd-transport.h" -#include <telepathy-glib/enums.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/mcd-connection-service-points.c b/src/mcd-connection-service-points.c index 9e5fc1fc..0e690056 100644 --- a/src/mcd-connection-service-points.c +++ b/src/mcd-connection-service-points.c @@ -26,8 +26,9 @@ #include "mcd-connection-service-points.h" #include "mcd-connection-priv.h" -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> + +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> static void service_handles_fetched_cb (TpConnection *tp_conn, diff --git a/src/mcd-connection.c b/src/mcd-connection.c index 7edca5d1..166f9de4 100644 --- a/src/mcd-connection.c +++ b/src/mcd-connection.c @@ -49,12 +49,10 @@ #include <stdlib.h> #include <dlfcn.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/connection.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> + #include <telepathy-glib/proxy-subclass.h> -#include <telepathy-glib/util.h> #include "mcd-account-priv.h" #include "mcd-channel-priv.h" diff --git a/src/mcd-connection.h b/src/mcd-connection.h index a3c7dd58..6ea414bc 100644 --- a/src/mcd-connection.h +++ b/src/mcd-connection.h @@ -28,7 +28,7 @@ #include <glib.h> #include <glib-object.h> -#include <telepathy-glib/connection-manager.h> +#include <telepathy-glib/telepathy-glib.h> #include "mcd-operation.h" diff --git a/src/mcd-dbusprop.c b/src/mcd-dbusprop.c index 0e8e69b4..e48927d0 100644 --- a/src/mcd-dbusprop.c +++ b/src/mcd-dbusprop.c @@ -27,8 +27,8 @@ #include "config.h" #include <string.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> + #include "mcd-dbusprop.h" #include "mcd-debug.h" diff --git a/src/mcd-dbusprop.h b/src/mcd-dbusprop.h index be393b6f..fbac31bb 100644 --- a/src/mcd-dbusprop.h +++ b/src/mcd-dbusprop.h @@ -27,8 +27,8 @@ #ifndef __MCD_DBUSPROP_H__ #define __MCD_DBUSPROP_H__ -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/dbus.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> G_BEGIN_DECLS diff --git a/src/mcd-debug.c b/src/mcd-debug.c index c16b1da9..41246fce 100644 --- a/src/mcd-debug.c +++ b/src/mcd-debug.c @@ -39,9 +39,8 @@ #include <stdlib.h> -#include <telepathy-glib/debug.h> -#include <telepathy-glib/debug-sender.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include <mission-control-plugins/mission-control-plugins.h> diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h index ae0d7998..933c12a4 100644 --- a/src/mcd-dispatch-operation-priv.h +++ b/src/mcd-dispatch-operation-priv.h @@ -24,8 +24,7 @@ #ifndef __MCD_DISPATCH_OPERATION_PRIV_H__ #define __MCD_DISPATCH_OPERATION_PRIV_H__ -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/enums.h> +#include <telepathy-glib/telepathy-glib.h> #include "client-registry.h" #include "mcd-handler-map-priv.h" diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c index 13ebf60b..6a4a2877 100644 --- a/src/mcd-dispatch-operation.c +++ b/src/mcd-dispatch-operation.c @@ -33,12 +33,8 @@ #include <glib/gstdio.h> -#include <telepathy-glib/defs.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-channel-dispatch-operation.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "channel-utils.h" #include "mcd-channel-priv.h" diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c index 39cf7db4..a8fc1d1c 100644 --- a/src/mcd-dispatcher.c +++ b/src/mcd-dispatcher.c @@ -61,15 +61,10 @@ #include "_gen/svc-dispatcher.h" -#include <telepathy-glib/defs.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/handle-repo.h> -#include <telepathy-glib/handle-repo-dynamic.h> -#include <telepathy-glib/interfaces.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> + #include <telepathy-glib/proxy-subclass.h> -#include <telepathy-glib/svc-channel-dispatcher.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/util.h> #include <stdlib.h> #include <string.h> diff --git a/src/mcd-dispatcher.h b/src/mcd-dispatcher.h index 5ece9802..ba4c7367 100644 --- a/src/mcd-dispatcher.h +++ b/src/mcd-dispatcher.h @@ -30,7 +30,7 @@ #include <glib.h> #include <glib-object.h> #include <dbus/dbus-glib.h> -#include <telepathy-glib/dbus-properties-mixin.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/mcd-handler-map-priv.h b/src/mcd-handler-map-priv.h index c90603f9..cc7109f7 100644 --- a/src/mcd-handler-map-priv.h +++ b/src/mcd-handler-map-priv.h @@ -26,8 +26,7 @@ #ifndef MCD_HANDLER_MAP_H_ #define MCD_HANDLER_MAP_H_ -#include <telepathy-glib/channel.h> -#include <telepathy-glib/dbus.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/src/mcd-handler-map.c b/src/mcd-handler-map.c index 18d76d17..ee8371e8 100644 --- a/src/mcd-handler-map.c +++ b/src/mcd-handler-map.c @@ -26,7 +26,7 @@ #include "config.h" #include "mcd-handler-map-priv.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "channel-utils.h" #include "mcd-channel-priv.h" diff --git a/src/mcd-misc.c b/src/mcd-misc.c index f81fb5ca..294d2a78 100644 --- a/src/mcd-misc.c +++ b/src/mcd-misc.c @@ -33,8 +33,7 @@ #include <stdio.h> #include <string.h> #include <unistd.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "mcd-debug.h" diff --git a/src/mcd-misc.h b/src/mcd-misc.h index 2be978c0..e69ee728 100644 --- a/src/mcd-misc.h +++ b/src/mcd-misc.h @@ -29,8 +29,9 @@ #include <glib.h> #include <glib-object.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/gtypes.h> + +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> G_BEGIN_DECLS diff --git a/src/mcd-storage-ag-hidden.c b/src/mcd-storage-ag-hidden.c index 37c4f022..ee857a74 100644 --- a/src/mcd-storage-ag-hidden.c +++ b/src/mcd-storage-ag-hidden.c @@ -23,7 +23,7 @@ #include "mcd-storage-ag-hidden.h" -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #include "mcd-debug.h" /* FIXME: if we weren't in-tree, we wouldn't be able to include this header and diff --git a/src/request.c b/src/request.c index a9df6c8a..8ee8e5a5 100644 --- a/src/request.c +++ b/src/request.c @@ -25,12 +25,8 @@ #include "request.h" #include <dbus/dbus-glib.h> -#include <telepathy-glib/dbus-properties-mixin.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-channel-request.h> -#include <telepathy-glib/svc-generic.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #include "mcd-account-priv.h" #include "mcd-connection-priv.h" diff --git a/src/request.h b/src/request.h index 5456b375..f0c0bc41 100644 --- a/src/request.h +++ b/src/request.h @@ -23,7 +23,7 @@ #ifndef MCD_REQUEST_H #define MCD_REQUEST_H -#include <telepathy-glib/client.h> +#include <telepathy-glib/telepathy-glib.h> #include "client-registry.h" #include "mcd-account.h" diff --git a/tests/twisted/mc-debug-server.c b/tests/twisted/mc-debug-server.c index b6f07984..f1cfa8ff 100644 --- a/tests/twisted/mc-debug-server.c +++ b/tests/twisted/mc-debug-server.c @@ -33,8 +33,7 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <telepathy-glib/debug.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> #if ENABLE_GNOME_KEYRING #include <gnome-keyring.h> diff --git a/tests/twisted/mcp-plugin.c b/tests/twisted/mcp-plugin.c index 43e1e39c..f103dac0 100644 --- a/tests/twisted/mcp-plugin.c +++ b/tests/twisted/mcp-plugin.c @@ -24,9 +24,8 @@ #include <dbus/dbus.h> #include <dbus/dbus-glib-lowlevel.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/util.h> +#include <telepathy-glib/telepathy-glib.h> +#include <telepathy-glib/telepathy-glib-dbus.h> #define DEBUG g_debug diff --git a/util/wait-for-name.c b/util/wait-for-name.c index af8bcdb4..5c19d081 100644 --- a/util/wait-for-name.c +++ b/util/wait-for-name.c @@ -41,7 +41,7 @@ #include <glib.h> -#include <telepathy-glib/dbus.h> +#include <telepathy-glib/telepathy-glib.h> static int exit_status = EX_SOFTWARE; static guint timeout_id = 0; |