[Commits] [SCM] claws branch, master, updated. 3.14.1-40-gb3d90c5

[wwp at claws-mail.org]

The branch, master has been updated
       via  b3d90c51d0d06b22cef9f65e25e77ee9b133ab7b (commit)
      from  c0c22eb997bc5183cf8c9a3c57cac6bd540a013e (commit)

Summary of changes:
 src/compose.c      |   20 ++++++++++----------
 src/prefs_common.c |    4 ++--
 src/prefs_common.h |    4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)


- Log -----------------------------------------------------------------
commit b3d90c51d0d06b22cef9f65e25e77ee9b133ab7b
Author: wwp <wwp at free.fr>
Date:   Mon Dec 12 14:24:14 2016 +0100

    Rename default_to_(bg)color hiddeng pref and variable to default_header_(bg)color.

diff --git a/src/compose.c b/src/compose.c
index dd95cc6..8b99b76 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -183,14 +183,14 @@ typedef enum {
 #define COMPOSE_DRAFT_TIMEOUT_UNSET -1
 #define COMPOSE_DRAFT_TIMEOUT_FORBIDDEN -2
 
-static GdkColor default_to_bgcolor = {
+static GdkColor default_header_bgcolor = {
 	(gulong)0,
 	(gushort)0,
 	(gushort)0,
 	(gushort)0
 };
 
-static GdkColor default_to_color = {
+static GdkColor default_header_color = {
 	(gulong)0,
 	(gushort)0,
 	(gushort)0,
@@ -2686,10 +2686,10 @@ static void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
 		    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
 				gtk_widget_modify_base(
 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
-					GTK_STATE_NORMAL, &default_to_bgcolor);
+					GTK_STATE_NORMAL, &default_header_bgcolor);
 				gtk_widget_modify_text(
 					GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
-					GTK_STATE_NORMAL, &default_to_color);
+					GTK_STATE_NORMAL, &default_header_color);
 		}
 	}
 }
@@ -8100,10 +8100,10 @@ static Compose *compose_create(PrefsAccount *account,
 		gtk_widget_show(window);
 	}
 	
-	gtkut_convert_int_to_gdk_color(prefs_common.default_to_bgcolor,
-					   &default_to_bgcolor);
-	gtkut_convert_int_to_gdk_color(prefs_common.default_to_color,
-					   &default_to_color);
+	gtkut_convert_int_to_gdk_color(prefs_common.default_header_bgcolor,
+					   &default_header_bgcolor);
+	gtkut_convert_int_to_gdk_color(prefs_common.default_header_color,
+					   &default_header_color);
 
 	return compose;
 }
@@ -8160,10 +8160,10 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 			if (cur_account != compose->account) {
 				gtk_widget_modify_base(
 					GTK_WIDGET(from_name),
-					GTK_STATE_NORMAL, &default_to_bgcolor);
+					GTK_STATE_NORMAL, &default_header_bgcolor);
 				gtk_widget_modify_text(
 					GTK_WIDGET(from_name),
-					GTK_STATE_NORMAL, &default_to_color);
+					GTK_STATE_NORMAL, &default_header_color);
 			}
 		}
 		COMBOBOX_ADD(menu, name, ac->account_id);
diff --git a/src/prefs_common.c b/src/prefs_common.c
index 63e1816..ea276b0 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -726,9 +726,9 @@ static PrefParam param[] = {
 	{"recycle_quote_colors", "FALSE", &prefs_common.recycle_quote_colors,
 	 P_BOOL, NULL, NULL, NULL},
 
-	{"default_to_color", "#000000", &prefs_common.default_to_color, P_COLOR,
+	{"default_header_color", "#000000", &prefs_common.default_header_color, P_COLOR,
 	 NULL, NULL, NULL},
-	{"default_to_bgcolor", "#f5f6be", &prefs_common.default_to_bgcolor, P_COLOR,
+	{"default_header_bgcolor", "#f5f6be", &prefs_common.default_header_bgcolor, P_COLOR,
 	 NULL, NULL, NULL},
 	{"tags_color", "#000000", &prefs_common.tags_color, P_COLOR,
 	 NULL, NULL, NULL},
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 58df319..45db9c6 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -328,8 +328,8 @@ struct _PrefsCommon
 	gulong signature_col;
 	gulong emphasis_col;
 	gboolean recycle_quote_colors;
-	gulong default_to_bgcolor;
-	gulong default_to_color;
+	gulong default_header_bgcolor;
+	gulong default_header_color;
 	gulong tags_bgcolor;
 	gulong tags_color;
 	gulong qs_active_bgcolor;

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail