]> spindle.queued.net Git - midori/commitdiff
Guess MIME type (content type) if not known
authorChristian Dywan <christian@twotoasts.de>
Sun, 20 May 2012 16:12:15 +0000 (18:12 +0200)
committerChristian Dywan <christian@twotoasts.de>
Sun, 20 May 2012 16:12:15 +0000 (18:12 +0200)
midori/midori-view.c

index 9561be772f378f2d6c897a7aed309c6c0c021052..882da8dca3d5f3411799bdc47941198c36c41e39 100644 (file)
@@ -2947,11 +2947,10 @@ webkit_web_view_download_requested_cb (GtkWidget*      web_view,
     mime_type = g_object_get_data(G_OBJECT (view), "download-mime-type");
     content_type = g_content_type_from_mime_type (mime_type);
     if (!content_type)
-    #ifdef G_OS_WIN32
-        content_type = g_content_type_get_mime_type ("*");
-    #else
-        content_type = g_strdup ("application/octet-stream");
-    #endif
+        content_type = g_content_type_guess (
+            webkit_download_get_suggested_filename (download), NULL, 0, NULL);
+    if (!content_type)
+        content_type = g_content_type_from_mime_type ("application/octet-stream");
     description = g_content_type_get_description (content_type);
     #if GTK_CHECK_VERSION (2, 14, 0)
     icon = g_content_type_get_icon (content_type);