2006-12-30 [colin] 2.6.1cvs90

	* src/prefs_compose_writing.c
	* src/prefs_quote.c
	* src/prefs_template.c
		Use message font for Writing and
		Quoting prefs, as well as Templates.

diff --git a/ChangeLog b/ChangeLog
index 2f612b31377d70bb1d3fec402267e888473e80c9..1e73c6238170d5d6137b20d25426128be18c49d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-30 [colin]     2.6.1cvs90
+
+       * src/prefs_compose_writing.c
+       * src/prefs_quote.c
+       * src/prefs_template.c
+               Use message font for Writing and 
+               Quoting prefs, as well as Templates.
+
 2006-12-30 [colin]     2.6.1cvs89
 
        * src/prefs_summaries.c

diff --git a/PATCHSETS b/PATCHSETS
index 7b9562d94e22e944dbb7f59bc02b33e8efa453e2..291da2cb02c37e11f1881c60c2803b9faf6c9fd4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2197,3 +2197,4 @@
 ( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/gtk/gtkaspell.c;  ) > 2.6.1cvs87.patchset
 ( cvs diff -u -r 1.52.2.31 -r 1.52.2.32 src/prefs_folder_item.c;  ) > 2.6.1cvs88.patchset
 ( cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/prefs_summaries.c;  ) > 2.6.1cvs89.patchset
+( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_quote.c;  cvs diff -u -r 1.12.2.37 -r 1.12.2.38 src/prefs_template.c;  ) > 2.6.1cvs90.patchset

diff --git a/configure.ac b/configure.ac
index b44d342cfce6e6a05d320b72c5b6fa9072fa65b5..44bba6dd48396e8d2e9d708202523cb46a5e34dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=89
+EXTRA_VERSION=90
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_compose_writing.c b/src/prefs_compose_writing.c
index 45d14b045614f3238bb2c6e49887da1195fbe355..79b211e0fabfce7c4a3e405e02edbe2b3943e82a 100644 (file)
--- a/src/prefs_compose_writing.c
+++ b/src/prefs_compose_writing.c
@@ -256,6 +256,16 @@ void prefs_compose_writing_create_widget(PrefsPage *_page, GtkWindow *window,
                (GTK_SCROLLED_WINDOW (scrolledwin_format), GTK_SHADOW_IN);
 
        text_format = gtk_text_view_new ();
+       if (prefs_common.textfont) {
+               PangoFontDescription *font_desc;
+
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.textfont);
+               if (font_desc) {
+                       gtk_widget_modify_font(text_format, font_desc);
+                       pango_font_description_free(font_desc);
+               }
+       }
        gtk_widget_show (text_format);
        gtk_container_add(GTK_CONTAINER(scrolledwin_format), text_format);
        gtk_text_view_set_editable (GTK_TEXT_VIEW (text_format), TRUE);

diff --git a/src/prefs_quote.c b/src/prefs_quote.c
index ef154264bab062aa34be65e4073019f69455d2c4..4113e99b1f6618793c1f0eaad23321c35d408f52 100644 (file)
--- a/src/prefs_quote.c
+++ b/src/prefs_quote.c
@@ -126,6 +126,16 @@ void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
                (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt), GTK_SHADOW_IN);
 
        text_quotefmt = gtk_text_view_new ();
+       if (prefs_common.textfont) {
+               PangoFontDescription *font_desc;
+
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.textfont);
+               if (font_desc) {
+                       gtk_widget_modify_font(text_quotefmt, font_desc);
+                       pango_font_description_free(font_desc);
+               }
+       }
        gtk_widget_show (text_quotefmt);
        gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt), text_quotefmt);
        gtk_text_view_set_editable (GTK_TEXT_VIEW (text_quotefmt), TRUE);
@@ -169,6 +179,16 @@ void prefs_quote_create_widget(PrefsPage *_page, GtkWindow *window,
                (GTK_SCROLLED_WINDOW (scrolledwin_quotefmt), GTK_SHADOW_IN);
 
        text_fw_quotefmt = gtk_text_view_new ();
+       if (prefs_common.textfont) {
+               PangoFontDescription *font_desc;
+
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.textfont);
+               if (font_desc) {
+                       gtk_widget_modify_font(text_fw_quotefmt, font_desc);
+                       pango_font_description_free(font_desc);
+               }
+       }
        gtk_widget_show (text_fw_quotefmt);
        gtk_container_add(GTK_CONTAINER(scrolledwin_quotefmt),
                          text_fw_quotefmt);

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 4a42c567b0ec051e90b02c32036c742c58686652..9e0a09fa5b9965df85a252a9c675feaeb01ce016 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -225,6 +225,16 @@ static void prefs_template_window_create(void)
        gtk_box_pack_start(GTK_BOX(vbox1), scroll2, TRUE, TRUE, 0);
 
        text_value = gtk_text_view_new();
+       if (prefs_common.textfont) {
+               PangoFontDescription *font_desc;
+
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.textfont);
+               if (font_desc) {
+                       gtk_widget_modify_font(text_value, font_desc);
+                       pango_font_description_free(font_desc);
+               }
+       }
        gtk_widget_show(text_value);
        gtk_widget_set_size_request(text_value, -1, 120);
        gtk_container_add(GTK_CONTAINER(scroll2), text_value);