[Commits] [SCM] claws branch, master, updated. 3.14.1-168-g2e9cc8c

[mones at claws-mail.org]

The branch, master has been updated
       via  2e9cc8cca6feaf242908e90a417e26d950e592f9 (commit)
      from  8e02f3f3c6b091009410b081d40d187e76fe45aa (commit)

Summary of changes:
 src/prefs_common.c |   14 +-------------
 src/prefs_common.h |   11 ++---------
 2 files changed, 3 insertions(+), 22 deletions(-)


- Log -----------------------------------------------------------------
commit 2e9cc8cca6feaf242908e90a417e26d950e592f9
Author: Ricardo Mones <ricardo at mones.org>
Date:   Tue Jan 31 20:02:51 2017 +0100

    Remove obsolete font prefs

diff --git a/src/prefs_common.c b/src/prefs_common.c
index b0def0d..7be13c4 100644
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -319,19 +319,7 @@ static PrefParam param[] = {
 	 NULL, NULL, NULL},
 
 	/* Display */
-	/* Obsolete fonts. For coexisting with Gtk+-1.2 version */
-	{"widget_font",		NULL,
-	  &prefs_common.widgetfont_gtk1,	P_STRING, NULL, NULL, NULL},
-	{"message_font",	"-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*",
-	 &prefs_common.textfont_gtk1,		P_STRING, NULL, NULL, NULL},
-	{"small_font",		"-*-helvetica-medium-r-normal--10-*-*-*-*-*-*-*",
-	  &prefs_common.smallfont_gtk1,		P_STRING, NULL, NULL, NULL},
-	{"bold_font",		"-*-helvetica-bold-r-normal--12-*-*-*-*-*-*-*",
-	  &prefs_common.boldfont_gtk1,		P_STRING, NULL, NULL, NULL},
-	{"normal_font",		"-*-helvetica-medium-r-normal--12-*-*-*-*-*-*-*",
-	  &prefs_common.normalfont_gtk1,	P_STRING, NULL, NULL, NULL},
-
-	/* new fonts */
+	/* fonts */
 #ifndef GENERIC_UMPC
 	{"widget_font_gtk2",	NULL,
 	  &SPECIFIC_PREFS.widgetfont,		P_STRING, NULL, NULL, NULL},
diff --git a/src/prefs_common.h b/src/prefs_common.h
index 505d4dc..467ecdd 100644
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -194,16 +194,9 @@ struct _PrefsCommon
 	gboolean recheck_when_changing_dict;
 	gboolean use_alternate;
 	gboolean use_both_dicts;
-        
+
 	/* Display */
-	/* obsolete fonts */
-	gchar *widgetfont_gtk1;
-	gchar *textfont_gtk1;
-	gchar *normalfont_gtk1;
-	gchar *boldfont_gtk1;
-	gchar *smallfont_gtk1;
-
-	/* new fonts */
+	/* fonts */
 	gchar *widgetfont;
 	gchar *textfont;
 	gchar *printfont;

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


hooks/post-receive
-- 
Claws Mail