Renamed TplEventText into TplTextEvent

This renames the subclass in a more natural and more traditional way as
found in many other GObject based APIs.

16 files changed, 174 insertions, 175 deletions

diff --git a/doc/reference/libtelepathy-logger/Makefile.am b/doc/reference/libtelepathy-logger/Makefile.am
index ff8f263..746e0ad 100644
--- a/doc/reference/libtelepathy-logger/Makefile.am
+++ b/doc/reference/libtelepathy-logger/Makefile.am
@@ -66,13 +66,13 @@ IGNORE_HFILES=\
     dbus-service-internal.h \
     debug-internal.h \
     event-internal.h \
-    event-text-internal.h \
     log-manager-internal.h \
     log-store-factory-internal.h \
     log-store-internal.h \
     log-store-sqlite-internal.h \
     log-store-xml-internal.h \
     observer-internal.h \
+    text-event-internal.h \
     util-internal.h
 
 # Images to copy into HTML directory.
diff --git a/doc/reference/libtelepathy-logger/docs.xml b/doc/reference/libtelepathy-logger/docs.xml
index 79353cc..3081c04 100644
--- a/doc/reference/libtelepathy-logger/docs.xml
+++ b/doc/reference/libtelepathy-logger/docs.xml
@@ -11,7 +11,7 @@
 
     <xi:include href="xml/log-manager.xml"/>
     <xi:include href="xml/event.xml"/>
-    <xi:include href="xml/event-text.xml"/>
+    <xi:include href="xml/text-event.xml"/>
     <xi:include href="xml/entity.xml"/>
   </chapter>
 
diff --git a/telepathy-logger/Makefile.am b/telepathy-logger/Makefile.am
index 8ab0b98..2c2da8b 100644
--- a/telepathy-logger/Makefile.am
+++ b/telepathy-logger/Makefile.am
@@ -20,9 +20,9 @@ LIBTPLdir = $(includedir)/telepathy-logger-0.1/telepathy-logger
 LIBTPL_HEADERS = \
 		entity.h			\
 		event.h				\
-		event-text.h		\
 		log-manager.h			\
-		telepathy-logger.h \
+		telepathy-logger.h 		\
+		text-event.h			\
 		$(NULL)
 
 %-marshal.c: %-marshal.list Makefile.am
@@ -57,8 +57,6 @@ libtelepathy_logger_la_SOURCES = \
 		debug.c				\
 		event.c			\
 		event-internal.h			\
-		event-text.c		\
-		event-text-internal.h		\
 		log-manager.c			\
 		log-manager-internal.h		\
 		log-store.c			\
@@ -73,6 +71,8 @@ libtelepathy_logger_la_SOURCES = \
 		log-store-factory-internal.h	\
 		observer.c			\
 		observer-internal.h		\
+		text-event.c			\
+		text-event-internal.h		\
 		util-internal.h			\
 		util.c				\
 		$(NULL)
diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index 39ba7db..3f05e16 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -30,8 +30,8 @@
 #include <telepathy-logger/channel-internal.h>
 #include <telepathy-logger/observer-internal.h>
 #include <telepathy-logger/event-internal.h>
-#include <telepathy-logger/event-text.h>
-#include <telepathy-logger/event-text-internal.h>
+#include <telepathy-logger/text-event.h>
+#include <telepathy-logger/text-event-internal.h>
 #include <telepathy-logger/log-manager-internal.h>
 #include <telepathy-logger/log-store-sqlite-internal.h>
 
