2013-03-15 [colin] 3.9.0cvs128

	* src/plugins/fancy/fancy_viewer.c
		Fix default fonts on Windows

diff --git a/ChangeLog b/ChangeLog
index e7249f5b678beb86de5be4807ca5f85137f5e893..4e1fe42a8221618d42f9cc31524b2dcc4db26d59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-15 [colin]     3.9.0cvs128
+
+       * src/plugins/fancy/fancy_viewer.c
+               Fix default fonts on Windows
+
 2013-03-15 [colin]     3.9.0cvs127
 
        * src/plugins/address_keeper/version.rc

diff --git a/PATCHSETS b/PATCHSETS
index 7b806725c11edce29f81800ac53186ac7cdb2e8f..55db6f8ead01054d1033c34cdd3dffc52c972e5a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4625,3 +4625,4 @@
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/fancy/fancy_viewer.c;  ) > 3.9.0cvs125.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/fancy/fancy_viewer.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/vcal_folder.c;  ) > 3.9.0cvs126.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/address_keeper/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/attachwarner/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/att_remover/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bsfilter/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fancy/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fetchinfo/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/mailmbox/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/version.rc;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpcore/version.rc;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpinline/version.rc;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/rssyl/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/smime/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/tnef_parse/version.rc;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/version.rc;  ) > 3.9.0cvs127.patchset
+( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/fancy/fancy_viewer.c;  ) > 3.9.0cvs128.patchset

diff --git a/configure.ac b/configure.ac
index d161ab095c04100d10a32ff6061a7e6f4e969b0c..2669bdc6907ed3495fd05b180997699c1bc8ac66 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=127
+EXTRA_VERSION=128
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/fancy/fancy_viewer.c b/src/plugins/fancy/fancy_viewer.c
index 7581f82f40151497af6da2e000efd5c2dc00c001..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);
 }