From c42f8b98df530e6e7386772e6153618d5c8e5980 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Mon, 22 Oct 2012 08:51:54 +0200
Subject: [PATCH] Get rid of platform-specific settings (except for fast DCC),
 make migrations smoother

---
 src/common/cfgfiles.c | 16 ++--------------
 src/common/xchat.h    |  8 --------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index f9d9f0f6..3659e7c7 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -453,13 +453,9 @@ const struct prefs vars[] = {
 	{"gui_input_style", P_OFFINT (style_inputbox), TYPE_BOOL},
 	{"gui_join_dialog", P_OFFINT (gui_join_dialog), TYPE_BOOL},
 	{"gui_lagometer", P_OFFINT (lagometer), TYPE_INT},
-#ifdef WIN32
 	{"gui_lang", P_OFFINT (gui_lang), TYPE_INT},
-#endif
 	{"gui_mode_buttons", P_OFFINT (chanmodebuttons), TYPE_BOOL},
-#ifdef WIN32
 	{"gui_one_instance", P_OFFINT (gui_one_instance), TYPE_BOOL},
-#endif
 	{"gui_pane_left_size", P_OFFINT (gui_pane_left_size), TYPE_INT},
 	{"gui_pane_right_size", P_OFFINT (gui_pane_right_size), TYPE_INT},
 	{"gui_pane_right_size_min", P_OFFINT (gui_pane_right_size_min), TYPE_INT},
@@ -585,14 +581,9 @@ const struct prefs vars[] = {
 	{"text_autocopy_text", P_OFFINT (autocopy_text), TYPE_BOOL},
 	{"text_background", P_OFFSET (background), TYPE_STR},
 	{"text_color_nicks", P_OFFINT (colorednicks), TYPE_BOOL},
-#ifdef WIN32
-	{"text_emoticons", P_OFFINT (text_emoticons), TYPE_BOOL},
-#endif
 	{"text_font", P_OFFSET (font_normal), TYPE_STR},
-#ifdef WIN32
 	{"text_font_main", P_OFFSET (font_main), TYPE_STR},
 	{"text_font_alternative", P_OFFSET (font_alternative), TYPE_STR},
-#endif
 	{"text_indent", P_OFFINT (indent_nicks), TYPE_BOOL},
 	{"text_max_indent", P_OFFINT (max_auto_indent), TYPE_INT},
 	{"text_max_lines", P_OFFINT (max_lines), TYPE_INT},
@@ -679,15 +670,14 @@ load_config (void)
 	prefs.show_away_once = 1;
 	prefs.indent_nicks = 1;
 	prefs.thin_separator = 1;
-#ifdef WIN32
 	prefs.identd = 1;
-	prefs.gui_lang = 15;
-#else
+#ifndef WIN32
 	prefs.fastdccsend = 1;
 #endif
 	prefs.wordwrap = 1;
 	prefs.autodialog = 1;
 	prefs.gui_input_spell = 1;
+	prefs.gui_lang = 15;
 	prefs.autoreconnect = 1;
 	prefs.recon_delay = 10;
 	prefs.autocopy_text = 1;
@@ -792,10 +782,8 @@ load_config (void)
 	strcpy (prefs.quitreason, _("Leaving"));
 	strcpy (prefs.partreason, prefs.quitreason);
 	strcpy (prefs.font_normal, DEF_FONT);
-#ifdef WIN32
 	strcpy (prefs.font_main, DEF_FONT);
 	strcpy (prefs.font_alternative, DEF_FONT_ALTER);
-#endif
 	strcpy (prefs.dnsprogram, "host");
 	strcpy (prefs.irc_no_hilight, "NickServ,ChanServ,InfoServ,N,Q");
 
diff --git a/src/common/xchat.h b/src/common/xchat.h
index 473be3c1..230a9a10 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -113,13 +113,10 @@ struct xchatprefs
 	char awayreason[256];
 	char quitreason[256];
 	char partreason[256];
-#ifdef WIN32
 	char font_normal[4 * FONTNAMELEN + 1];
 	char font_main[FONTNAMELEN + 1];
 	char font_alternative[3 * FONTNAMELEN + 1];
-#else
 	char font_normal[FONTNAMELEN + 1];
-#endif
 	char doubleclickuser[256];
 	char spell_langs[64];
 	char sounddir[PATHLEN + 1];
@@ -184,9 +181,7 @@ struct xchatprefs
 	int completion_sort;
 	int gui_win_state;
 	int gui_url_mod;
-#ifdef WIN32
 	int gui_lang;
-#endif
 	int dialog_left;
 	int dialog_top;
 	int dialog_width;
@@ -314,11 +309,8 @@ struct xchatprefs
 	unsigned int wait_on_exit;
 	unsigned int confmode;
 	unsigned int utf8_locale;
-#ifdef WIN32
 	unsigned int identd;
-	unsigned int text_emoticons;
 	unsigned int gui_one_instance;
-#endif
 
 	unsigned int ctcp_number_limit;	/*flood */
 	unsigned int ctcp_time_limit;	/*seconds of floods */