@@ -738,7 +738,7 @@ got_message_pending_messages_cb (TpProxy *proxy,
         {
           DEBUG ("pending-message-id not in a valid range, setting to "
               "UNKNOWN");
-            message_id = TPL_EVENT_TEXT_MSG_ID_UNKNOWN;
+            message_id = TPL_TEXT_EVENT_MSG_ID_UNKNOWN;
         }
       message_timestamp = tp_asv_get_uint64 (message_headers,
           "message-received", NULL);
@@ -1062,7 +1062,7 @@ on_sent_signal_cb (TpChannel *proxy,
   TpContact *me;
   TplEntity *sender;
   TplEntity *receiver = NULL;
-  TplEventText *text_log;
+  TplTextEvent *text_log;
   TplLogManager *logmanager;
   TpAccount *account;
   const gchar *channel_path;
@@ -1072,7 +1072,7 @@ on_sent_signal_cb (TpChannel *proxy,
 
   channel_path = tp_proxy_get_object_path (TP_PROXY (tpl_text));
   log_id = _tpl_create_message_token (channel_path, timestamp,
-      TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED);
+      TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED);
 
   /* Initialize data for TplEntity */
   me = _tpl_channel_text_get_my_contact (tpl_text);
@@ -1113,10 +1113,9 @@ on_sent_signal_cb (TpChannel *proxy,
           text);
     }
 
-  /* Initialise TplEventText */
+  /* Initialise TplTextEvent */
   account = _tpl_channel_get_account (TPL_CHANNEL (tpl_text));
-
-  text_log = g_object_new (TPL_TYPE_EVENT_TEXT,
+  text_log = g_object_new (TPL_TYPE_TEXT_EVENT,
       /* TplEvent */
       "account", account,
       "channel-path", channel_path,
@@ -1125,10 +1124,10 @@ on_sent_signal_cb (TpChannel *proxy,
       "sender", sender,
       "target-id", tpl_entity_get_identifier (receiver),
       "timestamp", timestamp,
-      /* TplEventText */
+      /* TplTextEvent */
       "message-type", type,
       "message", text,
-      "pending-msg-id", TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED,
+      "pending-msg-id", TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED,
       NULL);
 
   logmanager = tpl_log_manager_dup_singleton ();
@@ -1207,7 +1206,7 @@ keepon_on_receiving_signal (TplChannelText *tpl_text,
     TpContact *remote,
     ReceivedData *data)
 {
-  TplEventText *text_log;
+  TplTextEvent *text_log;
   GError *error = NULL;
   TplLogManager *logmanager;
   TplEntity *sender;
@@ -1229,8 +1228,8 @@ keepon_on_receiving_signal (TplChannelText *tpl_text,
       target_id = tpl_entity_get_identifier (sender);
     }
 
-  /* Initialize TplEventText */
-  text_log = g_object_new (TPL_TYPE_EVENT_TEXT,
+  /* Initialize TplTextEvent */
+  text_log = g_object_new (TPL_TYPE_TEXT_EVENT,
       /* TplEvent */
       "account", _tpl_channel_get_account (TPL_CHANNEL (tpl_text)),
       "channel-path", tp_proxy_get_object_path (TP_PROXY (tpl_text)),
@@ -1239,7 +1238,7 @@ keepon_on_receiving_signal (TplChannelText *tpl_text,
       "sender", sender,
       "target-id", target_id,
       "timestamp", data->timestamp,
-      /* TplEventText */
+      /* TplTextEvent */
       "message-type", data->type,
       "message", data->text,
       "pending-msg-id", data->msg_id,
@@ -1252,7 +1251,7 @@ keepon_on_receiving_signal (TplChannelText *tpl_text,
       tpl_entity_get_alias (receiver),
       tpl_entity_get_identifier (sender),
       tpl_entity_get_alias (sender),
-      tpl_event_text_get_message (text_log));
+      tpl_text_event_get_message (text_log));
 
   logmanager = tpl_log_manager_dup_singleton ();
   _tpl_log_manager_add_event (logmanager, TPL_EVENT (text_log), &error);
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index e6db2af..9f853bc 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -32,7 +32,7 @@
 #include <telepathy-glib/svc-generic.h>
 
 #include <telepathy-logger/event-internal.h>
-#include <telepathy-logger/event-text.h>
+#include <telepathy-logger/text-event.h>
 #include <telepathy-logger/log-manager.h>
 
 #include <extensions/extensions.h>
@@ -406,8 +406,8 @@ _get_events_return (GObject *manager,
        ptr = g_list_previous (ptr))
     {
       TplEvent *log = ptr->data;
-      const char *message = tpl_event_text_get_message (
-          TPL_EVENT_TEXT (log));
+      const char *message = tpl_text_event_get_message (
+          TPL_TEXT_EVENT (log));
       const char *sender = tpl_entity_get_identifier (
           tpl_event_get_sender (log));
       gint64 timestamp = tpl_event_get_timestamp (log);
diff --git a/telepathy-logger/event-text.h b/telepathy-logger/event-text.h
deleted file mode 100644
index 89d2567..0000000
--- a/telepathy-logger/event-text.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2009 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
- */
-
-#ifndef __TPL_EVENT_TEXT_H__
-#define __TPL_EVENT_TEXT_H__
-
-#include <glib-object.h>
-
-#include <telepathy-logger/event.h>
-
-G_BEGIN_DECLS
-#define TPL_TYPE_EVENT_TEXT                  (tpl_event_text_get_type ())
-#define TPL_EVENT_TEXT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TPL_TYPE_EVENT_TEXT, TplEventText))
-#define TPL_EVENT_TEXT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), TPL_TYPE_EVENT_TEXT, TplEventTextClass))
-#define TPL_IS_EVENT_TEXT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TPL_TYPE_EVENT_TEXT))
-#define TPL_IS_EVENT_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TPL_TYPE_EVENT_TEXT))
-#define TPL_EVENT_TEXT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TPL_TYPE_EVENT_TEXT, TplEventTextClass))
-
-typedef struct _TplEventText TplEventText;
-typedef struct _TplEventTextClass TplEventTextClass;
-typedef struct _TplEventTextPriv TplEventTextPriv;
-
-GType tpl_event_text_get_type (void);
-
-TpChannelTextMessageType tpl_event_text_get_message_type (TplEventText *self);
-
-const gchar *tpl_event_text_get_message (TplEventText *self);
-
-G_END_DECLS
-#endif // __TPL_EVENT_TEXT_H__
diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index 76cdd7d..d6eb2a4 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -33,7 +33,7 @@
 #include "log-store-internal.h"
 #include "log-store-pidgin-internal.h"
 #include "log-manager-internal.h"
-#include "event-text-internal.h"
+#include "text-event-internal.h"
 #include "entity-internal.h"
 #include "datetime-internal.h"
 #include "util-internal.h"
@@ -746,7 +746,7 @@ log_store_pidgin_get_events_for_files (TplLogStore *self,
 
       for (i = 1; lines[i] != NULL; i++)
         {
-          TplEventText *event;
+          TplTextEvent *event;
           TplEntity *sender;
           TplEntity *receiver = NULL;
           gchar *sender_name = NULL;
@@ -876,7 +876,7 @@ log_store_pidgin_get_events_for_files (TplLogStore *self,
               timestamp, 0);
           g_free (instead_of_channel_path);
 
-          event = g_object_new (TPL_TYPE_EVENT_TEXT,
+          event = g_object_new (TPL_TYPE_TEXT_EVENT,
               /* TplEvent */
               "account", account,
               /* MISSING: "channel-path", channel_path, */
@@ -885,11 +885,11 @@ log_store_pidgin_get_events_for_files (TplLogStore *self,
               "sender", sender,
               "target-id", target_id,
               "timestamp", timestamp,
-              /* TplEventText */
+              /* TplTextEvent */
               "message-type", TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL,
               "message", body,
               /* Assume that messages are acknowledged. */
-              "pending-msg-id", TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED,
+              "pending-msg-id", TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED,
               NULL);
 
           /* prepend and then reverse is better than append */
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index af96aa7..41c23f3 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -27,8 +27,8 @@
 #include <sqlite3.h>
 
 #include "event-internal.h"
-#include "event-text.h"
-#include "event-text-internal.h"
+#include "text-event.h"
+#include "text-event-internal.h"
 #include "entity-internal.h"
 #include "log-store-sqlite-internal.h"
 #include "log-manager-internal.h"
@@ -446,7 +446,7 @@ tpl_log_store_sqlite_add_message_counter (TplLogStore *self,
 
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-  if (TPL_IS_EVENT_TEXT (message) == FALSE)
+  if (TPL_IS_TEXT_EVENT (message) == FALSE)
     {
       DEBUG ("ignoring msg %s, not interesting for message-counter",
           _tpl_event_get_log_id (message));
@@ -630,7 +630,7 @@ out:
  *
  * MessageCounter only handles Text messages, which means that it will
  * silently (ie won't use @error) not log @message, when it won't be an
- * instance ot TplEventText, returning anyway %TRUE. This means "I could
+ * instance ot TplTextEvent, returning anyway %TRUE. This means "I could
  * store @message, but I'm discarding it because I'm not interested in it" and
  * is not cosidered an error (@error won't be set).
  * It will return %FALSE with @error set if a fatal error occurred, for
@@ -694,7 +694,7 @@ _insert_to_cache_table (TplLogStore *self,
   gboolean retval = FALSE;
   int e;
 
-  if (!TPL_IS_EVENT_TEXT (message))
+  if (!TPL_IS_TEXT_EVENT (message))
     {
       g_set_error (error, TPL_LOG_STORE_ERROR,
           TPL_LOG_STORE_ERROR_ADD_EVENT,
@@ -707,7 +707,7 @@ _insert_to_cache_table (TplLogStore *self,
   channel = get_channel_name_from_event (message);
   identifier = _tpl_event_get_target_id (message);
   log_id = _tpl_event_get_log_id (message);
-  msg_id = _tpl_event_text_get_pending_msg_id (TPL_EVENT_TEXT (message));
+  msg_id = _tpl_text_event_get_pending_msg_id (TPL_TEXT_EVENT (message));
   chatroom = _tpl_event_target_is_room (message);
   date = get_datetime (message);
 
@@ -716,7 +716,7 @@ _insert_to_cache_table (TplLogStore *self,
   DEBUG ("chat_identifier = %s", identifier);
   DEBUG ("log_identifier = %s", log_id);
   DEBUG ("pending_msg_id = %d (%s)", msg_id,
-      (TPL_EVENT_TEXT_MSG_ID_IS_VALID (msg_id) ?
+      (TPL_TEXT_EVENT_MSG_ID_IS_VALID (msg_id) ?
        "pending" : "acknowledged or sent"));
   DEBUG ("chatroom = %i", chatroom);
   DEBUG ("date = %s", date);
@@ -751,7 +751,7 @@ _insert_to_cache_table (TplLogStore *self,
   sqlite3_bind_text (sql, 2, account, -1, SQLITE_TRANSIENT);
   /* insert NULL if ACKNOWLEDGED (ie sent message's entries, which are created
    * ACK'd */
-  if (!TPL_EVENT_TEXT_MSG_ID_IS_VALID (msg_id))
+  if (!TPL_TEXT_EVENT_MSG_ID_IS_VALID (msg_id))
     sqlite3_bind_null (sql, 3);
   else
     sqlite3_bind_int (sql, 3, msg_id);
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 38dfce7..589532b 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -40,8 +40,8 @@
 #include <telepathy-glib/util.h>
 
 #include <telepathy-logger/event-internal.h>
-#include <telepathy-logger/event-text.h>
-#include <telepathy-logger/event-text-internal.h>
+#include <telepathy-logger/text-event.h>
+#include <telepathy-logger/text-event-internal.h>
 #include <telepathy-logger/log-manager.h>
 #include <telepathy-logger/log-store-internal.h>
 #include <telepathy-logger/log-manager-internal.h>
@@ -447,7 +447,7 @@ _log_store_xml_write_to_store (TplLogStoreXml *self,
 
 static gboolean
 add_event_text (TplLogStoreXml *self,
-    TplEventText *message,
+    TplTextEvent *message,
     GError **error)
 {
   gboolean ret = FALSE;
@@ -465,7 +465,7 @@ add_event_text (TplLogStoreXml *self,
 
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
   g_return_val_if_fail (TPL_IS_LOG_STORE_XML (self), FALSE);
-  g_return_val_if_fail (TPL_IS_EVENT_TEXT (message), FALSE);
+  g_return_val_if_fail (TPL_IS_TEXT_EVENT (message), FALSE);
 
   bus_daemon = tp_dbus_daemon_dup (error);
   if (bus_daemon == NULL)
@@ -476,12 +476,12 @@ add_event_text (TplLogStoreXml *self,
 
   account =  tpl_event_get_account (TPL_EVENT (message));
 
-  body_str = tpl_event_text_get_message (message);
+  body_str = tpl_text_event_get_message (message);
   if (TPL_STR_EMPTY (body_str))
     goto out;
 
   body = g_markup_escape_text (body_str, -1);
-  msg_type = tpl_event_text_get_message_type (message);
+  msg_type = tpl_text_event_get_message_type (message);
   timestamp = log_store_xml_get_timestamp_from_event (
       TPL_EVENT (message));
 
@@ -501,7 +501,7 @@ add_event_text (TplLogStoreXml *self,
       avatar_token ? avatar_token : "",
       tpl_entity_get_entity_type (sender)
           == TPL_ENTITY_SELF ? "true" : "false",
-      _tpl_event_text_message_type_to_str (msg_type),
+      _tpl_text_event_message_type_to_str (msg_type),
       body);
 
   DEBUG ("writing %s from %s (ts %s)",
@@ -539,8 +539,8 @@ log_store_xml_add_event (TplLogStore *store,
   g_return_val_if_fail (TPL_IS_EVENT (event), FALSE);
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-  if (TPL_IS_EVENT_TEXT (event))
-    return add_event_text (self, TPL_EVENT_TEXT (event), error);
+  if (TPL_IS_TEXT_EVENT (event))
+    return add_event_text (self, TPL_TEXT_EVENT (event), error);
 
   DEBUG ("TplEventSignalType not handled by this LogStore (%s). "
       "Ignoring Event", log_store_xml_get_name (store));
@@ -826,7 +826,7 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
   /* Now get the events. */
   for (node = log_node->children; node; node = node->next)
     {
-      TplEventText *event;
+      TplTextEvent *event;
       TplEntity *sender;
       TplEntity *receiver;
       gchar *time_str;
@@ -861,7 +861,7 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
         is_user = (!tp_strdiff (is_user_str, "true"));
 
       if (msg_type_str != NULL)
-        msg_type = _tpl_event_text_message_type_from_str (msg_type_str);
+        msg_type = _tpl_text_event_message_type_from_str (msg_type_str);
 
       timestamp = _tpl_time_parse (time_str);
 
@@ -910,7 +910,7 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
           xmlFree (saved_log_id);
         }
 
-      event = g_object_new (TPL_TYPE_EVENT_TEXT,
+      event = g_object_new (TPL_TYPE_TEXT_EVENT,
           /* TplEvent */
           "account", account,
           /* MISSING: "channel-path", channel_path, */
@@ -919,12 +919,12 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
           "sender", sender,
           "target-id", target_id,
           "timestamp", timestamp,
-          /* TplEventText */
+          /* TplTextEvent */
           "message-type", msg_type,
           "message", body,
           /* As the pending-msg-id is not maintained in XML store, we simply
            * assume the message to be acknowledge. */
-          "pending-msg-id", TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED,
+          "pending-msg-id", TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED,
           NULL);
 
       events = g_list_append (events, event);
diff --git a/telepathy-logger/log-store.c b/telepathy-logger/log-store.c
index 60c2892..ab5e1dd 100644
--- a/telepathy-logger/log-store.c
+++ b/telepathy-logger/log-store.c
@@ -32,7 +32,7 @@
  * @title: TplLogStore
  * @short_description: LogStore interface can register into #TplLogManager as
  * #TplLogStore:writable or #TplLogStore:readable log stores.
- * @see_also: #event-text:TplEventText and other subclasses when they'll exist
+ * @see_also: #event-text:TplTextEvent and other subclasses when they'll exist
  *
  * The #TplLogStore defines all the public methods that a TPL Log Store has to
  * implement in order to be used into a #TplLogManager.
@@ -136,7 +136,7 @@ _tpl_log_store_exists (TplLogStore *self,
 /**
  * _tpl_log_store_add_event:
  * @self: a TplLogStore
- * @event: an instance of a subclass of TplEvent (ie TplEventText)
+ * @event: an instance of a subclass of TplEvent (ie TplTextEvent)
  * @error: memory location used if an error occurs
  *
  * Sends @event to the LogStore @self, in order to be stored.
@@ -203,7 +203,7 @@ _tpl_log_store_get_dates (TplLogStore *self,
  *
  * Retrieves a list of events, with timestamp matching @date.
  *
- * Returns: a GList of TplEventText, to be freed using something like
+ * Returns: a GList of TplTextEvent, to be freed using something like
  * g_list_foreach (lst, g_object_unref, NULL);
  * g_list_free (lst);
  */
@@ -331,7 +331,7 @@ _tpl_log_store_search_new (TplLogStore *self,
  * It will return at most the last (ie most recent) @num_events events.
  * Pass G_MAXUINT if all the events are needed.
  *
- * Returns: a GList of TplEventText, to be freed using something like
+ * Returns: a GList of TplTextEvent, to be freed using something like
  * g_list_foreach (lst, g_object_unref, NULL);
  * g_list_free (lst);
  */
diff --git a/telepathy-logger/telepathy-logger.h b/telepathy-logger/telepathy-logger.h
index 19aee37..0ad4a41 100644
--- a/telepathy-logger/telepathy-logger.h
+++ b/telepathy-logger/telepathy-logger.h
@@ -22,7 +22,7 @@
 #define __TELEPATHY_LOGGER_H__
 
 #include <telepathy-logger/entity.h>
-#include <telepathy-logger/event-text.h>
+#include <telepathy-logger/text-event.h>
 #include <telepathy-logger/event.h>
 #include <telepathy-logger/log-manager.h>
 
diff --git a/telepathy-logger/event-text-internal.h b/telepathy-logger/text-event-internal.h
index 3f8b824..51fb138 100644
--- a/telepathy-logger/event-text-internal.h
+++ b/telepathy-logger/text-event-internal.h
@@ -19,42 +19,42 @@
  * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
  */
 
-#ifndef __TPL_EVENT_TEXT_INTERNAL_H__
-#define __TPL_EVENT_TEXT_INTERNAL_H__
+#ifndef __TPL_TEXT_EVENT_INTERNAL_H__
+#define __TPL_TEXT_EVENT_INTERNAL_H__
 
-#include <telepathy-logger/event-text.h>
+#include <telepathy-logger/text-event.h>
 #include <telepathy-logger/event-internal.h>
 #include <telepathy-logger/channel-text-internal.h>
 
-#define TPL_EVENT_TEXT_MSG_ID_IS_VALID(msg) (msg >= 0)
+#define TPL_TEXT_EVENT_MSG_ID_IS_VALID(msg) (msg >= 0)
 
-#define TPL_EVENT_TEXT_MSG_ID_UNKNOWN -2
-#define TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED -1
+#define TPL_TEXT_EVENT_MSG_ID_UNKNOWN -2
+#define TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED -1
 
 G_BEGIN_DECLS
 
-struct _TplEventText
+struct _TplTextEvent
 {
   TplEvent parent;
 
   /* Private */
-  TplEventTextPriv *priv;
+  TplTextEventPriv *priv;
 };
 
-struct _TplEventTextClass
+struct _TplTextEventClass
 {
   TplEventClass parent_class;
 };
 
-TpChannelTextMessageType _tpl_event_text_message_type_from_str (
+TpChannelTextMessageType _tpl_text_event_message_type_from_str (
     const gchar *type_str);
 
-const gchar * _tpl_event_text_message_type_to_str (
+const gchar * _tpl_text_event_message_type_to_str (
     TpChannelTextMessageType msg_type);
 
-gint _tpl_event_text_get_pending_msg_id (TplEventText *self);
+gint _tpl_text_event_get_pending_msg_id (TplTextEvent *self);
 
-gboolean _tpl_event_text_is_pending (TplEventText *self);
+gboolean _tpl_text_event_is_pending (TplTextEvent *self);
 
 G_END_DECLS
-#endif // __TPL_EVENT_TEXT_INTERNAL_H__
+#endif // __TPL_TEXT_EVENT_INTERNAL_H__
diff --git a/telepathy-logger/event-text.c b/telepathy-logger/text-event.c
index c01b55d..f916d5f 100644
--- a/telepathy-logger/event-text.c
+++ b/telepathy-logger/text-event.c
@@ -20,8 +20,8 @@
  */
 
 #include "config.h"
-#include "event-text.h"
-#include "event-text-internal.h"
+#include "text-event.h"
+#include "text-event-internal.h"
 
 #include <glib-object.h>
 #include <telepathy-glib/util.h>
@@ -35,33 +35,33 @@
 
 /**
  * SECTION:event-text
- * @title: TplEventText
+ * @title: TplTextEvent
  * @short_description: Representation of a text log event
  *
  * A subclass of #TplEvent representing a text log event.
  */
 
 /**
- * TplEventText:
+ * TplTextEvent:
  *
  * An object representing a text log event.
  */
 
 /**
- * TPL_EVENT_TEXT_MSG_ID_IS_VALID:
+ * TPL_TEXT_EVENT_MSG_ID_IS_VALID:
  * @msg: a message ID
  *
  * Return whether a message ID is valid.
  *
  * If %FALSE is returned, it means that either an invalid input has been
- * passed, or the TplEvent is currently set to %TPL_EVENT_TEXT_MSG_ID_UNKNOWN
- * or %TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED.
+ * passed, or the TplEvent is currently set to %TPL_TEXT_EVENT_MSG_ID_UNKNOWN
+ * or %TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED.
  *
  * Returns: %TRUE if the argument is a valid message ID or %FALSE otherwise.
  */
 
 /**
- * TPL_EVENT_TEXT_MSG_ID_UNKNOWN:
+ * TPL_TEXT_EVENT_MSG_ID_UNKNOWN:
  *
  * Special value used instead of a message ID to indicate a message with an
  * unknown status (before _tpl_event_set_pending_msg_id() was called, or
@@ -69,15 +69,15 @@
  */
 
 /**
- * TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED:
+ * TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED:
  *
  * Special value used instead of a message ID to indicate an acknowledged
  * message.
  */
 
-G_DEFINE_TYPE (TplEventText, tpl_event_text, TPL_TYPE_EVENT)
+G_DEFINE_TYPE (TplTextEvent, tpl_text_event, TPL_TYPE_EVENT)
 
-struct _TplEventTextPriv
+struct _TplTextEventPriv
 {
   TpChannelTextMessageType message_type;
   gchar *message;
@@ -104,24 +104,24 @@ static gchar *message_types[] = {
 
 
 static void
-tpl_event_text_finalize (GObject *obj)
+tpl_text_event_finalize (GObject *obj)
 {
-  TplEventTextPriv *priv = TPL_EVENT_TEXT (obj)->priv;
+  TplTextEventPriv *priv = TPL_TEXT_EVENT (obj)->priv;
 
   g_free (priv->message);
   priv->message = NULL;
 
-  G_OBJECT_CLASS (tpl_event_text_parent_class)->finalize (obj);
+  G_OBJECT_CLASS (tpl_text_event_parent_class)->finalize (obj);
 }
 
 
 static void
-tpl_event_text_get_property (GObject *object,
+tpl_text_event_get_property (GObject *object,
     guint param_id,
     GValue *value,
     GParamSpec *pspec)
 {
-  TplEventTextPriv *priv = TPL_EVENT_TEXT (object)->priv;
+  TplTextEventPriv *priv = TPL_TEXT_EVENT (object)->priv;
 
   switch (param_id)
     {
@@ -142,12 +142,12 @@ tpl_event_text_get_property (GObject *object,
 
 
 static void
-tpl_event_text_set_property (GObject *object,
+tpl_text_event_set_property (GObject *object,
     guint param_id,
     const GValue *value,
     GParamSpec *pspec)
 {
-  TplEventTextPriv *priv = TPL_EVENT_TEXT (object)->priv;
+  TplTextEventPriv *priv = TPL_TEXT_EVENT (object)->priv;
 
   switch (param_id) {
       case PROP_MESSAGE_TYPE:
@@ -166,14 +166,14 @@ tpl_event_text_set_property (GObject *object,
   }
 }
 
-static void tpl_event_text_class_init (TplEventTextClass *klass)
+static void tpl_text_event_class_init (TplTextEventClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GParamSpec *param_spec;
 
-  object_class->finalize = tpl_event_text_finalize;
-  object_class->get_property = tpl_event_text_get_property;
-  object_class->set_property = tpl_event_text_set_property;
+  object_class->finalize = tpl_text_event_finalize;
+  object_class->get_property = tpl_text_event_get_property;
+  object_class->set_property = tpl_text_event_set_property;
 
   param_spec = g_param_spec_uint ("message-type",
       "MessageType",
@@ -190,15 +190,15 @@ static void tpl_event_text_class_init (TplEventTextClass *klass)
   g_object_class_install_property (object_class, PROP_MESSAGE, param_spec);
 
   /**
-   * TplEventText::pending-msg-id:
+   * TplTextEvent::pending-msg-id:
    *
    * The pending message id for the current log event.
-   * The default value, is #TPL_EVENT_TEXT_MSG_ID_UNKNOWN,
+   * The default value, is #TPL_TEXT_EVENT_MSG_ID_UNKNOWN,
    * meaning that it's not possible to know if the message is pending or has
    * been acknowledged.
    *
    * An object instantiating a TplEvent subclass should explicitly set it
-   * to a valid msg-id number (id>=0) or to #TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED
+   * to a valid msg-id number (id>=0) or to #TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED
    * when acknowledged or if the event is a result of
    * 'sent' signal.
    * In fact a sent event is considered as 'automatically' ACK by TPL.
@@ -214,26 +214,26 @@ static void tpl_event_text_class_init (TplEventTextClass *klass)
       "PendingMessageId",
       "Pending Message ID, if set, the log event is set as pending for ACK."
       " Default to -1 meaning not pending.",
-      -1, G_MAXUINT32, TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED,
+      -1, G_MAXUINT32, TPL_TEXT_EVENT_MSG_ID_ACKNOWLEDGED,
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_PENDING_MSG_ID,
       param_spec);
 
-  g_type_class_add_private (object_class, sizeof (TplEventTextPriv));
+  g_type_class_add_private (object_class, sizeof (TplTextEventPriv));
 }
 
 
 static void
-tpl_event_text_init (TplEventText *self)
+tpl_text_event_init (TplTextEvent *self)
 {
-  TplEventTextPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-      TPL_TYPE_EVENT_TEXT, TplEventTextPriv);
+  TplTextEventPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+      TPL_TYPE_TEXT_EVENT, TplTextEventPriv);
   self->priv = priv;
 }
 
 
 /**
- * _tpl_event_text_message_type_from_str
+ * _tpl_text_event_message_type_from_str
  * @type_str: string to transform into a #TpChannelTextMessageType
  *
  * Maps strings into enum #TpChannelTextMessageType values.
@@ -242,7 +242,7 @@ tpl_event_text_init (TplEventText *self)
  * mapping is found, or defaults to %TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL if not.
  */
 TpChannelTextMessageType
-_tpl_event_text_message_type_from_str (const gchar *type_str)
+_tpl_text_event_message_type_from_str (const gchar *type_str)
 {
   guint i;
   for (i = 0; i < G_N_ELEMENTS (message_types); ++i)
@@ -255,7 +255,7 @@ _tpl_event_text_message_type_from_str (const gchar *type_str)
 
 
 /**
- * _tpl_event_text_message_type_to_str
+ * _tpl_text_event_message_type_to_str
  * @msg_type: message type to transform into a string
  *
  * Maps enum #TpChannelTextMessageType values into strings
@@ -264,7 +264,7 @@ _tpl_event_text_message_type_from_str (const gchar *type_str)
  * a legal value for %TpChannelTextMessageType.
  */
 const gchar *
-_tpl_event_text_message_type_to_str (TpChannelTextMessageType msg_type)
+_tpl_text_event_message_type_to_str (TpChannelTextMessageType msg_type)
 {
   g_return_val_if_fail (G_N_ELEMENTS (message_types) >= msg_type, NULL);
 
@@ -273,30 +273,30 @@ _tpl_event_text_message_type_to_str (TpChannelTextMessageType msg_type)
 
 
 /**
- * tpl_event_text_get_message
- * @self: a #TplEventText
+ * tpl_text_event_get_message
+ * @self: a #TplTextEvent
  *
- * Returns: the same message as the #TplEventText:message property
+ * Returns: the same message as the #TplTextEvent:message property
  */
 const gchar *
-tpl_event_text_get_message (TplEventText *self)
+tpl_text_event_get_message (TplTextEvent *self)
 {
-  g_return_val_if_fail (TPL_IS_EVENT_TEXT (self), NULL);
+  g_return_val_if_fail (TPL_IS_TEXT_EVENT (self), NULL);
 
   return self->priv->message;
 }
 
 
 /**
- * tpl_event_text_get_message_type
- * @self: a #TplEventText
+ * tpl_text_event_get_message_type
+ * @self: a #TplTextEvent
  *
- * Returns: the same message as the #TplEventText:message-type property
+ * Returns: the same message as the #TplTextEvent:message-type property
  */
 TpChannelTextMessageType
-tpl_event_text_get_message_type (TplEventText *self)
+tpl_text_event_get_message_type (TplTextEvent *self)
 {
-  g_return_val_if_fail (TPL_IS_EVENT_TEXT (self),
+  g_return_val_if_fail (TPL_IS_TEXT_EVENT (self),
       TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL);
 
   return self->priv->message_type;
@@ -304,23 +304,23 @@ tpl_event_text_get_message_type (TplEventText *self)
 
 
 /*
- * tpl_event_text_get_pending_msg_id
- * @self: a #TplEventText
+ * tpl_text_event_get_pending_msg_id
+ * @self: a #TplTextEvent
  *
- * Returns: the id as the #TplEventText:pending-msg-id property
+ * Returns: the id as the #TplTextEvent:pending-msg-id property
  */
 gint
-_tpl_event_text_get_pending_msg_id (TplEventText *self)
+_tpl_text_event_get_pending_msg_id (TplTextEvent *self)
 {
-  g_return_val_if_fail (TPL_IS_EVENT_TEXT (self), -1);
+  g_return_val_if_fail (TPL_IS_TEXT_EVENT (self), -1);
 
   return self->priv->pending_msg_id;
 }
 
 
 gboolean
-_tpl_event_text_is_pending (TplEventText *self)
+_tpl_text_event_is_pending (TplTextEvent *self)
 {
-  return TPL_EVENT_TEXT_MSG_ID_IS_VALID (
-      _tpl_event_text_get_pending_msg_id (self));
+  return TPL_TEXT_EVENT_MSG_ID_IS_VALID (
+      _tpl_text_event_get_pending_msg_id (self));
 }
diff --git a/telepathy-logger/text-event.h b/telepathy-logger/text-event.h
new file mode 100644
index 0000000..393f3e0
--- /dev/null
+++ b/telepathy-logger/text-event.h
@@ -0,0 +1,48 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors: Cosimo Alfarano <cosimo.alfarano@collabora.co.uk>
+ */
+
+#ifndef __TPL_TEXT_EVENT_H__
+#define __TPL_TEXT_EVENT_H__
+
+#include <glib-object.h>
+
+#include <telepathy-logger/event.h>
+
+G_BEGIN_DECLS
+#define TPL_TYPE_TEXT_EVENT                  (tpl_text_event_get_type ())
+#define TPL_TEXT_EVENT(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), TPL_TYPE_TEXT_EVENT, TplTextEvent))
+#define TPL_TEXT_EVENT_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), TPL_TYPE_TEXT_EVENT, TplTextEventClass))
+#define TPL_IS_TEXT_EVENT(obj)               (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TPL_TYPE_TEXT_EVENT))
+#define TPL_IS_TEXT_EVENT_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), TPL_TYPE_TEXT_EVENT))
+#define TPL_TEXT_EVENT_GET_CLASS(obj)        (G_TYPE_INSTANCE_GET_CLASS ((obj), TPL_TYPE_TEXT_EVENT, TplTextEventClass))
+
+typedef struct _TplTextEvent TplTextEvent;
+typedef struct _TplTextEventClass TplTextEventClass;
+typedef struct _TplTextEventPriv TplTextEventPriv;
+
+GType tpl_text_event_get_type (void);
+
+TpChannelTextMessageType tpl_text_event_get_message_type (TplTextEvent *self);
+
+const gchar *tpl_text_event_get_message (TplTextEvent *self);
+
+G_END_DECLS
+#endif // __TPL_TEXT_EVENT_H__
diff --git a/tests/dbus/test-tpl-log-store-pidgin.c b/tests/dbus/test-tpl-log-store-pidgin.c
index bbd0996..a89017c 100644
--- a/tests/dbus/test-tpl-log-store-pidgin.c
+++ b/tests/dbus/test-tpl-log-store-pidgin.c
@@ -8,7 +8,7 @@
 #include "lib/simple-account-manager.h"
 
 #include <telepathy-logger/log-store-pidgin-internal.h>
-#include <telepathy-logger/event-text-internal.h>
+#include <telepathy-logger/text-event-internal.h>
 
 #include <telepathy-glib/debug-sender.h>
 
@@ -339,7 +339,7 @@ test_get_events_for_date_jabber (PidginTestCaseFixture *fixture,
     gconstpointer user_data)
 {
   GList *l;
-  TplEventText *msg = NULL;
+  TplTextEvent *msg = NULL;
   GDate *date = g_date_new_dmy (12, G_DATE_APRIL, 2010);
 
   /* chatroom messages */
@@ -352,7 +352,7 @@ test_get_events_for_date_jabber (PidginTestCaseFixture *fixture,
 
   msg = g_list_nth_data (l, 0);
   g_assert (_tpl_event_target_is_room (TPL_EVENT (msg)) == TRUE);
-  g_assert_cmpstr (tpl_event_text_get_message (msg), ==, "1");
+  g_assert_cmpstr (tpl_text_event_get_message (msg), ==, "1");
 
   g_list_foreach (l, (GFunc) g_object_unref, NULL);
   g_list_free (l);
@@ -368,7 +368,7 @@ test_get_events_for_date_jabber (PidginTestCaseFixture *fixture,
 
   msg = g_list_nth_data (l, 0);
   g_assert (_tpl_event_target_is_room (TPL_EVENT (msg)) == FALSE);
-  g_assert_cmpstr (tpl_event_text_get_message (msg), ==, "hi");
+  g_assert_cmpstr (tpl_text_event_get_message (msg), ==, "hi");
 
   g_list_foreach (l, (GFunc) g_object_unref, NULL);
   g_list_free (l);
diff --git a/tests/test-tpl-log-manager.c b/tests/test-tpl-log-manager.c
index 1248482..672d011 100644
--- a/tests/test-tpl-log-manager.c
+++ b/tests/test-tpl-log-manager.c
@@ -1,4 +1,4 @@
-#include <telepathy-logger/event-text.h>
+#include <telepathy-logger/text-event.h>
 
 #define gconf_client_get_bool(obj,key,err) g_print ("%s", key)