Properly move pending-msg-id into TplEventText

8 files changed, 51 insertions, 51 deletions

diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index cbdf35b..9e9eb1d 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -726,7 +726,7 @@ got_message_pending_messages_cb (TpProxy *proxy,
         {
           DEBUG ("pending-message-id not in a valid range, setting to "
               "UNKNOWN");
-            message_id = TPL_EVENT_MSG_ID_UNKNOWN;
+            message_id = TPL_EVENT_TEXT_MSG_ID_UNKNOWN;
         }
       message_timestamp = tp_asv_get_uint64 (message_headers,
           "message-received", NULL);
@@ -1062,7 +1062,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, arg_Timestamp,
-      TPL_EVENT_MSG_ID_ACKNOWLEDGED);
+      TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED);
 
   /* Initialize data for TplEntity */
   me = _tpl_channel_text_get_my_contact (tpl_text);
@@ -1112,7 +1112,7 @@ on_sent_signal_cb (TpChannel *proxy,
   log = TPL_EVENT (text_log);
 
   _tpl_event_text_set_pending_msg_id (text_log,
-      TPL_EVENT_MSG_ID_ACKNOWLEDGED);
+      TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED);
   _tpl_event_set_channel_path (TPL_EVENT (log), channel_path);
   _tpl_event_set_id (log, chat_id);
   _tpl_event_set_timestamp (log, (time_t) arg_Timestamp);
diff --git a/telepathy-logger/event-internal.h b/telepathy-logger/event-internal.h
index b0587e6..a89ee8f 100644
--- a/telepathy-logger/event-internal.h
+++ b/telepathy-logger/event-internal.h
@@ -26,11 +26,6 @@
 
 G_BEGIN_DECLS
 
