diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | embed/mozilla/ProgressListener.cpp | 32 |
2 files changed, 17 insertions, 21 deletions
@@ -1,3 +1,9 @@ +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. + 2003-03-13 Iain <iain@prettypeople.org> * lib/widgets/ephy-spinner.c (ephy_spinner_expose): Use gdk_draw_pixbuf 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; |