move log-entry(-text) to entry(-text)

18 files changed, 41 insertions, 41 deletions

diff --git a/doc/reference/libtelepathy-logger/Makefile.am b/doc/reference/libtelepathy-logger/Makefile.am
index 05371292a..fb2c9278c 100644
--- a/doc/reference/libtelepathy-logger/Makefile.am
+++ b/doc/reference/libtelepathy-logger/Makefile.am
@@ -66,10 +66,10 @@ IGNORE_HFILES=\
     datetime-internal.h \
     dbus-service-internal.h \
     debug-internal.h \
-    log-entry-internal.h \
-    log-entry-text-internal.h \
-    log-entry-text.h \
-    log-entry.h \
+    entry-internal.h \
+    entry-text-internal.h \
+    entry-text.h \
+    entry.h \
     log-manager-internal.h \
     log-manager.h \
     log-store-factory-internal.h \
diff --git a/doc/reference/libtelepathy-logger/docs.xml b/doc/reference/libtelepathy-logger/docs.xml
index aa5a65b6e..429c77e9e 100644
--- a/doc/reference/libtelepathy-logger/docs.xml
+++ b/doc/reference/libtelepathy-logger/docs.xml
@@ -10,8 +10,8 @@
     <title>Public API</title>
 
     <xi:include href="xml/log-manager.xml"/>
-    <xi:include href="xml/log-entry.xml"/>
-    <xi:include href="xml/log-entry-text.xml"/>
+    <xi:include href="xml/entry.xml"/>
+    <xi:include href="xml/entry-text.xml"/>
     <xi:include href="xml/contact.xml"/>
     <xi:include href="xml/conf.xml"/>
   </chapter>
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index 34079d0b6..72fba5805 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -20,8 +20,8 @@ lib_LTLIBRARIES = libtelepathy-logger.la
 LIBTPLdir = $(includedir)/telepathy-logger-0.1/telepathy-logger
 LIBTPL_HEADERS = \
 		contact.h			\
-		log-entry.h			\
-		log-entry-text.h		\
+		entry.h			\
+		entry-text.h		\
 		log-manager.h			\
 		$(NULL)
 
@@ -43,10 +43,10 @@ libtelepathy_logger_la_SOURCES = \
 		dbus-service-internal.h			\
 		debug-internal.h		\
 		debug.c				\
-		log-entry.c			\
-		log-entry-internal.h			\
-		log-entry-text.c		\
-		log-entry-text-internal.h		\
+		entry.c			\
+		entry-internal.h			\
+		entry-text.c		\
+		entry-text-internal.h		\
 		log-manager.c			\
 		log-manager-internal.h		\
 		log-store.c			\
diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index c830a2f40..c1f877349 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -29,9 +29,9 @@
 
 #include <telepathy-logger/channel-internal.h>
 #include <telepathy-logger/observer-internal.h>
-#include <telepathy-logger/log-entry-internal.h>
-#include <telepathy-logger/log-entry-text.h>
-#include <telepathy-logger/log-entry-text-internal.h>
+#include <telepathy-logger/entry-internal.h>
+#include <telepathy-logger/entry-text.h>
+#include <telepathy-logger/entry-text-internal.h>
 #include <telepathy-logger/log-manager-internal.h>
 #include <telepathy-logger/log-store-sqlite-internal.h>
 
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index 3e438f65c..5a351b8f3 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -31,8 +31,8 @@
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/svc-generic.h>
 
-#include <telepathy-logger/log-entry-internal.h>
-#include <telepathy-logger/log-entry-text.h>
+#include <telepathy-logger/entry-internal.h>
+#include <telepathy-logger/entry-text.h>
 #include <telepathy-logger/log-manager.h>
 
 #include <extensions/extensions.h>
diff --git a/telepathy-logger/log-entry-internal.h b/telepathy-logger/entry-internal.h
index 21a0c56c7..abf77bc6e 100644
--- a/telepathy-logger/log-entry-internal.h
+++ b/telepathy-logger/entry-internal.h
@@ -22,7 +22,7 @@
 #ifndef __TPL_LOG_ENTRY_INTERNAL_H__
 #define __TPL_LOG_ENTRY_INTERNAL_H__
 
-#include <telepathy-logger/log-entry.h>
+#include <telepathy-logger/entry.h>
 
 G_BEGIN_DECLS
 
diff --git a/telepathy-logger/log-entry-text-internal.h b/telepathy-logger/entry-text-internal.h
index a9d25aafc..003a787f0 100644
--- a/telepathy-logger/log-entry-text-internal.h
+++ b/telepathy-logger/entry-text-internal.h
@@ -22,8 +22,8 @@
 #ifndef __TPL_LOG_ENTRY_TEXT_INTERNAL_H__
 #define __TPL_LOG_ENTRY_TEXT_INTERNAL_H__
 
-#include <telepathy-logger/log-entry-text.h>
-#include <telepathy-logger/log-entry-internal.h>
+#include <telepathy-logger/entry-text.h>
+#include <telepathy-logger/entry-internal.h>
 #include <telepathy-logger/channel-text-internal.h>
 
 G_BEGIN_DECLS
diff --git a/telepathy-logger/log-entry-text.c b/telepathy-logger/entry-text.c
index 715db5d08..52d6affe3 100644
--- a/telepathy-logger/log-entry-text.c
+++ b/telepathy-logger/entry-text.c
@@ -20,14 +20,14 @@
  */
 
 #include "config.h"
-#include "log-entry-text.h"
-#include "log-entry-text-internal.h"
+#include "entry-text.h"
+#include "entry-text-internal.h"
 
 #include <glib-object.h>
 #include <telepathy-glib/util.h>
 
