summary refs log tree commit diff stats
path: root/src/common/xchat.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/xchat.h')
-rw-r--r--src/common/xchat.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/common/xchat.h b/src/common/xchat.h
index ad95256d..2acf927c 100644
--- a/src/common/xchat.h
+++ b/src/common/xchat.h
@@ -104,13 +104,25 @@ struct nbexec
 
 struct hexchatprefs
 {
+	/* these are the rebranded, consistent, sorted hexchat variables */
+	char hex_away_reason[256];
+
+	int hex_away_size_max;
+	int hex_away_timeout;
+
+	unsigned int hex_away_auto_unmark;
+	unsigned int hex_away_omit_alerts;
+	unsigned int hex_away_show_message;
+	unsigned int hex_away_show_once;
+	unsigned int hex_away_track;
+
+	/* these are the legacy variables */
 	char nick1[NICKLEN];
 	char nick2[NICKLEN];
 	char nick3[NICKLEN];
 	char realname[127];
 	char username[127];
 	char nick_suffix[4];			/* Only ever holds a one-character string. */
-	char awayreason[256];
 	char quitreason[256];
 	char partreason[256];
 	char font_normal[4 * FONTNAMELEN + 1];
@@ -150,9 +162,6 @@ struct hexchatprefs
 	int tint_green;
 	int tint_blue;
 
-	int away_timeout;
-	int away_size_max;
-
 	int gui_pane_left_size;
 	int gui_pane_right_size;
 	int gui_pane_right_size_min;
@@ -264,11 +273,6 @@ struct hexchatprefs
 	unsigned int hidever;
 	unsigned int ip_from_server;
 	unsigned int raw_modes;
-	unsigned int show_away_once;
-	unsigned int show_away_message;
-	unsigned int auto_unmark_away;
-	unsigned int away_track;
-	unsigned int away_omit_alerts;
 	unsigned int userhost;
 	unsigned int irc_whois_front;
 	unsigned int use_server_tab;