aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2003-04-19 19:00:56 +0800
committerXan Lopez <xan@src.gnome.org>2003-04-19 19:00:56 +0800
commit50ff5e50420a75f627344b7d8bad2451e9fb714a (patch)
tree00d38eeed83b75daf4ad7bff614173b07c5ddbd9
parente527da5ea75e15dba79b88a95619e378f14e9043 (diff)
downloadgsoc2013-epiphany-50ff5e50420a75f627344b7d8bad2451e9fb714a.tar
gsoc2013-epiphany-50ff5e50420a75f627344b7d8bad2451e9fb714a.tar.gz
gsoc2013-epiphany-50ff5e50420a75f627344b7d8bad2451e9fb714a.tar.bz2
gsoc2013-epiphany-50ff5e50420a75f627344b7d8bad2451e9fb714a.tar.lz
gsoc2013-epiphany-50ff5e50420a75f627344b7d8bad2451e9fb714a.tar.xz
gsoc2013-epiphany-50ff5e50420a75f627344b7d8bad2451e9fb714a.tar.zst
gsoc2013-epiphany-50ff5e50420a75f627344b7d8bad2451e9fb714a.zip
Assume Pause/Resume is available for every channel, "fixes" resume for
Assume Pause/Resume is available for every channel, "fixes" resume for HTTP among others. Drop some useless code.
-rw-r--r--ChangeLog13
-rw-r--r--embed/downloader-view.c11
-rw-r--r--embed/downloader-view.h1
-rw-r--r--embed/mozilla/ProgressListener.cpp19
-rw-r--r--embed/mozilla/ProgressListener.h2
5 files changed, 18 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index aa425f8bf..848680401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-04-19 Xan Lopez <xan@masilla.org>
+
+ * embed/downloader-view.c: (controls_info_foreach),
+ (downloader_view_update_controls),
+ (downloader_view_set_download_info),
+ (downloader_view_set_download_progress):
+ * embed/downloader-view.h:
+ * embed/mozilla/ProgressListener.cpp:
+ * embed/mozilla/ProgressListener.h:
+
+ Assume Pause/Resume is available for every channel, "fixes" resume for
+ HTTP among others. Drop some useless code.
+
2003-04-19 Marco Pesenti Gritti <marco@it.gnome.org>
* embed/mozilla/FilePicker.cpp:
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 1230b76f2..3c8abe873 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -82,7 +82,6 @@ typedef struct
gint size_total;
gint size_done;
gfloat progress;
- gboolean can_pause;
gchar *filename;
gchar *source;
gchar *dest;
@@ -94,7 +93,6 @@ typedef struct
typedef struct
{
gboolean can_resume;
- gboolean can_pause;
gboolean can_abort;
gboolean can_open;
DownloaderViewPrivate *priv;
@@ -330,7 +328,6 @@ controls_info_foreach (GtkTreeModel *model,
details = g_hash_table_lookup (info->priv->details_hash,
persist_object);
- info->can_pause |= details->can_pause;
info->can_resume |= (details->status == DOWNLOAD_STATUS_PAUSED);
info->can_abort |= (details->status != DOWNLOAD_STATUS_COMPLETED);
info->can_open |= (details->status == DOWNLOAD_STATUS_COMPLETED);
@@ -348,8 +345,7 @@ downloader_view_update_controls (DownloaderViewPrivate *priv)
info->priv = priv;
/* initial conditions */
- info->can_pause = info->can_resume = info->can_abort
- = info->can_open = FALSE;
+ info->can_resume = info->can_abort = info->can_open = FALSE;
if (selection)
{
@@ -360,7 +356,7 @@ downloader_view_update_controls (DownloaderViewPrivate *priv)
}
/* setup buttons */
- gtk_widget_set_sensitive (priv->pause_button, info->can_pause);
+ gtk_widget_set_sensitive (priv->pause_button, TRUE);
gtk_widget_set_sensitive (priv->resume_button, info->can_resume);
gtk_widget_set_sensitive (priv->abort_button, info->can_abort);
gtk_widget_set_sensitive (priv->open_button, info->can_open);
@@ -519,6 +515,7 @@ downloader_view_set_download_info (DownloaderViewPrivate *priv,
_("00.00") :
_("Unknown"));
}
+
gtk_list_store_set (GTK_LIST_STORE (priv->model),
iter,
COL_REMAINING, buffer,
@@ -644,7 +641,6 @@ downloader_view_set_download_progress (DownloaderView *dv,
gint size_total,
gint size_done,
gfloat progress,
- gboolean can_pause,
gpointer persist_object)
{
DownloadDetails *details;
@@ -659,7 +655,6 @@ downloader_view_set_download_progress (DownloaderView *dv,
details->speed = speed;
details->size_total = size_total;
details->size_done = size_done;
- details->can_pause = can_pause;
details->progress = progress;
gtk_tree_model_get_iter (GTK_TREE_MODEL (dv->priv->model),
diff --git a/embed/downloader-view.h b/embed/downloader-view.h
index a01d5f30d..a90b9f0bd 100644
--- a/embed/downloader-view.h
+++ b/embed/downloader-view.h
@@ -90,7 +90,6 @@ void downloader_view_set_download_progress (DownloaderView *dv,
gint size_total,
gint size_done,
gfloat progress,
- gboolean can_pause,
gpointer persist_object);
#ifdef __cplusplus
diff --git a/embed/mozilla/ProgressListener.cpp b/embed/mozilla/ProgressListener.cpp
index 43a0acd06..643764982 100644
--- a/embed/mozilla/ProgressListener.cpp
+++ b/embed/mozilla/ProgressListener.cpp
@@ -31,8 +31,6 @@
#include <libgnome/gnome-i18n.h>
#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsIFTPChannel.h"
#include "nsIMIMEInfo.h"
#include "nsCOMPtr.h"
@@ -134,8 +132,6 @@ NS_METHOD GProgressListener::PrivateInit (void)
mPriorKRate = 0;
mRateChanges = 0;
mRateChangeLimit = 2; /* only update rate every second */
- mCheckedCanPause = PR_FALSE;
- mCanPause = PR_FALSE;
mIsPaused = PR_FALSE;
mAbort = PR_FALSE;
PRInt64 now = PR_Now ();
@@ -423,16 +419,6 @@ NS_IMETHODIMP GProgressListener::
if (mNoDialog) return NS_OK;
- if (!mCheckedCanPause)
- {
- mCheckedCanPause = PR_TRUE;
-
- nsresult rv;
- nsCOMPtr<nsIFTPChannel> channel =
- do_QueryInterface (aRequest, &rv);
-
- mCanPause = (NS_SUCCEEDED (rv) ? PR_TRUE : PR_FALSE);
- }
mRequest = aRequest;
PRInt64 now = PR_Now ();
@@ -518,7 +504,6 @@ NS_IMETHODIMP GProgressListener::
totalKBytes,
currentKBytes,
progress,
- mCanPause,
(gpointer)this);
/* done */
@@ -607,7 +592,7 @@ nsresult GProgressListener::Pause (void)
{
nsresult rv;
- if (mCanPause && !mIsPaused)
+ if (!mIsPaused)
{
rv = mRequest->Suspend ();
if (NS_SUCCEEDED (rv))
@@ -627,7 +612,7 @@ nsresult GProgressListener::Resume (void)
{
nsresult rv;
- if (mCanPause && mIsPaused)
+ if (mIsPaused)
{
rv = mRequest->Resume ();
if (NS_SUCCEEDED (rv))
diff --git a/embed/mozilla/ProgressListener.h b/embed/mozilla/ProgressListener.h
index 459643194..7d5ba62b0 100644
--- a/embed/mozilla/ProgressListener.h
+++ b/embed/mozilla/ProgressListener.h
@@ -112,8 +112,6 @@ class GProgressListener : public nsIProgressDialog,
PRInt32 mRateChanges;
PRInt32 mRateChangeLimit;
- PRBool mCheckedCanPause;
- PRBool mCanPause;
PRBool mIsPaused;
gboolean mNoDialog;
PRBool mAbort;