From 517249bbe18ddbe4ffda9db19a7d8e6caa466a8d Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Mon, 6 Aug 2007 21:19:29 +0000 Subject: [PATCH] 2007-08-06 [wwp] 2.10.0cvs96 * src/prefs_common.c * src/prefs_common.h * src/textview.c Allow changing the emphasis color used to highlight the newsreader/x-mailer header value when it matches our preferred mail agent (hidden pref 'emphasis_col' added to clawsrc). --- ChangeLog | 10 ++++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_common.c | 2 ++ src/prefs_common.h | 1 + src/textview.c | 6 +++--- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2d32304b6..665ec83c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-08-06 [wwp] 2.10.0cvs96 + + * src/prefs_common.c + * src/prefs_common.h + * src/textview.c + Allow changing the emphasis color used to highlight + the newsreader/x-mailer header value when it matches + our preferred mail agent (hidden pref 'emphasis_col' added + to clawsrc). + 2007-08-06 [colin] 2.10.0cvs95 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 4de991c60..7e6d75b18 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2749,3 +2749,4 @@ ( cvs diff -u -r 1.105.2.105 -r 1.105.2.106 src/prefs_account.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/combobox.c; ) > 2.10.0cvs93.patchset ( cvs diff -u -r 1.1.2.75 -r 1.1.2.76 src/gtk/quicksearch.c; ) > 2.10.0cvs94.patchset ( cvs diff -u -r 1.382.2.399 -r 1.382.2.400 src/compose.c; cvs diff -u -r 1.50.2.40 -r 1.50.2.41 src/compose.h; ) > 2.10.0cvs95.patchset +( cvs diff -u -r 1.204.2.144 -r 1.204.2.145 src/prefs_common.c; cvs diff -u -r 1.103.2.90 -r 1.103.2.91 src/prefs_common.h; cvs diff -u -r 1.96.2.180 -r 1.96.2.181 src/textview.c; ) > 2.10.0cvs96.patchset diff --git a/configure.ac b/configure.ac index 8a14ba843..48e57dcec 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=10 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=95 +EXTRA_VERSION=96 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_common.c b/src/prefs_common.c index 8da548e91..9a740ec78 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -670,6 +670,8 @@ static PrefParam param[] = { NULL, NULL, NULL}, {"uri_color", "32512", &prefs_common.uri_col, P_COLOR, NULL, NULL, NULL}, + {"emphasis_color", "207", &prefs_common.emphasis_col, P_COLOR, + NULL, NULL, NULL}, {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR, NULL, NULL, NULL}, {"signature_color", "7960953", &prefs_common.signature_col, P_COLOR, diff --git a/src/prefs_common.h b/src/prefs_common.h index 864c52df2..19fb536eb 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -294,6 +294,7 @@ struct _PrefsCommon gulong uri_col; gulong tgt_folder_col; gulong signature_col; + gulong emphasis_col; gboolean recycle_quote_colors; gboolean display_header_pane; gboolean display_header; diff --git a/src/textview.c b/src/textview.c index 04eef2365..de774ac42 100644 --- a/src/textview.c +++ b/src/textview.c @@ -99,7 +99,7 @@ static GdkColor emphasis_color = { (gulong)0, (gushort)0, (gushort)0, - (gushort)0xcfff + (gushort)0 }; static GdkCursor *hand_cursor = NULL; @@ -495,7 +495,6 @@ void textview_init(TextView *textview) static void textview_update_message_colors(TextView *textview) { GdkColor black = {0, 0, 0, 0}; - GdkColor colored_emphasis = {0, 0, 0, 0xcfff}; GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text)); GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); @@ -517,7 +516,8 @@ static void textview_update_message_colors(TextView *textview) &uri_color); gtkut_convert_int_to_gdk_color(prefs_common.signature_col, &signature_color); - emphasis_color = colored_emphasis; + gtkut_convert_int_to_gdk_color(prefs_common.emphasis_col, + &emphasis_color); } if (prefs_common.enable_color && prefs_common.enable_bgcolor) { gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_bgcol, -- 2.25.1