diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-20 15:49:52 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-04-20 15:49:52 +0800 |
| commit | bdea54f59e52ebeaa0743674aa5998636f26a241 (patch) | |
| tree | a1d5920da73c6737225bfa31b594cb4dd00f59c0 /libempathy/empathy-ft-handler.c | |
| parent | 9d9cfc021b05fe9afbe8769d6e0c289cf1dc9734 (diff) | |
| parent | eb6ab4328849a0c5ee5959560f90f36fd71a815d (diff) | |
| download | gsoc2013-empathy-bdea54f59e52ebeaa0743674aa5998636f26a241.tar gsoc2013-empathy-bdea54f59e52ebeaa0743674aa5998636f26a241.tar.gz gsoc2013-empathy-bdea54f59e52ebeaa0743674aa5998636f26a241.tar.bz2 gsoc2013-empathy-bdea54f59e52ebeaa0743674aa5998636f26a241.tar.lz gsoc2013-empathy-bdea54f59e52ebeaa0743674aa5998636f26a241.tar.xz gsoc2013-empathy-bdea54f59e52ebeaa0743674aa5998636f26a241.tar.zst gsoc2013-empathy-bdea54f59e52ebeaa0743674aa5998636f26a241.zip | |
Merge branch 'timestamp-648188'
Diffstat (limited to 'libempathy/empathy-ft-handler.c')
| -rw-r--r-- | libempathy/empathy-ft-handler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 1c3f4209e..a1ca07d8b 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -141,7 +141,7 @@ typedef struct { /* time and speed */ gdouble speed; guint remaining_time; - time_t last_update_time; + gint64 last_update_time; gboolean is_completed; } EmpathyFTHandlerPriv; @@ -652,7 +652,7 @@ update_remaining_time_and_speed (EmpathyFTHandler *handler, guint64 transferred_bytes) { EmpathyFTHandlerPriv *priv = GET_PRIV (handler); - time_t elapsed_time, current_time; + gint64 elapsed_time, current_time; guint64 transferred, last_transferred_bytes; gdouble speed; gint remaining_time; |