EmpFileTransferStateChangeReason state_change_reason;
guint64 size;
guint64 transferred_bytes;
- gint64 start_time;
+ time_t start_time;
gchar *unix_socket_path;
gchar *content_hash;
EmpFileHashType content_hash_type;
tp_file_destroy_cb (file_channel, tp_file);
}
-static gint64
-get_time_msec (void)
-{
- GTimeVal tv;
-
- g_get_current_time (&tv);
- return ((gint64) tv.tv_sec) * 1000 + tv.tv_usec / 1000;
-}
-
static gint
_get_local_socket (EmpathyTpFile *tp_file)
{
tp_file->priv->filename, tp_file->priv->state, state, reason);
if (state == EMP_FILE_TRANSFER_STATE_OPEN)
- tp_file->priv->start_time = get_time_msec ();
+ tp_file->priv->start_time = empathy_time_get_current ();
DEBUG ("state = %u, incoming = %s, in_stream = %s, out_stream = %s",
state, tp_file->priv->incoming ? "yes" : "no",
gint
empathy_tp_file_get_remaining_time (EmpathyTpFile *tp_file)
{
- gint64 curr_time, elapsed_time;
+ time_t curr_time, elapsed_time;
gdouble time_per_byte;
gdouble remaining_time;
if (tp_file->priv->transferred_bytes == tp_file->priv->size)
return 0;
- curr_time = get_time_msec ();
+ curr_time = empathy_time_get_current ();
elapsed_time = curr_time - tp_file->priv->start_time;
time_per_byte = (gdouble) elapsed_time /
(gdouble) tp_file->priv->transferred_bytes;
- remaining_time = (time_per_byte * (tp_file->priv->size -
- tp_file->priv->transferred_bytes)) / 1000;
+ remaining_time = time_per_byte * (tp_file->priv->size -
+ tp_file->priv->transferred_bytes);
return (gint) (remaining_time + 0.5);
}