-#include <telepathy-logger/log-entry.h>
-#include <telepathy-logger/log-entry-internal.h>
+#include <telepathy-logger/entry.h>
+#include <telepathy-logger/entry-internal.h>
 
 #define DEBUG_FLAG TPL_DEBUG_LOG_STORE
 #include <telepathy-logger/debug-internal.h>
diff --git a/telepathy-logger/log-entry-text.h b/telepathy-logger/entry-text.h
index ab3be3dc1..c3ba4cd1b 100644
--- a/telepathy-logger/log-entry-text.h
+++ b/telepathy-logger/entry-text.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-logger/log-entry.h>
+#include <telepathy-logger/entry.h>
 
 G_BEGIN_DECLS
 #define TPL_TYPE_LOG_ENTRY_TEXT                  (tpl_log_entry_text_get_type ())
diff --git a/telepathy-logger/log-entry.c b/telepathy-logger/entry.c
index f788adfd5..46bb1f512 100644
--- a/telepathy-logger/log-entry.c
+++ b/telepathy-logger/entry.c
@@ -19,8 +19,8 @@
  */
 
 #include "config.h"
-#include "log-entry.h"
-#include "log-entry-internal.h"
+#include "entry.h"
+#include "entry-internal.h"
 
 #include <glib.h>
 #include <telepathy-glib/util.h>
@@ -32,7 +32,7 @@
 #include <telepathy-logger/util-internal.h>
 
 /**
- * SECTION:log-entry
+ * SECTION:entry
  * @title: TplLogEntry
  * @short_description: Abstract representation of a log entry
  * @see_also: #TplLogEntryText and other subclasses when they'll exist
diff --git a/telepathy-logger/log-entry.h b/telepathy-logger/entry.h
index 5123e86df..5123e86df 100644
--- a/telepathy-logger/log-entry.h
+++ b/telepathy-logger/entry.h
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index 58babbb9a..605ea8e75 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -35,8 +35,8 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>
 
-#include <telepathy-logger/log-entry.h>
-#include <telepathy-logger/log-entry-internal.h>
+#include <telepathy-logger/entry.h>
+#include <telepathy-logger/entry-internal.h>
 #include <telepathy-logger/log-store-internal.h>
 #include <telepathy-logger/log-store-xml-internal.h>
 #include <telepathy-logger/log-store-sqlite-internal.h>
diff --git a/telepathy-logger/log-manager.h b/telepathy-logger/log-manager.h
index e6f5a69a3..c91dcfaf8 100644
--- a/telepathy-logger/log-manager.h
+++ b/telepathy-logger/log-manager.h
@@ -28,7 +28,7 @@
 #include <glib-object.h>
 #include <telepathy-glib/account.h>
 
-#include <telepathy-logger/log-entry.h>
+#include <telepathy-logger/entry.h>
 
 G_BEGIN_DECLS
 #define TPL_TYPE_LOG_MANAGER  (tpl_log_manager_get_type ())
diff --git a/telepathy-logger/log-store-internal.h b/telepathy-logger/log-store-internal.h
index e34eed60d..4242dbe5c 100644
--- a/telepathy-logger/log-store-internal.h
+++ b/telepathy-logger/log-store-internal.h
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <telepathy-glib/account.h>
 
-#include <telepathy-logger/log-entry.h>
+#include <telepathy-logger/entry.h>
 #include <telepathy-logger/log-manager.h>
 
 G_BEGIN_DECLS
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index 9d7e868a8..894c7962e 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -27,9 +27,9 @@
 #include <telepathy-glib/telepathy-glib.h>
 #include <sqlite3.h>
 
-#include "log-entry-internal.h"
-#include "log-entry-text.h"
-#include "log-entry-text-internal.h"
+#include "entry-internal.h"
+#include "entry-text.h"
+#include "entry-text-internal.h"
 #include "log-store-sqlite-internal.h"
 
 #define DEBUG_FLAG TPL_DEBUG_LOG_STORE
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index e0e0159ee..c6860a740 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -40,9 +40,9 @@
 #include <telepathy-glib/defs.h>
 #include <telepathy-glib/util.h>
 
-#include <telepathy-logger/log-entry-internal.h>
-#include <telepathy-logger/log-entry-text.h>
-#include <telepathy-logger/log-entry-text-internal.h>
+#include <telepathy-logger/entry-internal.h>
+#include <telepathy-logger/entry-text.h>
+#include <telepathy-logger/entry-text-internal.h>
 #include <telepathy-logger/log-manager.h>
 #include <telepathy-logger/log-store-internal.h>
 
diff --git a/tests/test-tpl-log-entry.c b/tests/test-tpl-log-entry.c
index 963db839e..92a3fe562 100644
--- a/tests/test-tpl-log-entry.c
+++ b/tests/test-tpl-log-entry.c
@@ -1,5 +1,5 @@
-#include <telepathy-logger/log-entry-text.h>
-#include <telepathy-logger/log-entry-text-internal.h>
+#include <telepathy-logger/entry-text.h>
+#include <telepathy-logger/entry-text-internal.h>
 
 #define gconf_client_get_bool(obj,key,err) g_print ("%s", key)
 
diff --git a/tests/test-tpl-log-manager.c b/tests/test-tpl-log-manager.c
index c7ebaf44b..0ad39b4b8 100644
--- a/tests/test-tpl-log-manager.c
+++ b/tests/test-tpl-log-manager.c
@@ -1,4 +1,4 @@
-#include <telepathy-logger/log-entry-text.h>
+#include <telepathy-logger/entry-text.h>
 
 #define gconf_client_get_bool(obj,key,err) g_print ("%s", key)