Don't apply MIME hooks on downloaded files

5 files changed, 17 insertions, 9 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index 9cdd627e..f4d770ab 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -494,6 +494,10 @@ void deinit_GmRequest(iGmRequest *d) {
     delete_Mutex(d->mtx);
 }
 
+void enableFilters_GmRequest(iGmRequest *d, iBool enable) {
+    d->isFilterEnabled = enable;
+}
+
 void setUrl_GmRequest(iGmRequest *d, const iString *url) {
     set_String(&d->url, urlFragmentStripped_String(url));
     /* Encode hostname to Punycode here because we want to submit the Punycode domain name
diff --git a/src/gmrequest.h b/src/gmrequest.h
index bd340cf1..6d4eb2f8 100644
--- a/src/gmrequest.h
+++ b/src/gmrequest.h
@@ -64,6 +64,7 @@ iDeclareNotifyFunc(GmRequest, Finished)
 iDeclareAudienceGetter(GmRequest, updated)
 iDeclareAudienceGetter(GmRequest, finished)
 
+void                enableFilters_GmRequest     (iGmRequest *, iBool enable);
 void                setUrl_GmRequest            (iGmRequest *, const iString *url);
 void                submit_GmRequest            (iGmRequest *);
 void                cancel_GmRequest            (iGmRequest *);
diff --git a/src/media.c b/src/media.c
index 000214b2..b329ec03 100644
--- a/src/media.c
+++ b/src/media.c
@@ -475,11 +475,13 @@ static void finished_MediaRequest_(iAnyObject *obj) {
     postCommandf_App("media.finished link:%u request:%p", d->linkId, d);
 }
 
-void init_MediaRequest(iMediaRequest *d, iDocumentWidget *doc, unsigned int linkId, const iString *url) {
+void init_MediaRequest(iMediaRequest *d, iDocumentWidget *doc, unsigned int linkId,
+                       const iString *url, iBool enableFilters) {
     d->doc    = doc;
     d->linkId = linkId;
     d->req    = new_GmRequest(certs_App());
     setUrl_GmRequest(d->req, url);
+    enableFilters_GmRequest(d->req, enableFilters);
     iConnect(GmRequest, d->req, updated, d, updated_MediaRequest_);
     iConnect(GmRequest, d->req, finished, d, finished_MediaRequest_);
     submit_GmRequest(d->req);
@@ -492,6 +494,7 @@ void deinit_MediaRequest(iMediaRequest *d) {
 }
 
 iDefineObjectConstructionArgs(MediaRequest,
-                              (iDocumentWidget *doc, unsigned int linkId, const iString *url),
-                              doc, linkId, url)
+                              (iDocumentWidget *doc, unsigned int linkId, const iString *url,
+                               iBool enableFilters),
+                              doc, linkId, url, enableFilters)
 iDefineClass(MediaRequest)
diff --git a/src/media.h b/src/media.h
index ece60630..7cc941d0 100644
--- a/src/media.h
+++ b/src/media.h
@@ -80,4 +80,4 @@ struct Impl_MediaRequest {
 };
 
 iDeclareObjectConstructionArgs(MediaRequest, iDocumentWidget *doc, unsigned int linkId,
-                               const iString *url)
+                               const iString *url, iBool enableFilters)
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6f47a26e..c953e0f3 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1308,10 +1308,10 @@ static iMediaRequest *findMediaRequest_DocumentWidget_(const iDocumentWidget *d,
     return NULL;
 }
 
-static iBool requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId) {
+static iBool requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId, iBool enableFilters) {
     if (!findMediaRequest_DocumentWidget_(d, linkId)) {
         const iString *mediaUrl = absoluteUrl_String(d->mod.url, linkUrl_GmDocument(d->doc, linkId));
-        pushBack_ObjectList(d->media, iClob(new_MediaRequest(d, linkId, mediaUrl)));
+        pushBack_ObjectList(d->media, iClob(new_MediaRequest(d, linkId, mediaUrl, enableFilters)));
         invalidate_DocumentWidget_(d);
         return iTrue;
     }
@@ -1410,7 +1410,7 @@ static iBool fetchNextUnfetchedImage_DocumentWidget_(iDocumentWidget *d) {
             if (isMediaLink_GmDocument(d->doc, run->linkId) &&
                 linkFlags & imageFileExtension_GmLinkFlag &&
                 ~linkFlags & content_GmLinkFlag && ~linkFlags & permanent_GmLinkFlag ) {
-                if (requestMedia_DocumentWidget_(d, run->linkId)) {
+                if (requestMedia_DocumentWidget_(d, run->linkId, iTrue)) {
                     return iTrue;
                 }
             }
@@ -1685,7 +1685,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             const iGmLinkId linkId = d->contextLink->linkId;
             setDownloadUrl_Media(
                 media_GmDocument(d->doc), linkId, linkUrl_GmDocument(d->doc, linkId));
-            requestMedia_DocumentWidget_(d, linkId);
+            requestMedia_DocumentWidget_(d, linkId, iFalse /* no filters */);
             redoLayout_GmDocument(d->doc); /* inline downloader becomes visible */
             updateVisible_DocumentWidget_(d);
             invalidate_DocumentWidget_(d);
@@ -2583,7 +2583,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                further to do. */
                             return iTrue;
                         }
-                        if (!requestMedia_DocumentWidget_(d, linkId)) {
+                        if (!requestMedia_DocumentWidget_(d, linkId, iTrue)) {
                             if (linkFlags & content_GmLinkFlag) {
                                 /* Dismiss shown content on click. */
                                 setData_Media(media_GmDocument(d->doc),