[empathy/gnome-3-4] include logger single header

[Guillaume Desmottes <gdesmott src gnome org>]

commit a0a0f0bc14b965c2063891242f435be3ac6296a4
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Apr 4 11:55:14 2012 +0200

    include logger single header

 libempathy-gtk/empathy-chat.c       |    3 +--
 libempathy-gtk/empathy-log-window.c |    1 -
 libempathy/empathy-contact.c        |    2 --
 libempathy/empathy-contact.h        |    2 +-
 libempathy/empathy-message.c        |    5 -----
 libempathy/empathy-message.h        |    2 +-
 src/empathy.c                       |    2 +-
 7 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index b98f521..14404bf 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -38,8 +38,7 @@
 
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
-#include <telepathy-logger/log-manager.h>
-#include <telepathy-logger/text-event.h>
+#include <telepathy-logger/telepathy-logger.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-keyring.h>
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 1087653..f386388 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -35,7 +35,6 @@
 #include <telepathy-glib/proxy-subclass.h>
 
 #include <telepathy-logger/telepathy-logger.h>
-#include <telepathy-logger/call-event.h>
 
 #include <extensions/extensions.h>
 
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index b8d2f3c..0c4ef75 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 d90ea2a..6b15d5e 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 777d4a6..0a8ca40 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 81da7bf..c49a284 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"
diff --git a/src/empathy.c b/src/empathy.c
index 2ed3bab..ac84d33 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,7 +44,7 @@
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <telepathy-logger/log-manager.h>
+#include <telepathy-logger/telepathy-logger.h>
 
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-connection-aggregator.h>