aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/downloader-view.c22
-rw-r--r--embed/ephy-download.c12
-rw-r--r--embed/ephy-download.h6
-rw-r--r--embed/mozilla/mozilla-download.cpp2
4 files changed, 21 insertions, 21 deletions
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 83ae90e09..4b518a39a 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -245,16 +245,17 @@ downloader_view_new (void)
}
static char *
-format_interval (long interval)
+format_interval (gint64 interval)
{
- int secs, hours, mins;
- secs = (int)(interval + .5);
- hours = secs / 3600;
- secs -= hours * 3600;
- mins = secs / 60;
- secs -= mins * 60;
-
- if (hours)
+ int hours, mins, secs;
+
+ hours = (int) interval / 3600;
+ interval -= hours * 3600;
+ mins = (int) interval / 60;
+ interval -= mins * 60;
+ secs = (int) interval;
+
+ if (hours > 0)
{
return g_strdup_printf (_("%u:%02u.%02u"), hours, mins, secs);
}
@@ -321,8 +322,7 @@ update_download_row (DownloaderView *dv, EphyDownload *download)
GtkTreePath *path;
GtkTreeIter iter;
EphyDownloadState state;
- long remaining_secs = 0;
- gint64 total, current;
+ gint64 remaining_secs = 0, total, current;
char *remaining, *file, *cur_progress, *name;
struct tm;
int percent = 0;
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index cece472a5..a04d70eb6 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -41,8 +41,8 @@ enum
struct _EphyDownloadPrivate
{
- long remaining_time_last_update;
- long remaining_time;
+ gint64 remaining_time_last_update;
+ gint64 remaining_time;
};
static GObjectClass *parent_class = NULL;
@@ -140,7 +140,7 @@ ephy_download_get_name (EphyDownload *download)
static void
update_remaining_time (EphyDownload *download)
{
- long elapsed_time, total, cur;
+ gint64 elapsed_time, total, cur;
total = ephy_download_get_total_progress (download);
cur = ephy_download_get_current_progress (download);
@@ -155,10 +155,10 @@ update_remaining_time (EphyDownload *download)
}
}
-long
+gint64
ephy_download_get_remaining_time (EphyDownload *download)
{
- long elapsed_time;
+ gint64 elapsed_time;
elapsed_time = ephy_download_get_elapsed_time (download);
if (elapsed_time - download->priv->remaining_time_last_update >=
@@ -206,7 +206,7 @@ ephy_download_get_percent (EphyDownload *download)
return klass->get_percent (download);
}
-long
+gint64
ephy_download_get_elapsed_time (EphyDownload *download)
{
EphyDownloadClass *klass = EPHY_DOWNLOAD_GET_CLASS (download);
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index 4a3473e2b..d64fd50c6 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -64,7 +64,7 @@ struct _EphyDownloadClass
int (* get_percent) (EphyDownload *download);
gint64 (* get_current_progress) (EphyDownload *download);
gint64 (* get_total_progress) (EphyDownload *download);
- long (* get_elapsed_time) (EphyDownload *download);
+ gint64 (* get_elapsed_time) (EphyDownload *download);
void (* cancel) (EphyDownload *download);
void (* pause) (EphyDownload *download);
void (* resume) (EphyDownload *download);
@@ -96,9 +96,9 @@ gint64 ephy_download_get_current_progress (EphyDownload *download);
gint64 ephy_download_get_total_progress (EphyDownload *download);
-long ephy_download_get_elapsed_time (EphyDownload *download);
+gint64 ephy_download_get_elapsed_time (EphyDownload *download);
-long ephy_download_get_remaining_time (EphyDownload *download);
+gint64 ephy_download_get_remaining_time (EphyDownload *download);
void ephy_download_cancel (EphyDownload *download);
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index bf69e5e43..6d0c5121b 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -162,7 +162,7 @@ impl_get_percent (EphyDownload *download)
return percent;
}
-static long
+static gint64
impl_get_elapsed_time (EphyDownload *download)
{
MozDownload *mozDownload;