- WORKAROUND to display HTML for sylpheed.

4 files changed, 22 insertions, 2 deletions

diff --git a/src/dillo.cc b/src/dillo.cc
index 1e9c31a6..7e29ac32 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -124,6 +124,16 @@ int main(int argc, char **argv)
       DilloUrl *url = Dillo_make_start_url(argv[1]);
       a_UIcmd_open_urlstr(bw, URL_STR(url));
       a_Url_free(url);
+   } else if (argc == 6) {
+      // WORKAROUND: sylpheed execs "dillo -l -f -x XID URL"
+      if (strcmp(argv[1], "-l") == 0 && strcmp(argv[2], "-f") == 0 &&
+          strcmp(argv[3], "-x") == 0) {
+         a_UIcmd_set_images_enabled(bw, FALSE);
+         DilloUrl *url = Dillo_make_start_url(argv[5]);
+         a_Url_set_flags(url, URL_FLAGS(url) & URL_SpamSafe);
+         a_UIcmd_open_urlstr(bw, URL_STR(url));
+         a_Url_free(url);
+      }
    } else {
       /* Send startup screen */
       a_Nav_push(bw, prefs.start_page);
diff --git a/src/ui.hh b/src/ui.hh
index 0cd9ff50..7a302efd 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -96,7 +96,8 @@ public:
    void set_panelmode(UIPanelmode mode);
    UIPanelmode get_panelmode();
    void set_findbar_visibility(bool visible);
-   bool get_images_enabled() { return ImageLoad->state();}
+   bool images_enabled() { return ImageLoad->state();}
+   void images_enabled(int flag) { ImageLoad->state(flag);}
    Widget *fullscreen_button() { return FullScreen; }
    void fullscreen_toggle() { FullScreen->do_callback(); }
 
diff --git a/src/uicmd.cc b/src/uicmd.cc
index e56605bd..564e9957 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -881,7 +881,15 @@ void a_UIcmd_set_msg(BrowserWindow *bw, const char *format, ...)
  */
 bool_t a_UIcmd_get_images_enabled(BrowserWindow *bw)
 {
-   return BW2UI(bw)->get_images_enabled();
+   return BW2UI(bw)->images_enabled();
+}
+
+/*
+ * Enable/Disable automatic image loading.
+ */
+void a_UIcmd_set_images_enabled(BrowserWindow *bw, int flag)
+{
+   BW2UI(bw)->images_enabled(flag);
 }
 
 /*
diff --git a/src/uicmd.hh b/src/uicmd.hh
index 7115cbf0..02dbae8a 100644
--- a/src/uicmd.hh
+++ b/src/uicmd.hh
@@ -70,6 +70,7 @@ void a_UIcmd_set_bug_prog(BrowserWindow *bw, int n_bug);
 void a_UIcmd_set_page_title(BrowserWindow *bw, const char *label);
 void a_UIcmd_set_msg(BrowserWindow *bw, const char *format, ...);
 bool_t a_UIcmd_get_images_enabled(BrowserWindow *bw);
+void a_UIcmd_set_images_enabled(BrowserWindow *bw, int flag);
 void a_UIcmd_set_buttons_sens(BrowserWindow *bw);
 void a_UIcmd_fullscreen_toggle(BrowserWindow *bw);