Keep a ref for downloads in the view.

2004-03-01  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/downloader-view.c: (downloader_view_add_download),
        (downloader_view_remove_download):

        Keep a ref for downloads in the view.

        * embed/mozilla/ContentHandler.cpp:
        * embed/mozilla/ContentHandler.h:

        Ensure the download directory exist.

        * embed/mozilla/MozDownload.cpp:
        * embed/mozilla/mozilla-download.cpp:
        * embed/mozilla/mozilla-download.h:

        Use a property to store MozDownload in the
        wrapper. The wrapper now keep a reference
        on the c++ implementation, that way references
        will be correctly propagated (unreffing the
        GObject will unref the c++ object).

        (Bug 135755)

1 files changed, 9 insertions, 4 deletions

diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 188169a47..f2877ce9b 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -128,9 +128,9 @@ MozDownload::Init(nsIURI *aSource, nsILocalFile *aTarget, const PRUnichar *aDisp
 		DownloaderView *dview;
 		dview = EPHY_DOWNLOADER_VIEW
 			(ephy_embed_shell_get_downloader_view (embed_shell));
-		mEphyDownload = mozilla_download_new ();
-		MOZILLA_DOWNLOAD (mEphyDownload)->moz_download = this;
+		mEphyDownload = mozilla_download_new (this);
 		downloader_view_add_download (dview, mEphyDownload);
+		g_object_unref (mEphyDownload);
 	}
 	else
 	{
@@ -558,10 +558,14 @@ GetFilePath (const char *filename)
 
 	if (g_utf8_collate (download_dir, "Downloads") == 0)
 	{
+		const char *default_dir;
+
 		g_free (download_dir);
 
-		return g_build_filename (ephy_file_downloads_dir (),
-					 filename, NULL);
+		default_dir = ephy_file_downloads_dir ();
+		ephy_ensure_dir_exists (default_dir);
+
+		return g_build_filename (default_dir, filename, NULL);
 	}
 
 	converted_dp = g_filename_from_utf8 (download_dir, -1, NULL, NULL, NULL);
@@ -570,6 +574,7 @@ GetFilePath (const char *filename)
 	if (converted_dp)
 	{
 		expanded = gnome_vfs_expand_initial_tilde (converted_dp);
+		ephy_ensure_dir_exists (expanded);
 		path = g_build_filename (expanded, filename, NULL);
 
 		g_free (expanded);