summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Laban <david.laban@collabora.co.uk>2011-05-26 17:29:15 -0400
committerDavid Laban <david.laban@collabora.co.uk>2011-05-26 18:21:57 -0400
commit3be72c50d72fed93198146fa9060d9b0616f6090 (patch)
tree762db0f0df556fcb7910e4027805e5f44cef3429
parent8f7b395881cffcb2935aae9c2b70b601b482c18a (diff)
downloadtelepathy-logger-3be72c50d72fed93198146fa9060d9b0616f6090.tar.gz
Use gint64 for timestamps (not guint64)
-rw-r--r--telepathy-logger/log-store-xml.c10
-rw-r--r--telepathy-logger/text-channel.c10
-rw-r--r--telepathy-logger/text-event.c12
-rw-r--r--telepathy-logger/text-event.h2
4 files changed, 17 insertions, 17 deletions
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index fdf5fa0..c727aef 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -367,7 +367,7 @@ log_store_xml_get_file_suffix (GType type)
static gchar *
log_store_xml_get_timestamp_filename (GType type,
- guint64 timestamp)
+ gint64 timestamp)
{
gchar *date_str;
gchar *filename;
@@ -386,7 +386,7 @@ log_store_xml_get_timestamp_filename (GType type,
static gchar *
-log_store_xml_format_timestamp (guint64 timestamp)
+log_store_xml_format_timestamp (gint64 timestamp)
{
GDateTime *ts;
gchar *ts_str;
@@ -412,7 +412,7 @@ log_store_xml_get_filename (TplLogStoreXml *self,
TpAccount *account,
TplEntity *target,
GType type,
- guint64 timestamp)
+ gint64 timestamp)
{
gchar *id_dir;
gchar *timestamp_str;
@@ -438,7 +438,7 @@ _log_store_xml_write_to_store (TplLogStoreXml *self,
TplEntity *target,
const gchar *event,
GType type,
- guint64 timestamp,
+ gint64 timestamp,
GError **error)
{
FILE *file;
@@ -503,7 +503,7 @@ add_text_event (TplLogStoreXml *self,
GError **error)
{
gboolean ret = FALSE;
- guint64 timestamp;
+ gint64 timestamp;
TpDBusDaemon *bus_daemon;
TpAccount *account;
TplEntity *sender;
diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c
index d500f69..2eba427 100644
--- a/telepathy-logger/text-channel.c
+++ b/telepathy-logger/text-channel.c
@@ -307,7 +307,7 @@ get_message_pending_id (TpMessage *m)
}
-static guint64
+static gint64
get_original_message_timestamp (TpMessage *message)
{
gint64 timestamp;
@@ -323,11 +323,11 @@ get_original_message_timestamp (TpMessage *message)
}
-static guint64
+static gint64
get_network_timestamp (TpMessage *message)
{
GDateTime *datetime = g_date_time_new_now_utc ();
- guint64 now = g_date_time_to_unix (datetime);
+ gint64 now = g_date_time_to_unix (datetime);
gint64 timestamp;
timestamp = tp_message_get_sent_timestamp (message);
@@ -352,7 +352,7 @@ get_network_timestamp (TpMessage *message)
}
-static guint64
+static gint64
get_message_edit_timestamp (TpMessage *message)
{
if (tp_message_get_supersedes (message) != NULL)
@@ -362,7 +362,7 @@ get_message_edit_timestamp (TpMessage *message)
}
-static guint64
+static gint64
get_message_timestamp (TpMessage *message)
{
gint64 timestamp;
diff --git a/telepathy-logger/text-event.c b/telepathy-logger/text-event.c
index 6f647df..bbbaca9 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 edit_timestamp;
+ gint64 edit_timestamp;
gchar *message;
gchar *token;
gchar *supersedes_token;
@@ -123,7 +123,7 @@ tpl_text_event_get_property (GObject *object,
g_value_set_uint (value, priv->message_type);
break;
case PROP_EDIT_TIMESTAMP:
- g_value_set_uint64 (value, priv->edit_timestamp);
+ g_value_set_int64 (value, priv->edit_timestamp);
break;
case PROP_MESSAGE:
g_value_set_string (value, priv->message);
@@ -154,7 +154,7 @@ tpl_text_event_set_property (GObject *object,
priv->message_type = g_value_get_uint (value);
break;
case PROP_EDIT_TIMESTAMP:
- priv->edit_timestamp = g_value_get_uint64 (value);
+ priv->edit_timestamp = g_value_get_int64 (value);
break;
case PROP_MESSAGE:
g_assert (priv->message == NULL);
@@ -207,10 +207,10 @@ 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 ("edit-timestamp",
+ param_spec = g_param_spec_int64 ("edit-timestamp",
"Timestamp of edit message",
"message-{sent,received} if this is an edit, or 0 otherwise.",
- 0, G_MAXUINT64, 0,
+ G_MININT64, G_MAXINT64, 0,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
g_object_class_install_property (object_class, PROP_EDIT_TIMESTAMP,
param_spec);
@@ -396,7 +396,7 @@ tpl_text_event_get_message_type (TplTextEvent *self)
*
* Returns: the same value as the #TplTextEvent:edit-timestamp property
*/
-guint64
+gint64
tpl_text_event_get_edit_timestamp (TplTextEvent *self)
{
g_return_val_if_fail (TPL_IS_TEXT_EVENT (self), 0);
diff --git a/telepathy-logger/text-event.h b/telepathy-logger/text-event.h
index 344fcef..f765507 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_edit_timestamp (TplTextEvent *self);
+gint64 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);