aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorAndrew Sobala <aes@gnome.org>2003-03-15 00:49:05 +0800
committerAndrew Sobala <aes@src.gnome.org>2003-03-15 00:49:05 +0800
commit8957dd77876ac9b26a39d93f7d2f87dc5c88f095 (patch)
treebb134546974688a1da1cbf8cd5c03978689765e0 /embed
parent8680bdc0594de8ced25f5b648e817ea789475ffe (diff)
downloadgsoc2013-epiphany-8957dd77876ac9b26a39d93f7d2f87dc5c88f095.tar
gsoc2013-epiphany-8957dd77876ac9b26a39d93f7d2f87dc5c88f095.tar.gz
gsoc2013-epiphany-8957dd77876ac9b26a39d93f7d2f87dc5c88f095.tar.bz2
gsoc2013-epiphany-8957dd77876ac9b26a39d93f7d2f87dc5c88f095.tar.lz
gsoc2013-epiphany-8957dd77876ac9b26a39d93f7d2f87dc5c88f095.tar.xz
gsoc2013-epiphany-8957dd77876ac9b26a39d93f7d2f87dc5c88f095.tar.zst
gsoc2013-epiphany-8957dd77876ac9b26a39d93f7d2f87dc5c88f095.zip
revert to revision 1.2 to fix crash, per Marco's advice. Fixes: 108198.
2003-03-14 Andrew Sobala <aes@gnome.org> * embed/mozilla/ProgressListener.cpp: revert to revision 1.2 to fix crash, per Marco's advice. Fixes: 108198.
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/ProgressListener.cpp32
1 files changed, 11 insertions, 21 deletions
diff --git a/embed/mozilla/ProgressListener.cpp b/embed/mozilla/ProgressListener.cpp
index bfd6c7d7d..039e9af40 100644
--- a/embed/mozilla/ProgressListener.cpp
+++ b/embed/mozilla/ProgressListener.cpp
@@ -64,11 +64,7 @@ GProgressListener::GProgressListener () : mLauncher(nsnull),
GProgressListener::~GProgressListener ()
{
- if (mDownloaderView)
- {
- g_object_remove_weak_pointer (G_OBJECT (mDownloaderView),
- (void **) &mDownloaderView);
- }
+ /* destructor code */
}
NS_METHOD GProgressListener::InitForPersist (nsIWebBrowserPersist *aPersist,
@@ -153,7 +149,7 @@ NS_METHOD GProgressListener::PrivateInit (void)
mElapsed = now - mStartTime;
- if (!mNoDialog && mDownloaderView)
+ if (!mNoDialog)
{
gchar *filename, *source, *dest;
nsAutoString uTmp;
@@ -183,9 +179,6 @@ NS_METHOD GProgressListener::PrivateInit (void)
G_CALLBACK (download_resume_cb),
this);
mDownloaderView = dv;
-
- g_object_add_weak_pointer (G_OBJECT (mDownloaderView),
- (void **) &mDownloaderView);
}
/* done */
@@ -520,18 +513,15 @@ NS_IMETHODIMP GProgressListener::
/currentRate +.5);
}
- if (mDownloaderView)
- {
- downloader_view_set_download_progress (mDownloaderView,
- mElapsed,
- remaining,
- speed,
- totalKBytes,
- currentKBytes,
- progress,
- mCanPause,
- (gpointer)this);
- }
+ downloader_view_set_download_progress (mDownloaderView,
+ mElapsed,
+ remaining,
+ speed,
+ totalKBytes,
+ currentKBytes,
+ progress,
+ mCanPause,
+ (gpointer)this);
/* done */
return NS_OK;