Add edit-timestamp, and remove original-timestamp

log-store-xml:
* store/save edit-timestamp rather than original-timestamp
* Also don't let the edit timestamp override the timestamp for where messages
  are saved (as was the case for original-message).
text-event:
* s/original/edit/

3 files changed, 33 insertions, 33 deletions

diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index bd748d2..fdf5fa0 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -503,7 +503,7 @@ add_text_event (TplLogStoreXml *self,
     GError **error)
 {
   gboolean ret = FALSE;
-  guint64 timestamp = 0;
+  guint64 timestamp;
   TpDBusDaemon *bus_daemon;
   TpAccount *account;
   TplEntity *sender;
@@ -570,24 +570,24 @@ add_text_event (TplLogStoreXml *self,
       if (!TPL_STR_EMPTY (token_str))
         {
           gchar *supersedes_token = g_markup_escape_text (token_str, -1);
+          guint edit_timestamp;
           g_string_append_printf (event, " supersedes-token='%s'",
               supersedes_token);
 
-          timestamp = tpl_text_event_get_original_timestamp (message);
-          if (timestamp != 0)
+          edit_timestamp = tpl_text_event_get_edit_timestamp (message);
+          if (edit_timestamp != 0)
             {
-              gchar *original_timestamp_str =
-                  log_store_xml_format_timestamp (timestamp);
-              g_string_append_printf (event, " original-timestamp='%s'",
-                  original_timestamp_str);
-              g_free (original_timestamp_str);
+              gchar *edit_timestamp_str =
+                  log_store_xml_format_timestamp (edit_timestamp);
+              g_string_append_printf (event, " edit-timestamp='%s'",
+                  edit_timestamp_str);
+              g_free (edit_timestamp_str);
             }
         }
 
     }
 
-  if (timestamp == 0)
-    timestamp = tpl_event_get_timestamp (TPL_EVENT (message));
+  timestamp = tpl_event_get_timestamp (TPL_EVENT (message));
 
   g_string_append_printf (event, ">%s</message>\n" LOG_FOOTER, body);
 
@@ -1096,8 +1096,8 @@ parse_text_node (TplLogStoreXml *self,
   TplEntity *receiver;
   gchar *time_str;
   gint64 timestamp;
-  gchar *original_time_str;
-  gint64 original_timestamp = 0;
+  gchar *edit_time_str;
+  gint64 edit_timestamp = 0;
   gchar *sender_id;
   gchar *sender_name;
   gchar *sender_avatar_token;
@@ -1111,8 +1111,8 @@ parse_text_node (TplLogStoreXml *self,
 
   body = (gchar *) xmlNodeGetContent (node);
   time_str = (gchar *) xmlGetProp (node, (const xmlChar *) "time");
-  original_time_str = (gchar *) xmlGetProp (node,
-      (const xmlChar *) "original-timestamp");
+  edit_time_str = (gchar *) xmlGetProp (node,
+      (const xmlChar *) "edit-timestamp");
   sender_id = (gchar *) xmlGetProp (node, (const xmlChar *) "id");
   sender_name = (gchar *) xmlGetProp (node, (const xmlChar *) "name");
   sender_avatar_token = (gchar *) xmlGetProp (node,
@@ -1132,9 +1132,9 @@ parse_text_node (TplLogStoreXml *self,
 
   timestamp = _tpl_time_parse (time_str);
 
-  if (supersedes_token != NULL && original_time_str != NULL)
+  if (supersedes_token != NULL && edit_time_str != NULL)
     {
-      original_timestamp = _tpl_time_parse (original_time_str);
+      edit_timestamp = _tpl_time_parse (edit_time_str);
     }
 
   if (is_room)
@@ -1161,13 +1161,13 @@ parse_text_node (TplLogStoreXml *self,
       "message", body,
       "message-token", message_token,
       "supersedes-token", supersedes_token,
-      "original-timestamp", original_timestamp,
+      "edit-timestamp", edit_timestamp,
       NULL);
 
   g_object_unref (sender);
   g_object_unref (receiver);
   xmlFree (time_str);
-  xmlFree (original_time_str);
+  xmlFree (edit_time_str);
   xmlFree (sender_id);
   xmlFree (sender_name);
   xmlFree (body);
diff --git a/telepathy-logger/text-event.c b/telepathy-logger/text-event.c
index 0f3edea..6f647df 100644
--- a/telepathy-logger/text-event.c
+++ b/telepathy-logger/text-event.c
@@ -52,7 +52,7 @@ G_DEFINE_TYPE (TplTextEvent, tpl_text_event, TPL_TYPE_EVENT)
 struct _TplTextEventPriv
 {
   TpChannelTextMessageType message_type;
-  guint64 original_timestamp;
+  guint64 edit_timestamp;
   gchar *message;
   gchar *token;
   gchar *supersedes_token;
@@ -64,7 +64,7 @@ struct _TplTextEventPriv
 enum
 {
   PROP_MESSAGE_TYPE = 1,
-  PROP_ORIGINAL_TIMESTAMP,
+  PROP_EDIT_TIMESTAMP,
   PROP_MESSAGE,
   PROP_TOKEN,
   PROP_SUPERSEDES
@@ -122,8 +122,8 @@ tpl_text_event_get_property (GObject *object,
       case PROP_MESSAGE_TYPE:
         g_value_set_uint (value, priv->message_type);
         break;
-      case PROP_ORIGINAL_TIMESTAMP:
-        g_value_set_uint64 (value, priv->original_timestamp);
+      case PROP_EDIT_TIMESTAMP:
+        g_value_set_uint64 (value, priv->edit_timestamp);
         break;
       case PROP_MESSAGE:
         g_value_set_string (value, priv->message);
@@ -153,8 +153,8 @@ tpl_text_event_set_property (GObject *object,
       case PROP_MESSAGE_TYPE:
         priv->message_type = g_value_get_uint (value);
         break;
-      case PROP_ORIGINAL_TIMESTAMP:
-        priv->original_timestamp = g_value_get_uint64 (value);
+      case PROP_EDIT_TIMESTAMP:
+        priv->edit_timestamp = g_value_get_uint64 (value);
         break;
       case PROP_MESSAGE:
         g_assert (priv->message == NULL);
@@ -207,12 +207,12 @@ static void tpl_text_event_class_init (TplTextEventClass *klass)
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_MESSAGE_TYPE, param_spec);
 
-  param_spec = g_param_spec_uint64 ("original-timestamp",
-      "Original Message Timestamp",
-      "original-message-{sent,received} if applicable, or 0.",
+  param_spec = g_param_spec_uint64 ("edit-timestamp",
+      "Timestamp of edit message",
+      "message-{sent,received} if this is an edit, or 0 otherwise.",
       0, G_MAXUINT64, 0,
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_ORIGINAL_TIMESTAMP,
+  g_object_class_install_property (object_class, PROP_EDIT_TIMESTAMP,
       param_spec);
 
   param_spec = g_param_spec_string ("message",
@@ -391,17 +391,17 @@ tpl_text_event_get_message_type (TplTextEvent *self)
 
 
 /**
- * tpl_text_event_get_original_timestamp
+ * tpl_text_event_get_edit_timestamp
  * @self: a #TplTextEvent
  *
- * Returns: the same value as the #TplTextEvent:original-timestamp property
+ * Returns: the same value as the #TplTextEvent:edit-timestamp property
  */
 guint64
-tpl_text_event_get_original_timestamp (TplTextEvent *self)
+tpl_text_event_get_edit_timestamp (TplTextEvent *self)
 {
   g_return_val_if_fail (TPL_IS_TEXT_EVENT (self), 0);
 
-  return self->priv->original_timestamp;
+  return self->priv->edit_timestamp;
 }
 
 
diff --git a/telepathy-logger/text-event.h b/telepathy-logger/text-event.h
index d77fcda..344fcef 100644
--- a/telepathy-logger/text-event.h
+++ b/telepathy-logger/text-event.h
@@ -40,7 +40,7 @@ typedef struct _TplTextEventPriv TplTextEventPriv;
 GType tpl_text_event_get_type (void);
 
 TpChannelTextMessageType tpl_text_event_get_message_type (TplTextEvent *self);
-guint64 tpl_text_event_get_original_timestamp (TplTextEvent *self);
+guint64 tpl_text_event_get_edit_timestamp (TplTextEvent *self);
 
 const gchar *tpl_text_event_get_message (TplTextEvent *self);
 const gchar *tpl_text_event_get_message_token (TplTextEvent *self);