-#define TPL_EVENT_MSG_ID_IS_VALID(msg) (msg >= 0)
-
-#define TPL_EVENT_MSG_ID_UNKNOWN -2
-#define TPL_EVENT_MSG_ID_ACKNOWLEDGED -1
-
 struct _TplEvent
 {
   GObject parent;
diff --git a/telepathy-logger/event-text-internal.h b/telepathy-logger/event-text-internal.h
index ba94552..d9be746 100644
--- a/telepathy-logger/event-text-internal.h
+++ b/telepathy-logger/event-text-internal.h
@@ -26,6 +26,11 @@
 #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_EVENT_TEXT_MSG_ID_UNKNOWN -2
+#define TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED -1
+
 G_BEGIN_DECLS
 
 struct _TplEventText
@@ -73,6 +78,8 @@ gboolean _tpl_event_text_is_chatroom (TplEventText *self);
 gboolean _tpl_event_text_equal (TplEvent *message1,
     TplEvent *message2);
 
+gint _tpl_event_text_get_pending_msg_id (TplEventText *self);
+
 void _tpl_event_text_set_pending_msg_id (TplEventText *self,
     gint data);
 
diff --git a/telepathy-logger/event-text.c b/telepathy-logger/event-text.c
index 9377d1d..e0afe8d 100644
--- a/telepathy-logger/event-text.c
+++ b/telepathy-logger/event-text.c
@@ -47,6 +47,34 @@
  * An object representing a text log event.
  */
 
+/**
+ * TPL_EVENT_TEXT_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.
+ *
+ * Returns: %TRUE if the argument is a valid message ID or %FALSE otherwise.
+ */
+
+/**
+ * TPL_EVENT_TEXT_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
+ * when it wasn't possible to obtain the message ID).
+ */
+
+/**
+ * TPL_EVENT_TEXT_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)
 
 struct _TplEventTextPriv
@@ -178,12 +206,12 @@ static void tpl_event_text_class_init (TplEventTextClass *klass)
    * TplEventText::pending-msg-id:
    *
    * The pending message id for the current log event.
-   * The default value, is #TPL_EVENT_MSG_ID_UNKNOWN,
+   * The default value, is #TPL_EVENT_TEXT_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_MSG_ID_ACKNOWLEDGED
+   * to a valid msg-id number (id>=0) or to #TPL_EVENT_TEXT_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.
@@ -199,7 +227,7 @@ 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_MSG_ID_ACKNOWLEDGED,
+      -1, G_MAXUINT32, TPL_EVENT_TEXT_MSG_ID_ACKNOWLEDGED,
       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_PENDING_MSG_ID,
       param_spec);
@@ -408,16 +436,16 @@ _tpl_event_text_set_pending_msg_id (TplEventText *self,
   g_object_notify (G_OBJECT (self), "pending-msg-id");
 }
 
-/**
+/*
  * tpl_event_text_get_pending_msg_id
- * @self: a #TplEventText
+ * @self: a #TplEvent
  *
  * Returns: the id as the #TplEventText:pending-msg-id property
  */
 gint
-tpl_event_text_get_pending_msg_id (TplEventText *self)
+_tpl_event_text_get_pending_msg_id (TplEventText *self)
 {
-  g_return_val_if_fail (TPL_IS_EVENT (self), -1);
+  g_return_val_if_fail (TPL_IS_EVENT_TEXT (self), -1);
 
   return self->priv->pending_msg_id;
 }
@@ -426,6 +454,6 @@ tpl_event_text_get_pending_msg_id (TplEventText *self)
 gboolean
 _tpl_event_text_is_pending (TplEventText *self)
 {
-  return TPL_EVENT_MSG_ID_IS_VALID (
-      tpl_event_text_get_pending_msg_id (self));
+  return TPL_EVENT_TEXT_MSG_ID_IS_VALID (
+      _tpl_event_text_get_pending_msg_id (self));
 }
diff --git a/telepathy-logger/event-text.h b/telepathy-logger/event-text.h
index da43a78..3ad23f9 100644
--- a/telepathy-logger/event-text.h
+++ b/telepathy-logger/event-text.h
@@ -42,7 +42,5 @@ GType tpl_event_text_get_type (void);
 
 const gchar *tpl_event_text_get_message (TplEventText *self);
 
-gint tpl_event_text_get_pending_msg_id (TplEventText *self);
-
 G_END_DECLS
 #endif // __TPL_EVENT_TEXT_H__
diff --git a/telepathy-logger/event.c b/telepathy-logger/event.c
index 4f99e86..48321f2 100644
--- a/telepathy-logger/event.c
+++ b/telepathy-logger/event.c
@@ -44,34 +44,6 @@
  * An object representing a generic log event.
  */
 
-/**
- * TPL_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_MSG_ID_UNKNOWN
- * or %TPL_EVENT_MSG_ID_ACKNOWLEDGED.
- *
- * Returns: %TRUE if the argument is a valid message ID or %FALSE otherwise.
- */
-
-/**
- * TPL_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
- * when it wasn't possible to obtain the message ID).
- */
-
-/**
- * TPL_EVENT_MSG_ID_ACKNOWLEDGED:
- *
- * Special value used instead of a message ID to indicate an acknowledged
- * message.
- */
-
 G_DEFINE_ABSTRACT_TYPE (TplEvent, tpl_event, G_TYPE_OBJECT)
 
 static void tpl_event_set_log_id (TplEvent *self, const gchar *data);
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index 074e74f..9d3d841 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -707,7 +707,7 @@ _insert_to_cache_table (TplLogStore *self,
   channel = get_channel_name_from_event (message);
   identifier = _tpl_event_get_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_event_text_get_pending_msg_id (TPL_EVENT_TEXT (message));
   chatroom = _tpl_event_text_is_chatroom (TPL_EVENT_TEXT (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_MSG_ID_IS_VALID (msg_id) ?
+      (TPL_EVENT_TEXT_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_MSG_ID_IS_VALID (msg_id))
+  if (!TPL_EVENT_TEXT_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 776a38e..3e09121 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -838,7 +838,7 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
         pending_id = atoi (log_id);
       else
         /* we have no way in non empathy-legacy mode to know it */
-        pending_id = TPL_EVENT_MSG_ID_UNKNOWN;
+        pending_id = TPL_EVENT_TEXT_MSG_ID_UNKNOWN;
 
       t = _tpl_time_parse (time_);