aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2004-07-06 22:00:51 +0800
committerXan Lopez <xan@src.gnome.org>2004-07-06 22:00:51 +0800
commit3289f253a58dac56d91c0930005c0c37c2dec6c2 (patch)
tree569016aeb00921a4904839e9dea2d3c73821f811
parent9c1de34bccc36279aabfb0fb21cec9e6caf1d952 (diff)
downloadgsoc2013-epiphany-3289f253a58dac56d91c0930005c0c37c2dec6c2.tar
gsoc2013-epiphany-3289f253a58dac56d91c0930005c0c37c2dec6c2.tar.gz
gsoc2013-epiphany-3289f253a58dac56d91c0930005c0c37c2dec6c2.tar.bz2
gsoc2013-epiphany-3289f253a58dac56d91c0930005c0c37c2dec6c2.tar.lz
gsoc2013-epiphany-3289f253a58dac56d91c0930005c0c37c2dec6c2.tar.xz
gsoc2013-epiphany-3289f253a58dac56d91c0930005c0c37c2dec6c2.tar.zst
gsoc2013-epiphany-3289f253a58dac56d91c0930005c0c37c2dec6c2.zip
If the MIME is unknown, use application/octet-stream.
* embed/downloader-view.c: (downloader_view_add_download): * embed/mozilla/mozilla-download.cpp: If the MIME is unknown, use application/octet-stream.
-rw-r--r--ChangeLog7
-rw-r--r--embed/downloader-view.c1
-rw-r--r--embed/mozilla/mozilla-download.cpp2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 12fe87cfd..815485c58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-07-06 Xan Lopez <xan@gnome.org>
+
+ * embed/downloader-view.c: (downloader_view_add_download):
+ * embed/mozilla/mozilla-download.cpp:
+
+ If the MIME is unknown, use application/octet-stream.
+
2004-07-06 Christian Persch <chpe@cvs.gnome.org>
* Makefile.am:
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index cc1ebe29f..0029c0aca 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -484,7 +484,6 @@ downloader_view_add_download (DownloaderView *dv,
ephy_dialog_show (EPHY_DIALOG (dv));
mime = ephy_download_get_mime (download);
- if (mime == NULL) return;
theme = gtk_icon_theme_get_default ();
icon_name = gnome_icon_lookup (theme, NULL, NULL, NULL, NULL,
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 2997faa16..06bf43290 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -187,7 +187,7 @@ impl_get_mime (EphyDownload *download)
mozDownload = MOZILLA_DOWNLOAD (download)->priv->moz_download;
mozDownload->GetMIMEInfo (getter_AddRefs(mime));
- if (!mime) return NULL;
+ if (!mime) return g_strdup ("application/octet-stream");
#if MOZILLA_CHECK_VERSION4 (1, 8, MOZILLA_ALPHA, 1)
mime->GetMIMEType(mimeType);