diff options
author | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-07-29 16:32:09 +0800 |
---|---|---|
committer | Marco Barisione <marco.barisione@collabora.co.uk> | 2013-08-20 18:03:05 +0800 |
commit | 59d0c113fdf2e565f512c98334a1808cfd216fa9 (patch) | |
tree | 6298463ab4aa96a3ad12448387e4e0edc97089df /libempathy/empathy-ft-handler.c | |
parent | 1f633bf20747995395b1dcc7001e0c9502104eda (diff) | |
download | gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.gz gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.bz2 gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.lz gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.xz gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.tar.zst gsoc2013-empathy-59d0c113fdf2e565f512c98334a1808cfd216fa9.zip |
time: move from Empathy to tp-account-widgets
https://bugzilla.gnome.org/show_bug.cgi?id=699492
Diffstat (limited to 'libempathy/empathy-ft-handler.c')
-rw-r--r-- | libempathy/empathy-ft-handler.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 96c8e47f5..049489c4e 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -25,8 +25,8 @@ #include "empathy-ft-handler.h" #include <glib/gi18n-lib.h> +#include <tp-account-widgets/tpaw-time.h> -#include "empathy-time.h" #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_FT @@ -643,7 +643,7 @@ update_remaining_time_and_speed (EmpathyFTHandler *handler, last_transferred_bytes = priv->transferred_bytes; priv->transferred_bytes = transferred_bytes; - current_time = empathy_time_get_current (); + current_time = tpaw_time_get_current (); elapsed_time = current_time - priv->last_update_time; if (elapsed_time >= 1) @@ -672,7 +672,7 @@ ft_transfer_transferred_bytes_cb (TpFileTransferChannel *channel, if (priv->transferred_bytes == 0) { - priv->last_update_time = empathy_time_get_current (); + priv->last_update_time = tpaw_time_get_current (); g_signal_emit (handler, signals[TRANSFER_STARTED], 0, channel); } |