diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-25 15:49:58 -0400 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2013-09-25 15:49:58 -0400 |
| commit | 72a786e6fc649bd377fa89042920e4b48e84e272 (patch) | |
| tree | e948ee7f36516426a72f88b54a30ba058908a6f4 /tests/lib/simple-conn.c | |
| parent | ce9b7f186216acdb9f2546014fccb6c16e05d769 (diff) | |
| parent | d6c2580681fa9e84b6375331babef7f4e3962875 (diff) | |
Merge branch 'master' into next
Conflicts:
tests/lib/broken-client-types-conn.c
tests/lib/bug-19101-conn.c
tests/lib/bug16307-conn.c
tests/lib/bug16307-conn.h
tests/lib/contacts-conn.c
tests/lib/contacts-conn.h
tests/lib/dbus-tube-chan.c
tests/lib/echo-chan.c
tests/lib/echo-chan.h
tests/lib/echo-cm.h
tests/lib/echo-conn.c
tests/lib/echo-conn.h
tests/lib/file-transfer-chan.c
tests/lib/params-cm.c
tests/lib/params-cm.h
tests/lib/room-list-chan.c
tests/lib/simple-channel-manager.c
tests/lib/simple-channel-request.c
tests/lib/simple-client.h
tests/lib/simple-conn.c
tests/lib/simple-manager.c
tests/lib/simple-manager.h
tests/lib/stream-tube-chan.c
tests/lib/textchan-group.h
tests/lib/textchan-null.c
tests/lib/textchan-null.h
tests/lib/tls-certificate.c
tests/lib/util.c
Diffstat (limited to 'tests/lib/simple-conn.c')
| -rw-r--r-- | tests/lib/simple-conn.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c index 6b172b145..fa7bfdac3 100644 --- a/tests/lib/simple-conn.c +++ b/tests/lib/simple-conn.c @@ -17,15 +17,8 @@ #include <dbus/dbus-glib.h> -#include <telepathy-glib/dbus.h> -#include <telepathy-glib/dbus-properties-mixin.h> -#include <telepathy-glib/errors.h> -#include <telepathy-glib/gtypes.h> -#include <telepathy-glib/handle-repo-dynamic.h> -#include <telepathy-glib/interfaces.h> -#include <telepathy-glib/svc-connection.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 "echo-chan.h" #include "room-list-chan.h" |