Version bump

Fix "Fix URL Detection"

.gitignore

@@ -31,6 +31,7 @@ src/common/dbus/marshallers.h
 src/common/dbus/org.hexchat.service.service
 src/common/dbus/remote-object-glue.h
 src/fe-gtk/hexchat
+src/htm/thememan.exe
 stamp-h1
 *.a
 *.o

config.h

@@ -7,13 +7,13 @@
 #define USE_IPV6
 #define HAVE_ISO_CODES
 #define PACKAGE_NAME "hexchat"
-#define PACKAGE_VERSION "2.9.2"
+#define PACKAGE_VERSION "2.9.3"
 #define XCHAT_REVISION "1521"
 #define HEXCHATLIBDIR "."
 #define HEXCHATSHAREDIR "."
 #define OLD_PERL
 #define GETTEXT_PACKAGE "hexchat"
-#define PACKAGE_TARNAME "hexchat-2.9.2"
+#define PACKAGE_TARNAME "hexchat-2.9.3"
 #ifndef USE_IPV6
 #define socklen_t int
 #endif

configure.ac

@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([HexChat],[2.9.2],[http://www.hexchat.org/],[hexchat])
+AC_INIT([HexChat],[2.9.3],[http://www.hexchat.org/],[hexchat])
 
 AC_PREREQ([2.60])
 AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([configure.in])
+AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define])

plugins/checksum/Makefile.am

@@ -6,4 +6,4 @@ lib_LTLIBRARIES = checksum.la
 checksum_la_SOURCES = checksum.c
 checksum_la_LDFLAGS = -avoid-version -module 
 checksum_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..

plugins/doat/Makefile.am

@@ -6,5 +6,5 @@ lib_LTLIBRARIES = doat.la
 doat_la_SOURCES = doat.c
 doat_la_LDFLAGS = -avoid-version -module 
 doat_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..
 

plugins/fishlim/Makefile.am

@@ -6,4 +6,4 @@ lib_LTLIBRARIES = fishlim.la
 fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_xchat.c
 fishlim_la_LDFLAGS = -avoid-version -module 
 fishlim_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..

plugins/hextray/callbacks.cpp

@@ -152,7 +152,7 @@ int event_cb(char *word[], void *userdata)
 
 		/**************************************************************************************/
 		/***** Use windows instead of balloons, and if its a window should we keep it open ****/
-		/***** indefinately?															   ****/
+		/***** indefinitely?															   ****/
 		/**************************************************************************************/
 		szTemp = xchat_strip_color(szInfo);
 

plugins/hextray/resource.rc

@@ -122,7 +122,7 @@ BEGIN
                     WS_BORDER | WS_TABSTOP,137,74,61,13
     LTEXT           "Close all alerts hotkey:",IDC_ALERT_HOTKEY_TEXT,39,75,
                     76,10
-    CONTROL         "Leave alerts open indefinately",16,"Button",
+    CONTROL         "Leave alerts open indefinitely",16,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,27,88,115,11
     CONTROL         "Blink Icon to alert me about events",18,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,16,18,127,10

plugins/hextray/xtray.h

@@ -59,7 +59,7 @@ extern struct _xchat_plugin *ph;
 #define PREF_AMAE				13 // alert me about events
 #define PREF_OSBWM				14 // Only Show Balloon When Minimized
 #define PREF_UWIOB				15 // Use Window Instead of Balloon
-#define PREF_KAOI				16 // Keep alerts open indefinately
+#define PREF_KAOI				16 // Keep alerts open indefinitely
 #define PREF_MIOC				17 // Minimize instead of close
 #define PREF_BLINK				18 // blink icon
 #define PREF_CICO				19 // change icon - not implemented

plugins/mpcinfo/mpcinfo-xp.vcxproj

@@ -22,12 +22,14 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>WDK7</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>WDK7</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

plugins/perl/Makefile.am

@@ -12,7 +12,7 @@ perl_la_LDFLAGS = -avoid-version -module
 perl_la_LIBADD = $(PERL_LDFLAGS)
 BUILT_SOURCES = xchat.pm.h irc.pm.h
 #CFLAGS = @CFLAGS@ -Wno-unused
-INCLUDES = $(PERL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(PERL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
 CLEANFILES = xchat.pm.h irc.pm.h
 xchat.pm.h irc.pm.h: lib/Xchat.pm lib/Xchat/Embed.pm \
 	lib/Xchat/List/Network.pm lib/Xchat/List/Network/Entry.pm \

plugins/python/Makefile.am

@@ -6,5 +6,5 @@ lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c
 python_la_LDFLAGS = -avoid-version -module 
 python_la_LIBADD = $(PY_LIBS)
-INCLUDES = $(PY_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(PY_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
 

plugins/sasl/Makefile.am

@@ -6,5 +6,5 @@ lib_LTLIBRARIES = sasl.la
 sasl_la_SOURCES = sasl.c
 sasl_la_LDFLAGS = -avoid-version -module 
 sasl_la_LIBADD = 
-INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/..
 

plugins/tcl/Makefile.am

@@ -7,4 +7,4 @@ lib_LTLIBRARIES = tcl.la
 tcl_la_SOURCES = tclplugin.c
 tcl_la_LDFLAGS = -avoid-version -module 
 tcl_la_LIBADD = $(TCL_LIBS)
-INCLUDES = $(TCL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..
+AM_CPPFLAGS = $(TCL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/..

src/common/Makefile.am

@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libxchatcommon.a
 
-INCLUDES = $(COMMON_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS)
 
 EXTRA_DIST = \
 	cfgfiles.h \

src/common/cfgfiles.c

@@ -316,20 +316,18 @@ get_xdir_fs (void)
 {
 	if (!xdir_fs)
 	{
-		if (portable_mode ())
-		{
-			xdir_fs = ".\\config";
-		}
-		else
-		{
 			char out[256];
 
-			if (!get_reg_str ("Software\\Microsoft\\Windows\\CurrentVersion\\"
-					"Explorer\\Shell Folders", "AppData", out, sizeof (out)))
-				return "./config";
-			xdir_fs = g_strdup_printf ("%s\\" "HexChat", out);
-		}
+			if (portable_mode () || !get_reg_str ("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "AppData", out, sizeof (out)))
+			{
+				xdir_fs = ".\\config";
+			}
+			else
+			{
+				xdir_fs = g_strdup_printf ("%s\\" "HexChat", out);
+			}
 	}
+
 	return xdir_fs;
 }
 
@@ -393,10 +391,8 @@ default_file (void)
 /* Keep these sorted!! */
 
 const struct prefs vars[] = {
-	{"auto_save", P_OFFINT (autosave), TYPE_BOOL},
-	{"auto_save_url", P_OFFINT (autosave_url), TYPE_BOOL},
-
 	{"away_auto_unmark", P_OFFINT (auto_unmark_away), TYPE_BOOL},
+	{"away_omit_alerts", P_OFFINT (away_omit_alerts), TYPE_BOOL},
 	{"away_reason", P_OFFSET (awayreason), TYPE_STR},
 	{"away_show_message", P_OFFINT (show_away_message), TYPE_BOOL},
 	{"away_show_once", P_OFFINT (show_away_once), TYPE_BOOL},
@@ -498,7 +494,7 @@ const struct prefs vars[] = {
 	{"input_balloon_time", P_OFFINT (input_balloon_time), TYPE_INT},
 	{"input_beep_chans", P_OFFINT (input_beep_chans), TYPE_BOOL},
 	{"input_beep_hilight", P_OFFINT (input_beep_hilight), TYPE_BOOL},
-	{"input_beep_msg", P_OFFINT (input_beep_priv), TYPE_BOOL},
+	{"input_beep_priv", P_OFFINT (input_beep_priv), TYPE_BOOL},
 	{"input_command_char", P_OFFSET (cmdchar), TYPE_STR},
 	{"input_filter_beep", P_OFFINT (filterbeep), TYPE_BOOL},
 	{"input_flash_chans", P_OFFINT (input_flash_chans), TYPE_BOOL},
@@ -566,9 +562,7 @@ const struct prefs vars[] = {
 
 	{"tab_chans", P_OFFINT (tabchannels), TYPE_BOOL},
 	{"tab_dialogs", P_OFFINT (privmsgtab), TYPE_BOOL},
-#ifdef WIN32
 	{"tab_icons", P_OFFINT (tab_icons), TYPE_BOOL},
-#endif
 	{"tab_layout", P_OFFINT (tab_layout), TYPE_INT},
 	{"tab_new_to_front", P_OFFINT (newtabstofront), TYPE_INT},
 	{"tab_notices", P_OFFINT (notices_tabs), TYPE_BOOL},
@@ -617,6 +611,7 @@ const struct prefs vars[] = {
 
 	{"url_grabber", P_OFFINT (url_grabber), TYPE_BOOL},
 	{"url_grabber_limit", P_OFFINT (url_grabber_limit), TYPE_INT},
+	{"url_logging", P_OFFINT (url_logging), TYPE_BOOL},
 	{0, 0, 0},
 };
 
@@ -683,7 +678,6 @@ load_config (void)
 	prefs.fastdccsend = 1;
 #endif
 	prefs.wordwrap = 1;
-	prefs.autosave = 1;
 	prefs.autodialog = 1;
 	prefs.gui_input_spell = 1;
 	prefs.autoreconnect = 1;
@@ -694,12 +688,15 @@ load_config (void)
 	prefs.text_stripcolor_topic = 1;
 	prefs.tabchannels = 1;
 	prefs.tab_layout = 2;	/* 0=Tabs 1=Reserved 2=Tree */
+	prefs.tab_icons = 1;
 	prefs.tab_sort = 1;
 	prefs.paned_userlist = 1;
 	prefs.newtabstofront = 2;
 	prefs.use_server_tab = 1;
 	prefs.privmsgtab = 1;
-	/*prefs.style_inputbox = 1;*/
+	/* prefs.colorednicks = 1; */
+	prefs.style_inputbox = 1;
+	prefs.style_namelistgad = 1;
 	prefs.dccpermissions = 0600;
 	prefs.max_lines = 500;
 	prefs.mainwindow_width = 640;
@@ -734,7 +731,7 @@ load_config (void)
 	prefs.gui_chanlist_maxusers = 9999;
 	prefs.gui_chanlist_minusers = 5;
 	prefs.gui_tray = 1;
-	prefs.gui_pane_left_size = 100;
+	prefs.gui_pane_left_size = 128;		/* with treeview icons we need a bit bigger space */
 	prefs.gui_pane_right_size = 100;
 	prefs.gui_pane_right_size_min = 80;
 	prefs.mainwindow_save = 1;
@@ -768,11 +765,14 @@ load_config (void)
 	{
 		char out[256];
 
-		if (get_reg_str ("Software\\Microsoft\\Windows\\CurrentVersion\\"
-						 "Explorer\\Shell Folders", "Personal", out, sizeof (out)))
-			snprintf (prefs.dccdir, sizeof (prefs.dccdir), "%s\\Downloads", out);
+		if (portable_mode () || !get_reg_str ("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", "Personal", out, sizeof (out)))
+		{
+			snprintf (prefs.dccdir, sizeof (prefs.dccdir), "%s\\downloads", get_xdir_utf8 ());
+		}
 		else
-			snprintf (prefs.dccdir, sizeof (prefs.dccdir), "%s\\Downloads", get_xdir_utf8 ());
+		{
+			snprintf (prefs.dccdir, sizeof (prefs.dccdir), "%s\\Downloads", out);
+		}
 	}
 #else
 	snprintf (prefs.sounddir, sizeof (prefs.sounddir), "%s/sounds", get_xdir_utf8 ());
@@ -1142,7 +1142,7 @@ cmd_set (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	{
 		PrintText (sess, "No such variable.\n");
 	}
-	else if (prefs.autosave && !save_config ())
+	else if (!save_config ())
 	{
 		PrintText (sess, "Error saving changes to disk.\n");
 	}

src/common/dbus/Makefile.am

@@ -19,7 +19,7 @@ BUILT_SOURCES =				\
 
 CLEANFILES = $(BUILT_SOURCES)
 
-INCLUDES = $(COMMON_CFLAGS) $(DBUS_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS)
 
 noinst_PROGRAMS = example
 example_SOURCES = example.c 

src/common/identd.c

@@ -58,8 +58,8 @@ identd (char *username)
 
 	identd_is_running = FALSE;
 
-	snprintf (outbuf, sizeof (outbuf), "%%\tServicing ident request from %s\n",
-				 inet_ntoa (addr.sin_addr));
+	snprintf (outbuf, sizeof (outbuf), "%%\tServicing ident request from %s with user name \"%s\"\n",
+				 inet_ntoa (addr.sin_addr), username);
 	PrintText (current_sess, outbuf);
 
 	recv (read_sok, buf, sizeof (buf) - 1, 0);
@@ -139,7 +139,7 @@ identd_ipv6 (char *username)
 		snprintf (ipv6buf, sizeof (ipv6buf) - 1, "[SOCKET ERROR: 0x%X]", WSAGetLastError ());
 	}
 
-	snprintf (outbuf, sizeof (outbuf), "%%\tServicing ident request from %s\n", ipv6buf);
+	snprintf (outbuf, sizeof (outbuf), "%%\tServicing ident request from %s with user name \"%s\"\n", ipv6buf, username);
 	PrintText (current_sess, outbuf);
 
 	recv (read_sok, buf, sizeof (buf) - 1, 0);

src/common/outbound.c

@@ -258,6 +258,41 @@ cmd_addbutton (struct session *sess, char *tbuf, char *word[],
 	return FALSE;
 }
 
+/* ADDSERVER <networkname> <serveraddress>, add a new network and server to the network list */
+static int
+cmd_addserver (struct session *sess, char *tbuf, char *word[], char *word_eol[])
+{
+	ircnet *network;
+
+	/* do we have enough arguments given? */
+	if (*word[2] && *word_eol[3])
+	{
+		network = servlist_net_find (word[2], NULL, strcmp);
+
+		/* if the given network doesn't exist yet, add it */
+		if (!network)
+		{
+			network = servlist_net_add (word[2], "", TRUE);
+			network->encoding = strdup (IRC_DEFAULT_CHARSET);
+		}
+		/* if we had the network already, check if the given server already exists */
+		else if (servlist_server_find (network, word_eol[3], NULL))
+		{
+			PrintTextf (sess, _("Server %s already exists on network %s.\n"), word_eol[3], word[2]);
+			return TRUE;	/* unsuccessful, but the syntax was correct so we don't want to show the help */
+		}
+
+		/* server added to new or existing network, doesn't make any difference */
+		servlist_server_add (network, word_eol[3]);
+		PrintTextf (sess, _("Added server %s to network %s.\n"), word_eol[3], word[2]);
+		return TRUE;		/* success */
+	}
+	else
+	{
+		return FALSE;		/* print help */
+	}
+}
+
 static int
 cmd_allchannels (session *sess, char *tbuf, char *word[], char *word_eol[])
 {
@@ -3534,6 +3569,7 @@ cmd_voice (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 const struct commands xc_cmds[] = {
 	{"ADDBUTTON", cmd_addbutton, 0, 0, 1,
 	 N_("ADDBUTTON <name> <action>, adds a button under the user-list")},
+	{"ADDSERVER", cmd_addserver, 0, 0, 1, N_("ADDSERVER <New Network> <newserver/6667>, adds a new network with a new server to the network list")},
 	{"ALLCHAN", cmd_allchannels, 0, 0, 1,
 	 N_("ALLCHAN <cmd>, sends a command to all channels you're in")},
 	{"ALLCHANL", cmd_allchannelslocal, 0, 0, 1,

src/common/server.c

@@ -312,8 +312,10 @@ server_inline (server *serv, char *line, int len)
 	char *utf_line_allocated = NULL;
 
 #ifdef WIN32
+#if 0
 	char *cleaned_line;
 	int cleaned_len;
+#endif
 #endif
 
 	/* Checks whether we're set to use UTF-8 charset */
@@ -403,12 +405,15 @@ server_inline (server *serv, char *line, int len)
 	}
 
 #ifdef WIN32
+#if 0
 	cleaned_line = text_replace_non_bmp (line, len, &cleaned_len);
 	if (cleaned_line != NULL ) {
 		line = cleaned_line;
 		len = cleaned_len;
 	}
 #endif
+	text_replace_non_bmp2 (line);
+#endif
 
 	fe_add_rawlog (serv, line, len, FALSE);
 
@@ -416,7 +421,9 @@ server_inline (server *serv, char *line, int len)
 	serv->p_inline (serv, line, len);
 
 #ifdef WIN32
+#if 0
 	g_free (cleaned_line);
+#endif
 #endif
 
 	if (utf_line_allocated != NULL) /* only if a special copy was allocated */
@@ -962,12 +969,14 @@ server_read_child (GIOChannel *source, GIOCondition condition, server *serv)
 #ifdef WIN32
 		if (prefs.identd)
 		{
-			if (serv->network)
-				identd_start ((((ircnet *)serv->network)->user) ?
-									(((ircnet *)serv->network)->user) :
-									prefs.username);
+			if (serv->network && ((ircnet *)serv->network)->user)
+			{
+				identd_start (((ircnet *)serv->network)->user);
+			}
 			else
+			{
 				identd_start (prefs.username);
+			}
 		}
 #else
 		snprintf (outbuf, sizeof (outbuf), "%s/auth/xchat_auth",

src/common/servlist.c

@@ -247,12 +247,18 @@ static const struct defaultserver def[] =
 	{0,			"irc.vendetta.com"},
 
 	{"freenode",	0,	"#hexchat"},
+#ifdef USE_OPENSSL
+	{0,				"irc.freenode.net/+6697"},
+#endif
 	{0,				"irc.freenode.net"},
 
 /*	{"Freeworld",	0},
 	{0,			"kabel.freeworld.nu"},
 	{0,			"irc.freeworld.nu"},*/
 
+	{"Fusion Latina",	0},
+	{0,					"irc.fusionlatina.org/2012"},
+
 	{"GalaxyNet",	0},
 	{0,			"irc.galaxynet.org"},
 /*	{0,			"sprynet.us.galaxynet.org"},
@@ -301,6 +307,12 @@ static const struct defaultserver def[] =
 	{0,			"Sunshine.Ca.US.Infinity-IRC.Org"},
 	{0,			"IRC.Infinity-IRC.Org"},*/
 
+	{"IRCHighWay",	0},
+#ifdef USE_OPENSSL
+	{0,				"irc.irchighway.net/+9999"},
+#endif
+	{0,				"irc.irchighway.net"},
+
 	{"IrcLink",	0},
 	{0,			"irc.irclink.net"},
 	{0,			"Alesund.no.eu.irclink.net"},
@@ -958,7 +970,7 @@ servlist_load_defaults (void)
 		if (def[i].network)
 		{
 			net = servlist_net_add (def[i].network, def[i].host, FALSE);
-			net->encoding = strdup ("IRC (Latin/Unicode Hybrid)");
+			net->encoding = strdup (IRC_DEFAULT_CHARSET);
 			if (def[i].channel)
 				net->autojoin = strdup (def[i].channel);
 			if (def[i].charset)

src/common/servlist.h

@@ -35,6 +35,9 @@ extern GSList *network_list;
 #define FLAG_FAVORITE			64
 #define FLAG_COUNT				7
 
+/* DEFAULT_CHARSET is already defined in wingdi.h */
+#define IRC_DEFAULT_CHARSET		"IRC (Latin/Unicode Hybrid)"
+
 void servlist_init (void);
 int servlist_save (void);
 int servlist_cycle (server *serv);

src/common/text.c

@@ -278,8 +278,10 @@ scrollback_load (session *sess)
 	int lines;
 
 #ifdef WIN32
+#if 0
 	char *cleaned_text;
 	int cleaned_len;
+#endif
 #else
 	char *map, *end_map;
 	struct stat statbuf;
@@ -385,6 +387,7 @@ scrollback_load (session *sess)
 				{
 					text = strip_color (text + 1, -1, STRIP_COLOR);
 				}
+#if 0
 				cleaned_text = text_replace_non_bmp (text, -1, &cleaned_len);
 				if (cleaned_text != NULL)
 				{
@@ -394,6 +397,8 @@ scrollback_load (session *sess)
 					}
 					text = cleaned_text;
 				}
+#endif
+				text_replace_non_bmp2 (text);
 				fe_print_text (sess, text, stamp);
 				if (prefs.text_stripcolor_replay)
 				{
@@ -925,6 +930,7 @@ iso_8859_1_to_utf8 (unsigned char *text, int len, gsize *bytes_written)
 #ifdef WIN32
 /* replace characters outside of the Basic Multilingual Plane with
  * replacement characters (0xFFFD) */
+#if 0
 char *
 text_replace_non_bmp (char *utf8_input, int input_length, glong *output_length)
 {
@@ -962,6 +968,30 @@ text_replace_non_bmp (char *utf8_input, int input_length, glong *output_length)
 }
 #endif
 
+void
+text_replace_non_bmp2 (char *utf8_input)
+{
+	char *tmp = utf8_input, *next;
+	gunichar suspect;
+
+	while (tmp != NULL && *tmp)
+	{
+		next = g_utf8_next_char(tmp);
+		suspect = g_utf8_get_char_validated(tmp, next - tmp);
+		if ((suspect >= 0x1D173 && suspect <= 0x1D17A) || (suspect >= 0xE0001 && suspect <= 0xE007F))
+		{
+			/* 0xFFFD - replacement character */
+			*tmp = 0xEF;
+			*(++tmp) = 0xBF;
+			*(++tmp) = 0xBD;
+			*(++tmp) = 0x1A;	/* ASCII Sub to fill the 4th non-BMP byte */
+		}
+
+		tmp = next;
+	}
+}
+#endif
+
 char *
 text_validate (char **text, int *len)
 {
@@ -2173,9 +2203,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d)
 	case XP_TE_DPRIVMSG:
 	case XP_TE_PRIVACTION:
 	case XP_TE_DPRIVACTION:
-		if (chanopt_is_set_a (prefs.input_beep_priv, sess->alert_beep))
+		if (chanopt_is_set_a (prefs.input_beep_priv, sess->alert_beep) && !prefs.away_omit_alerts)
 			sound_beep (sess);
-		if (chanopt_is_set_a (prefs.input_flash_priv, sess->alert_taskbar))
+		if (chanopt_is_set_a (prefs.input_flash_priv, sess->alert_taskbar) && !prefs.away_omit_alerts)
 			fe_flash_window (sess);
 		/* why is this one different? because of plugin-tray.c's hooks! ugly */
 		if (sess->alert_tray == SET_ON)
@@ -2185,9 +2215,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d)
 	/* ===Highlighted message=== */
 	case XP_TE_HCHANACTION:
 	case XP_TE_HCHANMSG:
-		if (chanopt_is_set_a (prefs.input_beep_hilight, sess->alert_beep))
+		if (chanopt_is_set_a (prefs.input_beep_hilight, sess->alert_beep) && !prefs.away_omit_alerts)
 			sound_beep (sess);
-		if (chanopt_is_set_a (prefs.input_flash_hilight, sess->alert_taskbar))
+		if (chanopt_is_set_a (prefs.input_flash_hilight, sess->alert_taskbar) && !prefs.away_omit_alerts)
 			fe_flash_window (sess);
 		if (sess->alert_tray == SET_ON)
 			fe_tray_set_icon (FE_ICON_MESSAGE);
@@ -2196,9 +2226,9 @@ text_emit (int index, session *sess, char *a, char *b, char *c, char *d)
 	/* ===Channel message=== */
 	case XP_TE_CHANACTION:
 	case XP_TE_CHANMSG:
-		if (chanopt_is_set_a (prefs.input_beep_chans, sess->alert_beep))
+		if (chanopt_is_set_a (prefs.input_beep_chans, sess->alert_beep) && !prefs.away_omit_alerts)
 			sound_beep (sess);
-		if (chanopt_is_set_a (prefs.input_flash_chans, sess->alert_taskbar))
+		if (chanopt_is_set_a (prefs.input_flash_chans, sess->alert_taskbar) && !prefs.away_omit_alerts)
 			fe_flash_window (sess);
 		if (sess->alert_tray == SET_ON)
 			fe_tray_set_icon (FE_ICON_MESSAGE);

src/common/text.h

@@ -29,8 +29,11 @@ void pevent_make_pntevts (void);
 void text_emit (int index, session *sess, char *a, char *b, char *c, char *d);
 int text_emit_by_name (char *name, session *sess, char *a, char *b, char *c, char *d);
 #ifdef WIN32
+#if 0
 char *text_replace_non_bmp (char *utf8_input, int input_length, glong *output_length);
 #endif
+void text_replace_non_bmp2 (char *utf8_input);
+#endif
 char *text_validate (char **text, int *len);
 int get_stamp_str (char *fmt, time_t tim, char **ret);
 void format_event (session *sess, int index, char **args, char *o, int sizeofo, unsigned int stripcolor_args);

src/common/url.c

@@ -59,7 +59,7 @@ url_save_cb (char *url, FILE *fd)
 }
 
 void
-url_save (const char *fname, const char *mode, gboolean fullpath)
+url_save_tree (const char *fname, const char *mode, gboolean fullpath)
 {
 	FILE *fd;
 
@@ -74,10 +74,20 @@ url_save (const char *fname, const char *mode, gboolean fullpath)
 	fclose (fd);
 }
 
-void
-url_autosave (void)
+static void
+url_save_node (char* url)
 {
-	url_save ("url.save", "a", FALSE);
+	FILE *fd;
+
+	/* open <config>/url.log in append mode */
+	fd = xchat_fopen_file ("url.log", "a", 0);
+	if (fd == NULL)
+	{
+		return;
+	}
+
+	fprintf (fd, "%s\n", url);
+	fclose (fd);	
 }
 
 static int
@@ -92,12 +102,17 @@ url_add (char *urltext, int len)
 	char *data;
 	int size;
 
-	if (!prefs.url_grabber)
+	/* we don't need any URLs if we have neither URL grabbing nor URL logging enabled */
+	if (!prefs.url_grabber && !prefs.url_logging)
+	{
 		return;
+	}
 
 	data = malloc (len + 1);
 	if (!data)
+	{
 		return;
+	}
 	memcpy (data, urltext, len);
 	data[len] = 0;
 
@@ -106,8 +121,23 @@ url_add (char *urltext, int len)
 		len--;
 		data[len] = 0;
 	}
-	if (data[len - 1] == ')')	/* chop trailing ) */
+	/* chop trailing ) but only if there's no counterpart */
+	if (data[len - 1] == ')' && strchr (data, '(') == NULL)
+	{
 		data[len - 1] = 0;
+	}
+
+	if (prefs.url_logging)
+	{
+		url_save_node (data);
+	}
+
+	/* the URL is saved already, only continue if we need the URL grabber too */
+	if (!prefs.url_grabber)
+	{
+		free (data);
+		return;
+	}
 
 	if (!url_tree)
 	{
@@ -202,6 +232,18 @@ url_check_word (char *word, int len)
 	const char *at, *dot;
 	int i, dots;
 
+	/* this is pretty much the same as in logmask_is_fullpath() except with length checks and .\ for portable mode */
+#ifdef WIN32
+	if ((len > 1 && word[0] == '\\') ||
+		(len > 2 && word[0] == '.' && word[1] == '\\') ||
+		(len > 2 && (((word[0] >= 'A' && word[0] <= 'Z') || (word[0] >= 'a' && word[0] <= 'z')) && word[1] == ':')))
+#else
+	if (len > 1 && word[0] == '/')
+#endif
+	{
+		return WORD_PATH;
+	}
+
 	if (len > 1 && word[1] == '#' && strchr("@+^%*#", word[0]))
 		return WORD_CHANNEL;
 

src/common/url.h

@@ -8,11 +8,12 @@ extern void *url_tree;
 #define WORD_CHANNEL 3
 #define WORD_HOST    4
 #define WORD_EMAIL   5
+/* anything >0 will be displayed as a link by gtk_xtext_motion_notify() */
 #define WORD_DIALOG  -1
+#define WORD_PATH    -2
 
 void url_clear (void);
-void url_save (const char *fname, const char *mode, gboolean fullpath);
-void url_autosave (void);
+void url_save_tree (const char *fname, const char *mode, gboolean fullpath);
 int url_check_word (char *word, int len);
 void url_check_line (char *buf, int len);
 

src/common/xchat.c

@@ -847,14 +847,13 @@ xchat_exit (void)
 	in_xchat_exit = TRUE;
 	plugin_kill_all ();
 	fe_cleanup ();
-	if (prefs.autosave)
+
+	save_config ();
+	if (prefs.save_pevents)
 	{
-		save_config ();
-		if (prefs.save_pevents)
-			pevent_save (NULL);
+		pevent_save (NULL);
 	}
-	if (prefs.autosave_url)
-		url_autosave ();
+
 	sound_save ();
 	notify_save ();
 	ignore_save ();

src/common/xchat.h

@@ -156,6 +156,7 @@ struct xchatprefs
 
 	int away_timeout;
 	int away_size_max;
+	int away_omit_alerts;
 
 	int gui_pane_left_size;
 	int gui_pane_right_size;
@@ -204,13 +205,12 @@ struct xchatprefs
 	char dcc_ip_str[DOMAINLEN + 1];
 
 	unsigned int tab_small;
+	unsigned int tab_icons;
 	unsigned int tab_sort;
 	unsigned int mainwindow_save;
 	unsigned int perc_color;
 	unsigned int perc_ascii;
-	unsigned int autosave;
 	unsigned int autodialog;
-	unsigned int autosave_url;
 	unsigned int autoreconnect;
 	unsigned int autoreconnectonfail;
 	unsigned int invisible;
@@ -313,7 +313,6 @@ struct xchatprefs
 #ifdef WIN32
 	unsigned int identd;
 	unsigned int emoticons;
-	unsigned int tab_icons;
 #endif
 
 	unsigned int ctcp_number_limit;	/*flood */
@@ -324,6 +323,7 @@ struct xchatprefs
 
 	unsigned int url_grabber;
 	unsigned int url_grabber_limit;
+	unsigned int url_logging;
 	/* Tells us if we need to save, only when they've been edited.
 		This is so that we continue using internal defaults (which can
 		change in the next release) until the user edits them. */

src/fe-gtk/Makefile.am

@@ -2,7 +2,7 @@ localedir = $(datadir)/locale
 
 bin_PROGRAMS = hexchat
 
-INCLUDES = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS = $(GUI_CFLAGS) -DG_DISABLE_CAST_CHECKS -DLOCALEDIR=\"$(localedir)\"
 
 hexchat_LDADD = ../common/libxchatcommon.a $(GUI_LIBS)
 

src/fe-gtk/dccgui.c

@@ -165,7 +165,7 @@ fe_dcc_send_filereq (struct session *sess, char *nick, int maxcps, int passive)
 	mdc->passive = passive;
 
 	snprintf (tbuf, sizeof tbuf, _("Send file to %s"), nick);
-	gtkutil_file_req (tbuf, dcc_send_filereq_file, mdc, NULL, NULL, FRF_MULTIPLE);
+	gtkutil_file_req (tbuf, dcc_send_filereq_file, mdc, prefs.dccdir, NULL, FRF_MULTIPLE|FRF_FILTERISINITIAL);
 }
 
 static void

src/fe-gtk/fe-gtk.c

@@ -45,6 +45,7 @@
 #include "../common/xchatc.h"
 #include "../common/plugin.h"
 #include "../common/server.h"
+#include "../common/url.h"
 #include "gtkutil.h"
 #include "maingui.h"
 #include "pixmaps.h"
@@ -586,7 +587,7 @@ fe_set_hilight (struct session *sess)
 	if (sess->gui->is_tab)
 		fe_set_tab_color (sess, 3);	/* set tab to blue */
 
-	if (prefs.input_flash_hilight)
+	if (prefs.input_flash_hilight && !prefs.away_omit_alerts)
 		fe_flash_window (sess); /* taskbar flash */
 }
 
@@ -1080,16 +1081,18 @@ fe_open_url_inner (const char *url)
 static void
 fe_open_url_locale (const char *url)
 {
-#ifndef WIN32
-	if (url[0] != '/' && strchr (url, ':') == NULL)
+	/* the http:// part's missing, prepend it, otherwise it won't always work */
+	if (strchr (url, ':') == NULL && url_check_word (url, strlen (url)) != WORD_PATH)
 	{
 		url = g_strdup_printf ("http://%s", url);
 		fe_open_url_inner (url);
 		g_free ((char *)url);
-		return;
 	}
-#endif
-	fe_open_url_inner (url);
+	/* we have a sane URL, send it to the browser untouched */
+	else
+	{
+		fe_open_url_inner (url);
+	}
 }
 
 void

src/fe-gtk/maingui.c

@@ -2291,6 +2291,7 @@ mg_word_clicked (GtkWidget *xtext, char *word, GdkEventButton *even)
 	switch (mg_word_check (xtext, word, strlen (word)))
 	{
 	case 0:
+	case WORD_PATH:
 		menu_middlemenu (sess, even);
 		break;
 	case WORD_URL:
@@ -2914,8 +2915,10 @@ mg_create_tabs (session_gui *gui)
 
 	/* if any one of these PNGs exist, the chanview will create
 	 * the extra column for icons. */
-	if (pix_channel || pix_dialog || pix_server || pix_util)
+	if (prefs.tab_icons && (pix_channel || pix_dialog || pix_server || pix_util))
+	{
 		use_icons = TRUE;
+	}
 
 	gui->chanview = chanview_new (prefs.tab_layout, prefs.truncchans,
 											prefs.tab_sort, use_icons,

src/fe-gtk/palette.c

@@ -75,7 +75,10 @@ GdkColor colors[] = {
 	{0, 0xffff, 0xffff, 0xffff}, /* 32 marktext Fore (white) */
 	{0, 0x3535, 0x6e6e, 0xc1c1}, /* 33 marktext Back (blue) */
 	{0, 0x0000, 0x0000, 0x0000}, /* 34 foreground (black) */
+#if 0 /* old XChat 2.x default */
 	{0, 0xf0f0, 0xf0f0, 0xf0f0}, /* 35 background (white) */
+#endif
+	{0, 0xffff, 0xffff, 0xffff}, /* 35 background (white) */
 	{0, 0xcccc, 0x1010, 0x1010}, /* 36 marker line (red) */
 
 	/* colors for GUI */

src/fe-gtk/pixmaps.c

@@ -137,9 +137,16 @@ pixmaps_init (void)
 	pix_tray_hilight = load_pixmap ("highlight", trayhilightpng, 1);
 	pix_tray_file = load_pixmap ("fileoffer", trayfilepng, 1);
 
+#if 0
 	/* treeview icons, no defaults, load from disk only */
 	pix_channel = load_pixmap ("channel", NULL, 0);
 	pix_dialog = load_pixmap ("dialog", NULL, 0);
 	pix_server = load_pixmap ("server", NULL, 0);
 	pix_util = load_pixmap ("util", NULL, 0);
+#endif
+	/* provide inline defaults for these coz they are nice! */
+	pix_channel = load_pixmap ("channel", channelpng, 1);
+	pix_dialog = load_pixmap ("dialog", dialogpng, 1);
+	pix_server = load_pixmap ("server", serverpng, 1);
+	pix_util = load_pixmap ("util", utilpng, 1);
 }

src/fe-gtk/plugin-tray.c

@@ -578,7 +578,7 @@ tray_hilight_cb (char *word[], void *userdata)
 	/*if (tray_status == TS_HIGHLIGHT)
 		return XCHAT_EAT_NONE;*/
 
-	if (prefs.input_tray_hilight)
+	if (prefs.input_tray_hilight && !prefs.away_omit_alerts)
 	{
 		tray_set_flash (ICON_HILIGHT);
 
@@ -592,7 +592,7 @@ tray_hilight_cb (char *word[], void *userdata)
 								tray_hilight_count, word[1], xchat_get_info (ph, "channel"));
 	}
 
-	if (prefs.input_balloon_hilight)
+	if (prefs.input_balloon_hilight && !prefs.away_omit_alerts)
 		tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"),
 								 word[1], xchat_get_info (ph, "channel"));
 
@@ -605,7 +605,7 @@ tray_message_cb (char *word[], void *userdata)
 	if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT)
 		return XCHAT_EAT_NONE;
 
-	if (prefs.input_tray_chans)
+	if (prefs.input_tray_chans && !prefs.away_omit_alerts)
 	{
 		tray_set_flash (ICON_MSG);
 
@@ -617,7 +617,7 @@ tray_message_cb (char *word[], void *userdata)
 			tray_set_tipf (_(DISPLAY_NAME": %u new public messages."), tray_pub_count);
 	}
 
-	if (prefs.input_balloon_chans)
+	if (prefs.input_balloon_chans && !prefs.away_omit_alerts)
 		tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"),
 								 word[1], xchat_get_info (ph, "channel"));
 
@@ -646,7 +646,7 @@ tray_priv (char *from, char *text)
 		tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"),
 							tray_priv_count, from, network);
 
-	if (prefs.input_balloon_priv)
+	if (prefs.input_balloon_priv && !prefs.away_omit_alerts)
 		tray_set_balloonf (text, _(DISPLAY_NAME": Private message from: %s (%s)"),
 								 from, network);
 }
@@ -657,7 +657,7 @@ tray_priv_cb (char *word[], void *userdata)
 	/*if (tray_status == TS_HIGHLIGHT)
 		return XCHAT_EAT_NONE;*/
 
-	if (prefs.input_tray_priv)
+	if (prefs.input_tray_priv && !prefs.away_omit_alerts)
 		tray_priv (word[1], word[2]);
 
 	return XCHAT_EAT_NONE;
@@ -669,7 +669,7 @@ tray_invited_cb (char *word[], void *userdata)
 	/*if (tray_status == TS_HIGHLIGHT)
 		return XCHAT_EAT_NONE;*/
 
-	if (prefs.input_tray_priv)
+	if (prefs.input_tray_priv && !prefs.away_omit_alerts)
 		tray_priv (word[2], "Invited");
 
 	return XCHAT_EAT_NONE;
@@ -687,7 +687,7 @@ tray_dcc_cb (char *word[], void *userdata)
 	if (!network)
 		network = xchat_get_info (ph, "server");
 
-	if (prefs.input_tray_priv)
+	if (prefs.input_tray_priv && !prefs.away_omit_alerts)
 	{
 		tray_set_flash (ICON_FILE);
 
@@ -700,7 +700,7 @@ tray_dcc_cb (char *word[], void *userdata)
 								tray_file_count, word[1], network);
 	}
 
-	if (prefs.input_balloon_priv)
+	if (prefs.input_balloon_priv && !prefs.away_omit_alerts)
 		tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"),
 								word[1], network);
 

src/fe-gtk/servlistgui.c

@@ -92,7 +92,7 @@ static GtkWidget *servlist_open_edit (GtkWidget *parent, ircnet *net);
 static const char *pages[]=
 {
 	"UTF-8 (Unicode)",
-	"IRC (Latin/Unicode Hybrid)",
+	IRC_DEFAULT_CHARSET,
 	"ISO-8859-15 (Western Europe)",
 	"ISO-8859-2 (Central Europe)",
 	"ISO-8859-7 (Greek)",
@@ -279,7 +279,7 @@ servlist_addnet_cb (GtkWidget *item, GtkTreeView *treeview)
 	ircnet *net;
 
 	net = servlist_net_add (_("New Network"), "", TRUE);
-	net->encoding = strdup ("IRC (Latin/Unicode Hybrid)");
+	net->encoding = strdup (IRC_DEFAULT_CHARSET);
 	servlist_server_add (net, "newserver/6667");
 
 	store = (GtkListStore *)gtk_tree_view_get_model (treeview);

src/fe-gtk/setup.c

@@ -266,6 +266,7 @@ static const setting tabs_settings[] =
 	{ST_TOGGLE, N_("Open an extra tab for server notices"), P_OFFINTNL(notices_tabs), 0, 0, 0},
 	{ST_TOGGLE, N_("Open a new tab when you receive a private message"), P_OFFINTNL(autodialog), 0, 0, 0},
 	{ST_TOGGLE, N_("Sort tabs in alphabetical order"), P_OFFINTNL(tab_sort), 0, 0, 0},
+	{ST_TOGGLE, N_("Show icons in the channel tree"), P_OFFINTNL(tab_icons), 0, 0, 0},
 	{ST_TOGGLE, N_("Smaller text"), P_OFFINTNL(tab_small), 0, 0, 0},
 #if 0
 	{ST_MENU,	N_("Focus new tabs:"), P_OFFINTNL(newtabstofront), 0, focusnewtabsmenu, 0},
@@ -361,6 +362,7 @@ static const setting alert_settings[] =
 	{ST_3OGGLE, N_("Make a beep sound on:"), 0, 0, (void *)beeplist, 0},
 
 	{ST_TOGGLE,	N_("Enable system tray icon"), P_OFFINTNL(gui_tray), 0, 0, 0},
+	{ST_TOGGLE,	N_("Omit alerts when marked as being away"), P_OFFINTNL(away_omit_alerts), 0, 0, 0},
 
 	{ST_HEADER,	N_("Highlighted Messages"),0,0,0},
 	{ST_LABEL,	N_("Highlighted messages are ones where your nickname is mentioned, but also:"), 0, 0, 0, 1},
@@ -381,6 +383,8 @@ static const setting alert_settings_hextray[] =
 	{ST_3OGGLE, N_("Blink task bar on:"), 0, 0, (void *)taskbarlist, 0},
 	{ST_3OGGLE, N_("Make a beep sound on:"), 0, 0, (void *)beeplist, 0},
 
+	{ST_TOGGLE,	N_("Omit alerts when marked as being away"), P_OFFINTNL(away_omit_alerts), 0, 0, 0},
+
 	{ST_HEADER,	N_("Highlighted Messages"),0,0,0},
 	{ST_LABEL,	N_("Highlighted messages are ones where your nickname is mentioned, but also:"), 0, 0, 0, 1},
 
@@ -489,9 +493,10 @@ static const setting logging_settings[] =
 	{ST_LABEL,	N_("See the strftime manpage for details.")},
 #endif
 
-	{ST_HEADER,	N_("URL Grabber"),0,0,0},
+	{ST_HEADER,	N_("URLs"),0,0,0},
+	{ST_TOGGLE,	N_("Enable logging of URLs to disk"), P_OFFINTNL(url_logging), 0, 0, 0},
 	{ST_TOGGLE,	N_("Enable URL grabber"), P_OFFINTNL(url_grabber), 0, 0, 2},
-	{ST_NUMBER,	N_("Maximum number of URLs:"), P_OFFINTNL(url_grabber_limit), 0, 0, 9999},
+	{ST_NUMBER,	N_("Maximum number of URLs to grab:"), P_OFFINTNL(url_grabber_limit), 0, 0, 9999},
 
 	{ST_END, 0, 0, 0, 0, 0}
 };
@@ -2143,6 +2148,8 @@ setup_apply (struct xchatprefs *pr)
 		noapply = TRUE;
 	if (DIFF (truncchans))
 		noapply = TRUE;
+	if (DIFF (tab_icons))
+		noapply = TRUE;
 	if (DIFF (tab_layout))
 		do_layout = TRUE;
 

src/fe-gtk/urlgrab.c

@@ -138,7 +138,9 @@ static void
 url_save_callback (void *arg1, char *file)
 {
 	if (file)
-		url_save (file, "w", TRUE);
+	{
+		url_save_tree (file, "w", TRUE);
+	}
 }
 
 static void

src/fe-gtk/urlgrab.h

@@ -1,2 +1 @@
-void url_autosave (void);
 void url_opengui (void);

src/fe-gtk/xtext.c

@@ -84,9 +84,15 @@
 #endif
 
 /* is delimiter */
+#if 0
+/* () is used by Wikipedia */
 #define is_del(c) \
 	(c == ' ' || c == '\n' || c == ')' || c == '(' || \
 	 c == '>' || c == '<' || c == ATTR_RESET || c == ATTR_BOLD || c == 0)
+#endif
+#define is_del(c) \
+	(c == ' ' || c == '\n' || c == '>' || c == '<' || \
+	 c == ATTR_RESET || c == ATTR_BOLD || c == 0)
 
 #ifdef SCROLL_HACK
 /* force scrolling off */

src/fe-text/Makefile.am

@@ -4,7 +4,7 @@ bin_PROGRAMS = hexchat-text
 
 EXTRA_DIST = README 
 
-INCLUDES = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
+AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"
 
 hexchat_text_LDADD = ../common/libxchatcommon.a $(COMMON_LIBS)
 hexchat_text_SOURCES = fe-text.c fe-text.h

src/fe-text/fe-text.c

@@ -93,7 +93,7 @@ fe_new_window (struct session *sess, int focus)
 
 	snprintf (buf, sizeof (buf),
 				"\n"
-				" \017XChat-Text \00310"PACKAGE_VERSION"\n"
+				" \017HexChat-Text \00310"PACKAGE_VERSION"\n"
 				" \017Running on \00310%s \017glib \00310%d.%d.%d\n"
 				" \017This binary compiled \00310"__DATE__"\017\n",
 				get_cpu_str(),
@@ -532,7 +532,6 @@ void
 fe_init (void)
 {
 	/* the following should be default generated, not enfoced in binary */
-	prefs.autosave = 0;
 	prefs.use_server_tab = 0;
 	prefs.autodialog = 0;
 	/* except for these, there is no lag meter, there is no server list */
@@ -827,7 +826,7 @@ fe_ctrl_gui (session *sess, fe_gui_action action, int arg)
 	/* only one action type handled for now, but could add more */
 	switch (action)
 	{
-	/* gui focus is really the only case xchat-text needs to wory about */
+	/* gui focus is really the only case hexchat-text needs to wory about */
 	case FE_GUI_FOCUS:
 		current_sess = sess;
 		current_tab = sess;

src/pixmaps/Makefile.am

@@ -9,9 +9,13 @@ LIST =	traymsgpng $(srcdir)/message.png \
 			purplepng $(srcdir)/purple.png \
 			redpng $(srcdir)/red.png \
 			voicepng $(srcdir)/voice.png \
+			channelpng $(srcdir)/channel.png \
+			dialogpng $(srcdir)/dialog.png \
+			serverpng $(srcdir)/server.png \
+			utilpng $(srcdir)/util.png \
 			hexchatpng $(srcdir)/../../hexchat.png
 
-PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png purple.png red.png voice.png
+PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png purple.png red.png voice.png channel.png dialog.png server.png util.png
 noinst_HEADERS = inline_pngs.h
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS)

src/pixmaps/pixmaps-xp.vcxproj

@@ -96,6 +96,8 @@
   <ItemGroup>
     <None Include="..\..\hexchat.png" />
     <None Include="book.png" />
+    <None Include="channel.png" />
+    <None Include="dialog.png" />
     <None Include="fileoffer.png" />
     <None Include="highlight.png" />
     <None Include="hop.png" />
@@ -103,6 +105,8 @@
     <None Include="op.png" />
     <None Include="purple.png" />
     <None Include="red.png" />
+    <None Include="server.png" />
+    <None Include="util.png" />
     <None Include="voice.png" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

src/pixmaps/pixmaps-xp.vcxproj.filters

@@ -37,5 +37,17 @@
     <None Include="..\..\hexchat.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="channel.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="dialog.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="server.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="util.png">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>

src/pixmaps/pixmaps.vcxproj

@@ -93,6 +93,8 @@
   <ItemGroup>
     <None Include="..\..\hexchat.png" />
     <None Include="book.png" />
+    <None Include="channel.png" />
+    <None Include="dialog.png" />
     <None Include="fileoffer.png" />
     <None Include="highlight.png" />
     <None Include="hop.png" />
@@ -100,6 +102,8 @@
     <None Include="op.png" />
     <None Include="purple.png" />
     <None Include="red.png" />
+    <None Include="server.png" />
+    <None Include="util.png" />
     <None Include="voice.png" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

src/pixmaps/pixmaps.vcxproj.filters

@@ -37,5 +37,17 @@
     <None Include="..\..\hexchat.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="channel.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="dialog.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="server.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="util.png">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>

version.txt

@@ -1 +1 @@
-2.9.2
+2.9.3

win32/ext/nss-wdk/nss-wdk.patch

@@ -1,6 +1,6 @@
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/dbm/include/mcom_db.h nss-3.12.9/mozilla/dbm/include/mcom_db.h
---- nss-3.12.9.orig/mozilla/dbm/include/mcom_db.h	2009-06-05 01:18:50 +0200
-+++ nss-3.12.9/mozilla/dbm/include/mcom_db.h	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/dbm/include/mcom_db.h nss-3.13.6/mozilla/dbm/include/mcom_db.h
+--- nss-3.13.6.orig/mozilla/dbm/include/mcom_db.h	2009-06-05 01:18:50 +0200
++++ nss-3.13.6/mozilla/dbm/include/mcom_db.h	2012-10-06 00:54:22 +0200
 @@ -40,6 +40,15 @@
  #define off_t long
  #endif
@@ -17,9 +17,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/dbm/include/mcom_db.h nss-
  #ifndef macintosh
  #include <sys/types.h>
  #endif
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/dbm/src/mktemp.c nss-3.12.9/mozilla/dbm/src/mktemp.c
---- nss-3.12.9.orig/mozilla/dbm/src/mktemp.c	2009-06-05 01:19:32 +0200
-+++ nss-3.12.9/mozilla/dbm/src/mktemp.c	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/dbm/src/mktemp.c nss-3.13.6/mozilla/dbm/src/mktemp.c
+--- nss-3.13.6.orig/mozilla/dbm/src/mktemp.c	2009-06-05 01:19:31 +0200
++++ nss-3.13.6/mozilla/dbm/src/mktemp.c	2012-10-06 00:54:22 +0200
 @@ -45,13 +45,13 @@
  #include <ctype.h>
  #include "mcom_db.h"
@@ -38,10 +38,10 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/dbm/src/mktemp.c nss-3.12.
  #endif
  
  static int _gettemp(char *path, register int *doopen, int extraFlags);
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/config/config.mk nss-3.12.9/mozilla/nsprpub/config/config.mk
---- nss-3.12.9.orig/mozilla/nsprpub/config/config.mk	2010-07-09 04:10:34 +0200
-+++ nss-3.12.9/mozilla/nsprpub/config/config.mk	2011-02-11 00:03:42 +0100
-@@ -154,6 +154,15 @@
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/config/config.mk nss-3.13.6/mozilla/nsprpub/config/config.mk
+--- nss-3.13.6.orig/mozilla/nsprpub/config/config.mk	2012-03-06 14:13:38 +0100
++++ nss-3.13.6/mozilla/nsprpub/config/config.mk	2012-10-06 00:54:22 +0200
+@@ -132,6 +132,15 @@
  DEFINES += -DMOZ_UNICODE
  endif
  
@@ -57,10 +57,10 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/config/config.mk n
  ####################################################################
  #
  # Configuration for the release process
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.12.9/mozilla/nsprpub/pr/src/Makefile.in
---- nss-3.12.9.orig/mozilla/nsprpub/pr/src/Makefile.in	2010-10-13 02:52:54 +0200
-+++ nss-3.12.9/mozilla/nsprpub/pr/src/Makefile.in	2011-02-11 00:03:42 +0100
-@@ -197,9 +197,17 @@
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/pr/src/Makefile.in nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in
+--- nss-3.13.6.orig/mozilla/nsprpub/pr/src/Makefile.in	2012-03-06 14:13:59 +0100
++++ nss-3.13.6/mozilla/nsprpub/pr/src/Makefile.in	2012-10-06 00:54:22 +0200
+@@ -170,9 +170,17 @@
  ifdef NS_USE_GCC
  OS_LIBS		= -ladvapi32 -lwsock32 -lwinmm
  else
@@ -78,10 +78,10 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/pr/src/Makefile.in
  
  ifeq ($(OS_ARCH),WINCE)
  OS_LIBS		= ws2.lib
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.12.9/mozilla/nsprpub/pr/src/md/windows/ntmisc.c
---- nss-3.12.9.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2010-08-15 22:59:14 +0200
-+++ nss-3.12.9/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2011-02-11 00:03:42 +0100
-@@ -625,7 +625,11 @@
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c nss-3.13.6/mozilla/nsprpub/pr/src/md/windows/ntmisc.c
+--- nss-3.13.6.orig/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2012-03-06 14:14:17 +0100
++++ nss-3.13.6/mozilla/nsprpub/pr/src/md/windows/ntmisc.c	2012-10-06 00:54:22 +0200
+@@ -593,7 +593,11 @@
       */
      hasFdInheritBuffer = (attr && attr->fdInheritBuffer);
      if ((envp == NULL) && hasFdInheritBuffer) {
@@ -93,12 +93,12 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/nsprpub/pr/src/md/windows/
      }
  
      if (envp != NULL) {
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/coreconf/WIN32.mk nss-3.12.9/mozilla/security/coreconf/WIN32.mk
---- nss-3.12.9.orig/mozilla/security/coreconf/WIN32.mk	2010-08-18 03:28:06 +0200
-+++ nss-3.12.9/mozilla/security/coreconf/WIN32.mk	2011-02-11 00:03:42 +0100
-@@ -145,6 +145,14 @@
- else # !NS_USE_GCC
-     OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/coreconf/WIN32.mk nss-3.13.6/mozilla/security/coreconf/WIN32.mk
+--- nss-3.13.6.orig/mozilla/security/coreconf/WIN32.mk	2011-09-14 19:59:43 +0200
++++ nss-3.13.6/mozilla/security/coreconf/WIN32.mk	2012-10-06 00:54:22 +0200
+@@ -146,6 +146,14 @@
+     OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \
+ 		 -D_CRT_NONSTDC_NO_WARNINGS
      OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
 +    ifdef WINDDK_BUILD
 +        OS_CFLAGS += -DWINDDK_BUILD
@@ -111,9 +111,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/coreconf/WIN32.mk
      ifeq ($(_MSC_VER),$(_MSC_VER_6))
      ifndef MOZ_DEBUG_SYMBOLS
  	OS_DLLFLAGS += -PDB:NONE
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/coreconf/arch.mk nss-3.12.9/mozilla/security/coreconf/arch.mk
---- nss-3.12.9.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:50 +0200
-+++ nss-3.12.9/mozilla/security/coreconf/arch.mk	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/coreconf/arch.mk nss-3.13.6/mozilla/security/coreconf/arch.mk
+--- nss-3.13.6.orig/mozilla/security/coreconf/arch.mk	2009-06-05 04:14:49 +0200
++++ nss-3.13.6/mozilla/security/coreconf/arch.mk	2012-10-06 00:54:22 +0200
 @@ -268,7 +268,15 @@
  # the uname.exe in the MSYS toolkit.
  #
@@ -131,9 +131,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/coreconf/arch.mk
      OS_ARCH = WINNT
      USE_MSYS = 1
      ifndef CPU_ARCH
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.12.9/mozilla/security/nss/cmd/platlibs.mk
---- nss-3.12.9.orig/mozilla/security/nss/cmd/platlibs.mk	2010-06-12 02:58:34 +0200
-+++ nss-3.12.9/mozilla/security/nss/cmd/platlibs.mk	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/cmd/platlibs.mk nss-3.13.6/mozilla/security/nss/cmd/platlibs.mk
+--- nss-3.13.6.orig/mozilla/security/nss/cmd/platlibs.mk	2010-06-12 02:58:33 +0200
++++ nss-3.13.6/mozilla/security/nss/cmd/platlibs.mk	2012-10-06 00:54:22 +0200
 @@ -249,3 +249,11 @@
  endif
  
@@ -146,9 +146,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/cmd/platlibs.
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.12.9/mozilla/security/nss/cmd/selfserv/selfserv.c
---- nss-3.12.9.orig/mozilla/security/nss/cmd/selfserv/selfserv.c	2010-04-03 20:27:28 +0200
-+++ nss-3.12.9/mozilla/security/nss/cmd/selfserv/selfserv.c	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/cmd/selfserv/selfserv.c nss-3.13.6/mozilla/security/nss/cmd/selfserv/selfserv.c
+--- nss-3.13.6.orig/mozilla/security/nss/cmd/selfserv/selfserv.c	2012-03-01 19:38:24 +0100
++++ nss-3.13.6/mozilla/security/nss/cmd/selfserv/selfserv.c	2012-10-06 00:54:22 +0200
 @@ -51,8 +51,13 @@
  #endif
  
@@ -163,9 +163,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/cmd/selfserv/
  
  #include <signal.h>
  #include <stdlib.h>
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.12.9/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
---- nss-3.12.9.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2009-03-10 22:18:08 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c nss-3.13.6/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
+--- nss-3.13.6.orig/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2011-09-30 18:07:16 +0200
++++ nss-3.13.6/mozilla/security/nss/lib/freebl/mpi/mpcpucache.c	2012-10-06 00:54:22 +0200
 @@ -80,7 +80,11 @@
  
  #elif defined(_MSC_VER)
@@ -178,9 +178,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/freebl/mp
  
  void freebl_cpuid(unsigned long op, unsigned long *eax, 
             unsigned long *ebx, unsigned long *ecx, 
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c
---- nss-3.12.9.orig/mozilla/security/nss/lib/freebl/win_rand.c	2011-01-06 20:05:58 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/freebl/win_rand.c	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/freebl/win_rand.c nss-3.13.6/mozilla/security/nss/lib/freebl/win_rand.c
+--- nss-3.13.6.orig/mozilla/security/nss/lib/freebl/win_rand.c	2011-01-06 20:00:52 +0100
++++ nss-3.13.6/mozilla/security/nss/lib/freebl/win_rand.c	2012-10-06 00:54:22 +0200
 @@ -50,6 +50,13 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -195,10 +195,10 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/freebl/wi
  #include <stdio.h>
  #include "prio.h"
  #include "prerror.h"
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/config.mk
---- nss-3.12.9.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2009-06-11 02:55:50 +0200
-+++ nss-3.12.9/mozilla/security/nss/lib/softoken/legacydb/config.mk	2011-02-11 00:03:42 +0100
-@@ -96,3 +96,11 @@
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk nss-3.13.6/mozilla/security/nss/lib/softoken/legacydb/config.mk
+--- nss-3.13.6.orig/mozilla/security/nss/lib/softoken/legacydb/config.mk	2011-11-06 00:01:08 +0100
++++ nss-3.13.6/mozilla/security/nss/lib/softoken/legacydb/config.mk	2012-10-06 00:54:22 +0200
+@@ -95,3 +95,11 @@
  ifeq ($(OS_TARGET),WINCE)
  DEFINES += -DDBM_USING_NSPR
  endif
@@ -210,9 +210,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/softoken/
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.12.9/mozilla/security/nss/lib/sqlite/sqlite3.c
---- nss-3.12.9.orig/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-01-08 06:42:38 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/sqlite/sqlite3.c	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/sqlite/sqlite3.c nss-3.13.6/mozilla/security/nss/lib/sqlite/sqlite3.c
+--- nss-3.13.6.orig/mozilla/security/nss/lib/sqlite/sqlite3.c	2010-01-08 06:42:38 +0100
++++ nss-3.13.6/mozilla/security/nss/lib/sqlite/sqlite3.c	2012-10-06 00:54:22 +0200
 @@ -10980,7 +10980,8 @@
  ** localtime_s().
  */
@@ -223,10 +223,10 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/sqlite/sq
  #define HAVE_LOCALTIME_S 1
  #endif
  
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.12.9/mozilla/security/nss/lib/ssl/sslimpl.h
---- nss-3.12.9.orig/mozilla/security/nss/lib/ssl/sslimpl.h	2010-07-31 06:33:52 +0200
-+++ nss-3.12.9/mozilla/security/nss/lib/ssl/sslimpl.h	2011-02-11 00:03:42 +0100
-@@ -1624,8 +1624,13 @@
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/ssl/sslimpl.h nss-3.13.6/mozilla/security/nss/lib/ssl/sslimpl.h
+--- nss-3.13.6.orig/mozilla/security/nss/lib/ssl/sslimpl.h	2012-02-15 22:52:08 +0100
++++ nss-3.13.6/mozilla/security/nss/lib/ssl/sslimpl.h	2012-10-06 00:54:22 +0200
+@@ -1657,8 +1657,13 @@
  #elif defined(_WIN32_WCE)
  #define SSL_GETPID GetCurrentProcessId
  #elif defined(WIN32)
@@ -240,9 +240,9 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/ssl/sslim
  #else
  #define SSL_GETPID() 0
  #endif
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.12.9/mozilla/security/nss/lib/zlib/config.mk
---- nss-3.12.9.orig/mozilla/security/nss/lib/zlib/config.mk	2009-11-07 02:13:10 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/zlib/config.mk	2011-02-11 00:03:42 +0100
+diff -ruN --strip-trailing-cr nss-3.13.6.orig/mozilla/security/nss/lib/zlib/config.mk nss-3.13.6/mozilla/security/nss/lib/zlib/config.mk
+--- nss-3.13.6.orig/mozilla/security/nss/lib/zlib/config.mk	2009-11-07 02:13:10 +0100
++++ nss-3.13.6/mozilla/security/nss/lib/zlib/config.mk	2012-10-06 00:54:22 +0200
 @@ -46,3 +46,11 @@
  PROGRAM        =
  
@@ -255,19 +255,3 @@ diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/zlib/conf
 +OS_LIBS += msvcrt_winxp.obj
 +endif
 +endif
-diff -ruN --strip-trailing-cr nss-3.12.9.orig/mozilla/security/nss/lib/zlib/gzio.c nss-3.12.9/mozilla/security/nss/lib/zlib/gzio.c
---- nss-3.12.9.orig/mozilla/security/nss/lib/zlib/gzio.c	2009-11-07 02:13:10 +0100
-+++ nss-3.12.9/mozilla/security/nss/lib/zlib/gzio.c	2011-02-11 00:03:42 +0100
-@@ -11,6 +11,12 @@
- 
- #include "zutil.h"
- 
-+#ifdef WINDDK_BUILD
-+#ifndef vsnprintf
-+#define vsnprintf _vsnprintf
-+#endif
-+#endif
-+
- #ifdef NO_DEFLATE       /* for compatibility with old definition */
- #  define NO_GZCOMPRESS
- #endif

win32/hexchat-xp.props

@@ -33,7 +33,7 @@
     <PythonOutput>hcpython</PythonOutput>
     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
-    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
+    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
     <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>
     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

win32/hexchat.props

@@ -35,7 +35,7 @@
     <PythonOutput>hcpython</PythonOutput>
     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>
     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>
-    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
+    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>
     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>
     <HexChatBuild>$(SolutionDir)build</HexChatBuild>
     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

win32/installer/hexchat-x64.skel.iss

@@ -197,6 +197,13 @@ Name: "{group}\Uninstall HexChat (x64)"; Filename: "{uninstallexe}"; Tasks: not
 BeveledLabel= HexChat
 
 [Code]
+/////////////////////////////////////////////////////////////////////
+procedure InitializeWizard;
+begin
+	WizardForm.LicenseAcceptedRadio.Checked := True;
+end;
+
+
 /////////////////////////////////////////////////////////////////////
 // these are required for x86->x64 or reverse upgrades
 /////////////////////////////////////////////////////////////////////

win32/installer/hexchat-x86.skel.iss

@@ -198,6 +198,13 @@ Name: "{group}\Uninstall HexChat (x86)"; Filename: "{uninstallexe}"; Tasks: not
 BeveledLabel= HexChat
 
 [Code]
+/////////////////////////////////////////////////////////////////////
+procedure InitializeWizard;
+begin
+	WizardForm.LicenseAcceptedRadio.Checked := True;
+end;
+
+
 /////////////////////////////////////////////////////////////////////
 // these are required for x86->x64 or reverse upgrades
 /////////////////////////////////////////////////////////////////////

win32/installer/hexchat-xp-x64.skel.iss

@@ -197,6 +197,13 @@ Name: "{group}\Uninstall HexChat (x64)"; Filename: "{uninstallexe}"; Tasks: not
 BeveledLabel= HexChat
 
 [Code]
+/////////////////////////////////////////////////////////////////////
+procedure InitializeWizard;
+begin
+	WizardForm.LicenseAcceptedRadio.Checked := True;
+end;
+
+
 /////////////////////////////////////////////////////////////////////
 // these are required for x86->x64 or reverse upgrades
 /////////////////////////////////////////////////////////////////////

win32/installer/hexchat-xp-x86.skel.iss

@@ -198,6 +198,13 @@ Name: "{group}\Uninstall HexChat (x86)"; Filename: "{uninstallexe}"; Tasks: not
 BeveledLabel= HexChat
 
 [Code]
+/////////////////////////////////////////////////////////////////////
+procedure InitializeWizard;
+begin
+	WizardForm.LicenseAcceptedRadio.Checked := True;
+end;
+
+
 /////////////////////////////////////////////////////////////////////
 // these are required for x86->x64 or reverse upgrades
 /////////////////////////////////////////////////////////////////////