diff options
author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-21 10:52:39 +0800 |
---|---|---|
committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-04-21 10:52:39 +0800 |
commit | 462c1b74848498594239e818270efbcc0cac5170 (patch) | |
tree | 06c4eb10110794905d012c82754412996501984e /libempathy-gtk/empathy-location-manager.c | |
parent | fd96433c558ca24e8db7397b69cbd600caa6b793 (diff) | |
parent | eaaf3c72dcb03ad0be08f53e7b621cdc279cf21e (diff) | |
download | gsoc2013-empathy-462c1b74848498594239e818270efbcc0cac5170.tar gsoc2013-empathy-462c1b74848498594239e818270efbcc0cac5170.tar.gz gsoc2013-empathy-462c1b74848498594239e818270efbcc0cac5170.tar.bz2 gsoc2013-empathy-462c1b74848498594239e818270efbcc0cac5170.tar.lz gsoc2013-empathy-462c1b74848498594239e818270efbcc0cac5170.tar.xz gsoc2013-empathy-462c1b74848498594239e818270efbcc0cac5170.tar.zst gsoc2013-empathy-462c1b74848498594239e818270efbcc0cac5170.zip |
Merge branch 'timestamp-rebase' into empathy-skype
Diffstat (limited to 'libempathy-gtk/empathy-location-manager.c')
-rw-r--r-- | libempathy-gtk/empathy-location-manager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 1c09c358c..8f64e325f 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -39,6 +39,7 @@ #include "libempathy/empathy-gsettings.h" #include "libempathy/empathy-location.h" #include "libempathy/empathy-utils.h" +#include "libempathy/empathy-time.h" #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION #include "libempathy/empathy-debug.h" @@ -322,16 +323,15 @@ static void update_timestamp (EmpathyLocationManager *self) { EmpathyLocationManagerPriv *priv= GET_PRIV (self); + gint64 timestamp; GValue *new_value; - gint64 stamp64; - time_t timestamp; - timestamp = time (NULL); - stamp64 = (gint64) timestamp; - new_value = tp_g_value_slice_new_int64 (stamp64); + timestamp = empathy_time_get_current (); + new_value = tp_g_value_slice_new_int64 (timestamp); g_hash_table_insert (priv->location, g_strdup (EMPATHY_LOCATION_TIMESTAMP), new_value); - DEBUG ("\t - Timestamp: %" G_GINT64_FORMAT, stamp64); + + DEBUG ("\t - Timestamp: %" G_GINT64_FORMAT, timestamp); } static void |