RSSyl: Allow use of .netrc by libcurl. Bug/enhancement #3309, by Vincent Pelletier

[claws.git] / src / plugins / fancy / fancy_viewer.c

diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 2bd9d0bf4cf307891331eac239401644314449ed..80317c6efd67a670aa00e00b2d9b28a52f50bba4 100644 (file)
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -1,8 +1,8 @@
 /*
  * Claws Mail -- A GTK+ based, lightweight, and fast e-mail client
  * == Fancy Plugin ==
- * Copyright(C) 1999-2013 the Claws Mail Team
- * This file Copyright (C) 2009-2013 Salvatore De Paolis
+ * Copyright(C) 1999-2014 the Claws Mail Team
+ * This file Copyright (C) 2009-2014 Salvatore De Paolis
  * <iwkse@claws-mail.org> and the Claws Mail Team
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -90,6 +90,8 @@ static void fancy_apply_prefs(FancyViewer *viewer)
                "enable-scripts", viewer->override_prefs_scripts,
                "enable-plugins", viewer->override_prefs_plugins,
                "enable-java-applet", viewer->override_prefs_java,
+               "enable-dns-prefetching", viewer->override_prefs_remote_content,
+               "user-stylesheet-uri", viewer->override_stylesheet,
 #ifdef G_OS_WIN32
                "default-font-family", "Arial",
                "cursive-font-family", "Comic Sans MS",
@@ -98,7 +100,7 @@ static void fancy_apply_prefs(FancyViewer *viewer)
                "sans-serif-font-family", "Arial",
                "serif-font-family", "Times New Roman",
 #endif
-               NULL); 
+               NULL);
        webkit_web_view_set_settings(viewer->view, viewer->settings);
 }
 
@@ -145,6 +147,7 @@ static void fancy_set_defaults(FancyViewer *viewer)
        viewer->override_prefs_scripts = fancy_prefs.enable_scripts;
        viewer->override_prefs_plugins = fancy_prefs.enable_plugins;
        viewer->override_prefs_java = fancy_prefs.enable_java;
+       viewer->override_stylesheet = g_strconcat("file://", fancy_prefs.stylesheet, NULL);
 
        g_signal_handlers_block_by_func(G_OBJECT(viewer->enable_images),
                fancy_auto_load_images_activated, viewer);
@@ -211,7 +214,11 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
                                        : NULL;
        MimeInfo *partinfo = viewer->to_load;
 
-       messageview->updating = TRUE;
+       if (messageview) {
+               messageview->updating = TRUE;
+               NoticeView *noticeview = messageview->noticeview;
+               noticeview_hide(noticeview);
+       }
 
        if (viewer->filename != NULL) {
                g_unlink(viewer->filename);
@@ -219,10 +226,6 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
                viewer->filename = NULL;
        }
 
-       if (messageview) {
-               NoticeView *noticeview = messageview->noticeview;
-               noticeview_hide(noticeview);
-       }
        if (partinfo)
                viewer->filename = procmime_get_tmp_file_name(partinfo);
        debug_print("filename: %s\n", viewer->filename);
@@ -235,8 +238,7 @@ static gboolean fancy_show_mimepart_real(MimeViewer *_viewer)
        }
        else {
                const gchar *charset = NULL;
-               if (_viewer && _viewer->mimeview &&
-                       _viewer->mimeview->messageview->forced_charset)
+               if (messageview && messageview->forced_charset)
                        charset = _viewer->mimeview->messageview->forced_charset;
                else
                        charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
@@ -377,9 +379,9 @@ navigation_requested_cb(WebKitWebView *view, WebKitWebFrame *frame,
                                                WebKitNetworkRequest *netreq, FancyViewer *viewer)
 {
        const gchar *uri = webkit_network_request_get_uri(netreq);
-#ifndef G_OS_WIN32
+
        debug_print("navigation requested to %s\n", uri);
-#endif
+
        if (!strncmp(uri, "mailto:", 7)) {
                compose_new(NULL, uri + 7, NULL);
                return WEBKIT_NAVIGATION_RESPONSE_IGNORE;
@@ -432,16 +434,12 @@ static void resource_request_starting_cb(WebKitWebView            *view,
        /* refresh URI that may have changed */
        uri = webkit_network_request_get_uri(request);
        if (!viewer->override_prefs_remote_content
-           && strncmp(uri, "file://", 7)) {
-#ifndef G_OS_WIN32
+           && strncmp(uri, "file://", 7) && strncmp(uri, "data:", 5)) {
                debug_print("Preventing load of %s\n", uri);
-#endif
                webkit_network_request_set_uri(request, "about:blank");
        }
-#ifndef G_OS_WIN32
        else
-               debug_print("Starting request of %s\n", uri);
-#endif
+               debug_print("Starting request of %zu %s\n", strlen(uri), uri);
 }
 
 static gboolean fancy_text_search(MimeViewer *_viewer, gboolean backward,
@@ -687,6 +685,11 @@ static void download_file_cb(GtkWidget *widget, FancyViewer *viewer)
 #endif
 }
 
+static void save_image_cb(GtkWidget *widget, FancyViewer *viewer)
+{
+       debug_print("Not Yet Implemented\n");
+}
+
 static void open_image_cb(GtkWidget *widget, FancyViewer *viewer)
 {
        debug_print("Not Yet Implemented\n");
@@ -771,7 +774,7 @@ static void viewer_menu_handler(GtkWidget *menuitem, FancyViewer *viewer)
 
                        GtkImageMenuItem *m_simage = GTK_IMAGE_MENU_ITEM(menuitem);
                        g_signal_connect(G_OBJECT(m_simage), "activate",
-                                        G_CALLBACK(download_file_cb),
+                                        G_CALLBACK(save_image_cb),
                                         (gpointer *) viewer);
                }
 
@@ -1013,7 +1016,10 @@ gint plugin_init(gchar **error)
        gchar *directory = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
                                "fancy", NULL);
        if (!is_dir_exist(directory))
-               make_dir (directory);
+               if (make_dir (directory) < 0) {
+                       g_free(directory);
+                       return -1;
+               }
        g_free(directory);
 
        fancy_prefs_init();
@@ -1040,7 +1046,7 @@ const gchar *plugin_desc(void)
 {
        return g_strdup_printf(_("This plugin renders HTML mail using the WebKit "
                               "%d.%d.%d library.\nBy default all remote content is "
-                              "blocked and images are not automatically loaded. Options "
+                              "blocked. Options "
                               "can be found in /Configuration/Preferences/Plugins/Fancy"),
                               WEBKIT_MAJOR_VERSION, WEBKIT_MINOR_VERSION,
                               WEBKIT_MICRO_VERSION);