summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-02-24 13:31:44 +1100
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-02-24 14:08:22 +1100
commit32e152fb296897e7da3faace99da11ac43abd215 (patch)
tree0b6522bacf7433eef2e9dc7f90d7a0e7cc37d73f
parentded2c843879c5f41b06c4cdce7da8bd630ebcee8 (diff)
downloadtelepathy-logger-32e152fb296897e7da3faace99da11ac43abd215.tar.gz
Don't pass time_t to g_object_new when property is guint64
Causes an offset of 4 bytes on 32-bit systems.
-rw-r--r--telepathy-logger/event.c8
-rw-r--r--telepathy-logger/log-store-pidgin.c2
-rw-r--r--telepathy-logger/log-store-xml.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/telepathy-logger/event.c b/telepathy-logger/event.c
index 64298d7..6861202 100644
--- a/telepathy-logger/event.c
+++ b/telepathy-logger/event.c
@@ -110,7 +110,7 @@ tpl_event_get_property (GObject *object,
switch (param_id)
{
case PROP_TIMESTAMP:
- g_value_set_uint64 (value, priv->timestamp);
+ g_value_set_int64 (value, priv->timestamp);
break;
case PROP_LOG_ID:
g_value_set_string (value, priv->log_id);
@@ -149,7 +149,7 @@ tpl_event_set_property (GObject *object,
switch (param_id) {
case PROP_TIMESTAMP:
g_assert (priv->timestamp == 0);
- priv->timestamp = g_value_get_uint64 (value);
+ priv->timestamp = g_value_get_int64 (value);
break;
case PROP_LOG_ID:
g_assert (priv->log_id == NULL);
@@ -205,10 +205,10 @@ tpl_event_class_init (TplEventClass *klass)
klass->equal = tpl_event_equal_default;
- param_spec = g_param_spec_uint64 ("timestamp",
+ param_spec = g_param_spec_int64 ("timestamp",
"Timestamp",
"The timestamp (gint64) for the log event",
- 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_TIMESTAMP, param_spec);
diff --git a/telepathy-logger/log-store-pidgin.c b/telepathy-logger/log-store-pidgin.c
index 8784690..766f724 100644
--- a/telepathy-logger/log-store-pidgin.c
+++ b/telepathy-logger/log-store-pidgin.c
@@ -770,7 +770,7 @@ log_store_pidgin_get_events_for_files (TplLogStore *self,
gchar *instead_of_channel_path = NULL;
int j = i + 1;
gboolean is_user = FALSE;
- time_t timestamp;
+ gint64 timestamp;
if (is_html)
{
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index 63ff104..6d3d312 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -842,7 +842,7 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
TplEntity *sender;
TplEntity *receiver;
gchar *time_str;
- time_t timestamp;
+ gint64 timestamp;
gchar *sender_id;
gchar *sender_name;
gchar *sender_avatar_token;