2013-03-15 [colin] 3.9.0cvs128

[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 7d531593f91f87bfe9e0eb07407cbefa089914ce..2bd9d0bf4cf307891331eac239401644314449ed 100644 (file)
--- a/src/plugins/fancy/fancy_viewer.c
+++ b/src/plugins/fancy/fancy_viewer.c
@@ -85,15 +85,20 @@ static GtkWidget *fancy_get_widget(MimeViewer *_viewer)
 
 static void fancy_apply_prefs(FancyViewer *viewer)
 {
-       g_object_set(viewer->settings, "auto-load-images",
-               viewer->override_prefs_images, NULL);
-       g_object_set(viewer->settings, "enable-scripts",
-               viewer->override_prefs_scripts, NULL);
-       g_object_set(viewer->settings, "enable-plugins",
-               viewer->override_prefs_plugins, NULL);
-       g_object_set(viewer->settings, "enable-java-applet",
-               viewer->override_prefs_java, NULL);
-
+       g_object_set(viewer->settings,
+               "auto-load-images", viewer->override_prefs_images,
+               "enable-scripts", viewer->override_prefs_scripts,
+               "enable-plugins", viewer->override_prefs_plugins,
+               "enable-java-applet", viewer->override_prefs_java,
+#ifdef G_OS_WIN32
+               "default-font-family", "Arial",
+               "cursive-font-family", "Comic Sans MS",
+               "fantasy-font-family", "Comic Sans MS",
+               "monospace-font-family", "Courier New",
+               "sans-serif-font-family", "Arial",
+               "serif-font-family", "Times New Roman",
+#endif
+               NULL); 
        webkit_web_view_set_settings(viewer->view, viewer->settings);
 }
 
@@ -372,8 +377,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;
@@ -413,7 +419,7 @@ static void resource_request_starting_cb(WebKitWebView              *view,
                                if ((err = procmime_get_part(filename, partinfo)) < 0)
                                        alertpanel_error(_("Couldn't save the part of multipart message: %s"),
                                                                                strerror(-err));
-                               gchar *file_uri = g_strconcat("file://", filename, NULL);
+                               gchar *file_uri = g_filename_to_uri(filename, NULL, NULL);
                                webkit_network_request_set_uri(request, file_uri);
                                g_free(file_uri);
                                g_free(filename);
@@ -427,10 +433,15 @@ static void resource_request_starting_cb(WebKitWebView            *view,
        uri = webkit_network_request_get_uri(request);
        if (!viewer->override_prefs_remote_content
            && strncmp(uri, "file://", 7)) {
+#ifndef G_OS_WIN32
                debug_print("Preventing load of %s\n", uri);
+#endif
                webkit_network_request_set_uri(request, "about:blank");
-       } else
+       }
+#ifndef G_OS_WIN32
+       else
                debug_print("Starting request of %s\n", uri);
+#endif
 }
 
 static gboolean fancy_text_search(MimeViewer *_viewer, gboolean backward,