diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-02-06 19:18:35 +0000 |
| commit | b81df5f0da5a86fe5bef05f3d8d627f6a01cee76 (patch) | |
| tree | 540d8894da5b5d4f3a0513b68af1b59ec584f530 /src/protocol.c | |
| parent | d8edca5135d6b9fdbec6d25441f61e1f01098f28 (diff) | |
| download | telepathy-salut-b81df5f0da5a86fe5bef05f3d8d627f6a01cee76.tar.gz | |
Revert to commit 822ddd0
Some commits intended for 'next' appear to have ended up on master.
Diffstat (limited to 'src/protocol.c')
| -rw-r--r-- | src/protocol.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/protocol.c b/src/protocol.c index 1223734e..2b805c85 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -22,7 +22,7 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-protocol.h> -#include <telepathy-glib/telepathy-glib-dbus.h> +#include <telepathy-glib/telepathy-glib.h> #include "connection.h" #include "contact-manager.h" @@ -156,6 +156,7 @@ get_connection_details (TpBaseProtocol *self, if (channel_managers != NULL) { GType types[] = { + SALUT_TYPE_CONTACT_MANAGER, SALUT_TYPE_FT_MANAGER, SALUT_TYPE_IM_MANAGER, SALUT_TYPE_MUC_MANAGER, |