diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 19:31:59 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 19:31:59 +0800 |
| commit | cf118e67c08e1d50b456a7127b0c879740d30e85 (patch) | |
| tree | a1cb10a25c6c994d1f27dd56d5365aa6e7b6f8ab /libempathy | |
| parent | f86e7b5be4d7721f7f0bf3a9a7a140109486c48b (diff) | |
| parent | beb1e9f725a34f63bbd88744ff92ad6a596574e0 (diff) | |
| download | gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.gz gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.bz2 gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.lz gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.xz gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.zst gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.zip | |
Merge branch 'gnome-3-4'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-contact.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-contact.h | 2 | ||||
| -rw-r--r-- | libempathy/empathy-message.c | 5 | ||||
| -rw-r--r-- | libempathy/empathy-message.h | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index b8d2f3c40..0c4ef755f 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -29,8 +29,6 @@ #include <telepathy-glib/interfaces.h> #include <telepathy-glib/util.h> -#include <telepathy-logger/log-manager.h> - #include <folks/folks.h> #include <folks/folks-telepathy.h> diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index d90ea2ad4..6b15d5ea3 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -26,7 +26,7 @@ #include <telepathy-glib/contact.h> #include <telepathy-glib/account.h> -#include <telepathy-logger/entity.h> +#include <telepathy-logger/telepathy-logger.h> #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 777d4a672..0a8ca408b 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -32,11 +32,6 @@ #include <telepathy-glib/account.h> #include <telepathy-glib/account-manager.h> -#include <telepathy-logger/entity.h> -#include <telepathy-logger/event.h> -#include <telepathy-logger/text-event.h> -#include <telepathy-logger/call-event.h> - #include "empathy-client-factory.h" #include "empathy-message.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h index 81da7bf43..c49a2840f 100644 --- a/libempathy/empathy-message.h +++ b/libempathy/empathy-message.h @@ -27,7 +27,7 @@ #include <glib-object.h> #include <telepathy-glib/message.h> -#include <telepathy-logger/event.h> +#include <telepathy-logger/telepathy-logger.h> #include "empathy-contact.h" #include "empathy-time.h" |