Fixup

2015-04-08 06:27:07 -04:00 · 2015-04-07 20:08:42 -04:00 · 2015-04-07 10:46:43 -04:00 · 2015-04-07 10:20:46 -04:00
95 changed files with 3646 additions and 2802 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -54,8 +54,6 @@ src/common/textenums.h
 src/common/textevents.h
 src/fe-gtk/hexchat
 src/fe-gtk/hexchat.rc
-src/fe-gtk/resources.c
-src/fe-gtk/resources.h
 src/fe-text/hexchat-text
 src/htm/Main.resources
 src/htm/thememan.exe
@@ -72,11 +70,11 @@ stamp-h1
 *.po~
 *.pot
 *.patch
-tags
 src/**/*.plist
 # Win32 generated files
 plugins/wmpa/wmpa_h.h
 plugins/wmpa/wmpa_i.c
+src/fe-gtk/resources.c
 src/htm/obj/*
 win32/ipch/*
 win32/ext/perl/perl-x86-cache
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,12 @@
-sudo: false
 language: c
-cache: apt
 compiler: clang
+before_script:
+    - sudo apt-get update
+    - sudo apt-get build-dep -qq xchat
+    - sudo apt-get install -qq libnotify-dev libproxy-dev libpci-dev libcanberra-dev monodevelop gnome-common
 script: 
-    - ./autogen.sh --enable-textfe --with-theme-manager --enable-static-analysis
+    - ./autogen.sh
+    - ./configure --enable-textfe --with-theme-manager --enable-static-analysis
    - make V=1 -j$(nproc)
 notifications:
    irc:
@@ -12,23 +15,3 @@ notifications:
        on_success: change
 matrix:
     fast_finish: true
-addons:
-    apt:
-        packages:
-            - automake
-            - autoconf
-            - imagemagick
-            - intltool
-            - libcanberra-dev
-            - libdbus-glib-1-dev
-            - libglib2.0-dev
-            - libgtk2.0-dev
-            - libnotify-dev
-            - libpci-dev
-            - libperl-dev
-            - libproxy-dev
-            - libssl-dev
-            - libtool
-            - monodevelop
-            - mono-devel
-            - python-dev
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,4 +4,5 @@ ACLOCAL_AMFLAGS = -I m4

 SUBDIRS = po src plugins data

-EXTRA_DIST = autogen.sh Doxyfile readme.md
+EXTRA_DIST = autogen.sh data
+
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,24 +4,19 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

+NOCONFIGURE=1
+PKG_NAME="hexchat"
+
 (test -f $srcdir/src/common/hexchat.c) || {
-	echo -n "**Error**: Directory "\`$srcdir\'" does not look like the top-level directory"
+	echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+	echo " top-level $PKG_NAME directory"
 	exit 1
 }

-aclocal --install -I m4 || exit 1
-glib-gettextize --force --copy || exit 1
-intltoolize --force --copy --automake || exit 1
-autoreconf --force --install -Wno-portability || exit 1
+which gnome-autogen.sh || {
+	echo "You need to install gnome-common"
+	exit 1
+}

-if [ "$NOCONFIGURE" = "" ]; then
-        $srcdir/configure "$@" || exit 1
+. gnome-autogen.sh

-        if [ "$1" = "--help" ]; then exit 0 else
-                echo "Now type \`make\' to compile" || exit 1
-        fi
-else
-        echo "Skipping configure process."
-fi
-
-set +x
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.

 AC_INIT([HexChat],[2.11.0])

-AC_PREREQ([2.64])
+AC_PREREQ([2.60])
 AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])

 AC_CONFIG_HEADERS([config.h])
@@ -10,25 +10,20 @@ AC_CONFIG_SRCDIR([configure.ac])

 AC_CONFIG_MACRO_DIR([m4])

-AM_INIT_AUTOMAKE([1.11.1 dist-xz no-dist-gzip subdir-objects no-define foreign])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign])
 AM_SILENT_RULES([yes])

-AX_IS_RELEASE([minor-version])
-AX_CHECK_ENABLE_DEBUG([yes])
-AX_REQUIRE_DEFINED([PKG_PROG_PKG_CONFIG])
-
 AC_USE_SYSTEM_EXTENSIONS
-AM_MAINTAINER_MODE([enable])
+AM_MAINTAINER_MODE
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CPP
 AC_PROG_OBJC
 AM_PROG_AS
 AM_PROG_AR
-LT_PREREQ([2.2.6])
-LT_INIT([disable-static])
+AM_DISABLE_STATIC
+AC_PROG_LIBTOOL
 AC_PATH_PROG(MDTOOL, mdtool, no)
-PKG_PROG_PKG_CONFIG

 dnl -----------------------------------------------------------
 dnl Language Support
@@ -59,34 +54,34 @@ AH_VERBATIM([socklen_t],[#undef socklen_t])
 AH_VERBATIM([USE_DBUS],[#undef USE_DBUS])

 AC_PATH_PROG(sedpath, sed)
-AS_IF([test "_$sedpath" = _], [
+if test "_$sedpath" = _; then
 	AC_MSG_ERROR(Cannot find sed: I need it!)
-])
+fi

 AC_PATH_PROG(unamepath, uname)
-AS_IF([test "_$unamepath" = _], [
+if test "_$unamepath" = _; then
 	system="unknown"
-], [
+else
 	AC_MSG_CHECKING(system type)
 	system=`$unamepath -s`
 	AC_MSG_RESULT($system)
-	AS_IF([test "$system" = "Linux"], [
+	if test "$system" = "Linux"; then
 		AC_DEFINE(USING_LINUX)
-	], [test "$system" = "FreeBSD"], [
+	fi
+	if test "$system" = "FreeBSD"; then
 		AC_DEFINE(USING_FREEBSD)
-	])
-])
+	fi
+fi

 platform_win32=no
 platform_osx=no
-AS_CASE([$host_os],
-	[*mingw*|*cygwin*|*msys*], [
-		platform_win32=yes
-	],
-	[darwin*], [
-		platform_osx=yes
-	]
-)
+case $host_os in
+	*mingw*|*cygwin*|*msys*)
+		platform_win32=yes;;
+	darwin*)
+		platform_osx=yes;;
+	*);;
+esac

 dnl *********************************************************************
 dnl ** configure switches ***********************************************
@@ -157,6 +152,10 @@ AC_ARG_ENABLE(isocodes,
 	[AS_HELP_STRING([--disable-isocodes],[disable iso-codes with spell-check])],
        isocodes=$enableval, isocodes=yes)

+AC_ARG_ENABLE(minimal-flags,
+	[AS_HELP_STRING([--enable-minimal-flags],[only add those CFLAGS that are really needed or not intrusive (default: no)])],
+        minimalflags=$enableval, minimalflags=no)
+
 AC_ARG_ENABLE(static-analysis,
 	[AS_HELP_STRING([--enable-static-analysis],[if using clang run static analysis during build (default: no)])],
        analyze=$enableval, analyze=no)
@@ -170,11 +169,11 @@ AC_ARG_WITH(theme-manager,
 dnl *********************************************************************
 dnl ** THEME-MANAGER ****************************************************
 dnl *********************************************************************
-AS_IF([test "x$theme_manager" != "xno"], [
-	AS_IF([test "x$MDTOOL" = "xno"], [
+if test "x$theme_manager" != "xno" ; then
+	if test "x$MDTOOL" = "xno"; then
 		AC_MSG_ERROR([No "mdtool" found, you need to install monodevelop!])
-	])
-])
+	fi
+fi


 dnl *********************************************************************
@@ -191,112 +190,144 @@ dnl *********************************************************************
 dnl ** GTK **************************************************************
 dnl *********************************************************************

-AS_IF([test "$gtkfe" = yes], [
+if test "$gtkfe" = yes ; then
 	PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.24.0], [
 		GUI_LIBS="$GUI_LIBS $GTK_LIBS"
 		GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED"
 	], [
 		gtkfe=no
 	])
-])
+fi

 dnl *********************************************************************
 dnl ** MAC_INTEGRATION **************************************************
 dnl *********************************************************************

 _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
-AS_IF([test "x$_gdk_tgt" = xquartz], [
-	PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk2, [
-		GUI_LIBS="$GUI_LIBS $GTK_MAC_LIBS"
-		GUI_CFLAGS="$GUI_CFLAGS $GTK_MAC_CFLAGS"
-		AC_DEFINE(HAVE_GTK_MAC)
-	])
-])
+if test "x$_gdk_tgt" = xquartz; then
+		PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk2, [
+			GUI_LIBS="$GUI_LIBS $GTK_MAC_LIBS"
+			GUI_CFLAGS="$GUI_CFLAGS $GTK_MAC_CFLAGS"
+			AC_DEFINE(HAVE_GTK_MAC)
+		])
+fi

 dnl *********************************************************************
 dnl ** PERL *************************************************************
 dnl *********************************************************************

-AS_IF([test "$perl" = yes], [
+if test "$perl" = yes; then
 	AC_MSG_CHECKING(for plugin interface used by Perl)
-	AS_IF([test "$plugin" = yes], [
+	if test "$plugin" = yes; then
 		AC_MSG_RESULT([yes])
-
-		AX_PERL_EXT_FLAGS([PERL_CFLAGS], [PERL_LDFLAGS])
-		original_cflags="$CFLAGS"
-		original_ldflags="$LDFLAGS"
-		CFLAGS="$PERL_CFLAGS"
-		LDFLAGS="$PERL_LDFLAGS"
-		AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-				#define PERL_NO_INLINE_FUNCTIONS
-				#include <EXTERN.h>
-				#include <perl.h>
-			]], [[]])],[perl_is_usable=yes],[perl_is_usable=no])
-		CFLAGS="$original_cflags"
-		LDFLAGS="$original_ldflags"
-		AS_IF([test "$perl_is_usable" = "no"], [
-			AC_MSG_WARN([perl test failed to compile, disabling])
+		AC_PATH_PROG(perlpath, perl)
+		AC_MSG_CHECKING(for Perl compile flags)
+		PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
+		if test "_$PERL_CFLAGS" = _ ; then
+			AC_MSG_RESULT([not found, building without perl.])
 			perl=no
-		], [
-			AC_MSG_CHECKING([if perl plugin will be backward compatible])
-			AS_IF([test "$perl_old" = "yes"], [
-				  AC_MSG_RESULT([yes])
-				  AC_DEFINE(OLD_PERL)
-			], [
-				  AC_MSG_RESULT([no])
-			])
-		])
-	], [
+		else
+			PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts |$sedpath 's/-lgdbm //'`
+			PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
+			PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
+			if test "$system" = "Linux"; then
+				PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
+				PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
+			fi
+			PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
+			AC_MSG_RESULT(ok)
+
+			AC_MSG_CHECKING(for perl >= 5.8.0)
+			PERL_VER=`$perlpath -e 'print $]>= 5.008?"yes":"no"'`
+			if test "$PERL_VER" = "yes"; then
+				original_cflags="$CFLAGS"
+				original_ldflags="$LDFLAGS"
+				CFLAGS="$PERL_CFLAGS"
+				LDFLAGS="$PERL_LDFLAGS"
+				AC_TRY_LINK([
+						#define PERL_NO_INLINE_FUNCTIONS
+						#include <EXTERN.h>
+						#include <perl.h>
+					], [], perl_is_usable=yes, perl_is_usable=no)
+				CFLAGS="$original_cflags"
+				LDFLAGS="$original_ldflags"
+				if test x$perl_is_usable = xno ; then
+					AC_MSG_RESULT(no)
+					perl=no
+				else
+					AC_MSG_RESULT(yes)
+					AC_MSG_CHECKING(if perl plugin will be backward compatible)
+					if test "$perl_old" = "yes"; then
+							  AC_MSG_RESULT(yes)
+							  AC_DEFINE(OLD_PERL)
+					else
+							  AC_MSG_RESULT(no)
+					fi
+				fi
+			else
+				AC_MSG_RESULT(no)
+				echo "perl version too old, building without perl."
+				perl=no
+			fi
+		fi
+	else
 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Perl])
 		perl=no
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** PYTHON ***********************************************************
 dnl *********************************************************************

-AS_IF([test "x$python" != xno], [
+if test "x$python" != xno ; then
 	AC_MSG_CHECKING(for plugin interface used by Python)
-	AS_IF([test "$plugin" = yes], [
+	if test "$plugin" = yes; then
 		AC_MSG_RESULT([yes])
-		AS_CASE([$python],
+		case $python in
 			dnl set python2 default here
-			[python2], [
-				PYTHON_VERSION=2
-				AX_PYTHON_DEVEL([>= '2.7'])
-			],
+			python2)
+				PKG_CHECK_MODULES([PY], [python-2.7],
+								  [PY_VER="`$PKG_CONFIG --modversion python-2.7`"],
+								  [true])
+				;;
 			dnl set python3 default here
-			[python3], [
-				PYTHON_VERSION=3
-				AX_PYTHON_DEVEL([>= '3.3'])
-			],
+			python3)
+				PKG_CHECK_MODULES([PY], [python-3.4],
+								  [PY_VER="`$PKG_CONFIG --modversion python-3.4`"],
+								  [true])
+				if test "$PY_VER" = "" ; then
+					PKG_CHECK_MODULES([PY], [python-3.3],
+									  [PY_VER="`$PKG_CONFIG --modversion python-3.3`"],
+									  [true])
+				fi
+				;;
 			dnl add broken versions here
-			[python2.5|python2.6|python3.1|python3.2], [
-				AC_MSG_WARN(Unsupported Python version ${python}!)
-			],
-			dnl user supplied version
-			[python*], [
-				PYTHON_VERSION="${python#python}"
-				AX_PYTHON_DEVEL()
-			],[
+			python2.5|python2.6|python3.1|python3.2)
+				AC_MSG_WARN(Unsupported Python version ${python}!);;
+			python*)
+				python="python-${python#python}" # stay posix compliant
+				PKG_CHECK_MODULES([PY], [${python}],
+								  [PY_VER="`$PKG_CONFIG --modversion ${python}`"],
+								  [AC_MSG_WARN(Cannot find "${python}.pc"!)])
+				;;
+			*)
 				AC_MSG_WARN(Unsupported Python ${python}!)
-			]
-		)
+		esac
 		AC_MSG_CHECKING(Python version)

-		AS_IF([test "$ac_python_version" != ""], [
-			AC_MSG_RESULT($ac_python_version)
-			python="python-${ac_python_version}"
-		], [
+		if test "$PY_VER"; then
+			AC_MSG_RESULT($PY_VER)
+			python="python-${PY_VER}"
+		else
 			AC_MSG_RESULT(Not found)
 			python=no
-		])
-	], [
+		fi
+	else
 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Python])
 		python=no
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** IPv6 *************************************************************
@@ -314,173 +345,177 @@ AC_CHECK_LIB(socket, select)

 AC_CHECK_FUNCS(getaddrinfo, have_getaddrinfo=yes)
 AC_MSG_CHECKING(whether IPv6 is supported)
-AS_IF([test "$have_getaddrinfo" = yes], [
+if test "$have_getaddrinfo" = yes; then
 	AC_MSG_RESULT(yes)
-], [
+else
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR(ipv6 support not found!)
-])
+fi

 dnl *********************************************************************
 dnl ** OPENSSL **********************************************************
 dnl *********************************************************************

-
-AS_IF([test "$openssl" != no], [
+retry=no
+if test "$openssl" != no; then
 	PKG_CHECK_MODULES(OPENSSL, [openssl], [
 		AC_DEFINE(USE_OPENSSL)
 		openssl=yes
 		COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
 		COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS"
 	], [
-		unset openssl_path ac_cv_lib_ssl_SSL_new ac_cv_header_openssl_ssl_h
-		AS_IF([test "$openssl" != yes], [
-			openssl_path=$openssl
-		])
-		openssl=no
-		OPENSSL_LIBS="-lcrypto"
-		AS_IF([test -n "$openssl_path"], [
-			OPENSSL_LIBS="-L$openssl_path/lib $OPENSSL_LIBS"
-		])
-		SAVED_LIBS=$LIBS
-		LIBS="$LIBS $OPENSSL_LIBS"
-		AC_CHECK_LIB(ssl, SSL_new, [
-			AS_IF([test -n "$openssl_path"], [
-				OPENSSL_CFLAGS="-I$openssl_path/include"
-			])
-			SAVED_CFLAGS=$CFLAGS
-			CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
-			AC_CHECK_HEADERS(openssl/ssl.h, [
-				openssl=yes
-				AC_DEFINE(USE_OPENSSL)
-				OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
-
-				COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
-				COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS"
-			])
-			CFLAGS=$SAVED_CFLAGS
-		])
-		LIBS=$SAVED_LIBS
+		retry=yes
 	])
-])
+fi
+
+if test "$retry" = "yes"; then
+	unset openssl_path ac_cv_lib_ssl_SSL_new ac_cv_header_openssl_ssl_h
+	if test "$openssl" != yes; then
+		openssl_path=$openssl
+	fi
+	openssl=no
+	OPENSSL_LIBS="-lcrypto"
+	if test -n "$openssl_path"; then
+		OPENSSL_LIBS="-L$openssl_path/lib $OPENSSL_LIBS"
+	fi
+	SAVED_LIBS=$LIBS
+	LIBS="$LIBS $OPENSSL_LIBS"
+	AC_CHECK_LIB(ssl, SSL_new, [
+		if test -n "$openssl_path"; then
+			OPENSSL_CFLAGS="-I$openssl_path/include"
+		fi
+		SAVED_CFLAGS=$CFLAGS
+		CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+		AC_CHECK_HEADERS(openssl/ssl.h, [
+			openssl=yes
+			AC_DEFINE(USE_OPENSSL)
+			OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
+
+			COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
+			COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS"
+		])
+		CFLAGS=$SAVED_CFLAGS
+	])
+	LIBS=$SAVED_LIBS
+fi

 dnl *********************************************************************
 dnl ** LIBPROXY *********************************************************
 dnl *********************************************************************

-AS_IF([test "x$libproxy" = "xyes" -o "x$libproxy" = "xauto"], [
+if test "x$libproxy" = "xyes" -o "x$libproxy" = "xauto" ; then
 	PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [
 		COMMON_LIBS="$COMMON_LIBS $LIBPROXY_LIBS"
 		COMMON_CFLAGS="$COMMON_CFLAGS $LIBPROXY_CFLAGS"
 		AC_DEFINE(USE_LIBPROXY)
 		libproxy=yes
 	], [
-		AS_IF([test "x$libproxy" = "xyes"], [
+		if test "x$libproxy" = "xyes" ; then
 			AC_MSG_ERROR(Cannot find libproxy!)
-		])
+		fi
 		libproxy=no
 	])
-], [
+else
 	libproxy=no
-])
+fi

 dnl *********************************************************************
 dnl ** PLUGIN ***********************************************************
 dnl *********************************************************************

-AS_IF([test "$plugin" = yes], [
+if test "$plugin" = yes; then
 	AC_DEFINE(USE_PLUGIN)
 	PLUGIN_LDFLAGS="-avoid-version"
-	AS_IF([test "$platform_win32" = yes], [
+	if test "$platform_win32" = yes; then
 		PLUGIN_LDFLAGS="$PLUGIN_LDFLAGS -no-undefined"
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** Checksum *********************************************************
 dnl *********************************************************************

-AS_IF([test "$checksum" != "no"], [
+if test "$checksum" != "no"; then
 	checksum=no
 	AC_MSG_CHECKING(for plugin interface used by Checksum)
-	AS_IF([test "$plugin" = yes], [
+	if test "$plugin" = yes; then
 		checksum=yes
 		AC_MSG_RESULT([yes])
-	], [
+	else
 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option])
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** DO AT ************************************************************
 dnl *********************************************************************

-AS_IF([test "$doat" != "no"], [
+if test "$doat" != "no"; then
 	AC_MSG_CHECKING(for plugin interface used by Do At)
 	doat=no
-	AS_IF([test "$plugin" = yes], [
+	if test "$plugin" = yes; then
 		doat=yes
 		AC_MSG_RESULT([yes])
-	], [
+	else
 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Do At])
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** FiSHLiM **********************************************************
 dnl *********************************************************************

-AS_IF([test "$fishlim" != "no"], [
+if test "$fishlim" != "no"; then
 	fishlim=no
 	AC_MSG_CHECKING(for plugin interface used by FiSHLiM)
-	AS_IF([test "$plugin" = yes], [
+	if test "$plugin" = yes; then
 		AC_MSG_RESULT([yes])
 		AC_MSG_CHECKING(for OpenSSL used by FiSHLiM)
-		AS_IF([test "$openssl" = yes], [
+		if test "$openssl" = yes; then
 			fishlim=yes
 			AC_MSG_RESULT([yes])
-		], [
+		else
 			AC_MSG_RESULT([OpenSSL cannot be found, use the --enable-openssl option])
-		])
-	], [
+		fi
+	else
 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option])
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** SYSINFO **********************************************************
 dnl *********************************************************************

-AS_IF([test "$sysinfo" != "no"], [
+if test "$sysinfo" != "no"; then
 	AC_MSG_CHECKING(for plugin interface used by SysInfo)
-	AS_IF([test "$plugin" = yes], [
+	if test "$plugin" = yes; then
 		AC_MSG_RESULT([yes])
-		AS_IF([test "$platform_osx" = yes], [
+		if test "$platform_osx" = yes; then
 			sysinfo=yes
-		], [
+		else
 			PKG_CHECK_MODULES(LIBPCI, libpci >= 3.0.0, [
 				sysinfo=yes
 				AC_DEFINE(HAVE_LIBPCI)
 			], [sysinfo=no])
-		])
-	], [
+		fi
+	else
 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SysInfo])
 		sysinfo=no
-	])
-])
+	fi
+fi

 dnl #######################################################################
 dnl # Check for DBUS libraries
 dnl #######################################################################

-AS_IF([test "x$dbus" = "xyes"], [
+if test "x$dbus" = "xyes" ; then
 	PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60 gthread-2.0], dbus=yes, [
 		dbus=no
 	])
 	AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
-	AS_IF([test "x$DBUS_BINDING_TOOL" = "xno" || test "x$dbus" = "xno"], [
+	if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$dbus" = "xno" ; then
 		dbus="no"
-	], [
+	else
 		COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS"
 		COMMON_CFLAGS="$COMMON_CFLAGS $DBUS_CFLAGS"
 		AC_DEFINE(USE_DBUS)
@@ -488,44 +523,44 @@ AS_IF([test "x$dbus" = "xyes"], [
 		AS_AC_EXPAND(DBUS_SERVICES_DIR, "$datadir/dbus-1/services")
 		AC_SUBST(DBUS_SERVICES_DIR)
 		AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir for DBUS is])
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** LIBNOTIFY ********************************************************
 dnl *********************************************************************

-AS_IF([test "x$libnotify" = "xyes"], [
+if test "x$libnotify" = "xyes" ; then
 	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [
 		libnotify=no
 	])
-	AS_IF([test "$libnotify" != "no"], [
+	if test "$libnotify" != "no" ; then
 		GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS"
 		GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS"
 		AC_DEFINE(USE_LIBNOTIFY)
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** LIBCANBERRA ******************************************************
 dnl *********************************************************************

-AS_IF([test "x$libcanberra" = "xyes"], [
+if test "x$libcanberra" = "xyes" ; then
 	PKG_CHECK_MODULES(LIBCANBERRA, libcanberra >= 0.22, [], [
 		libcanberra=no
 	])
-	AS_IF([test "$libcanberra" != "no"], [
+	if test "$libcanberra" != "no" ; then
 		COMMON_LIBS="$COMMON_LIBS $LIBCANBERRA_LIBS"
 		COMMON_CFLAGS="$COMMON_CFLAGS $LIBCANBERRA_CFLAGS"
 		AC_DEFINE(USE_LIBCANBERRA)
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** SPELL ************************************************************
 dnl *********************************************************************

-AS_IF([test "x$isocodes" = "xyes"], [
+if test "x$isocodes" = "xyes" ; then
 	PKG_CHECK_MODULES(ISOCODES, "iso-codes", [
 		iso_codes_prefix=`$PKG_CONFIG --variable=prefix iso-codes 2>/dev/null || echo /usr`
    	AC_MSG_NOTICE([iso-codes prefix: $iso_codes_prefix])
@@ -536,18 +571,18 @@ AS_IF([test "x$isocodes" = "xyes"], [
    	isocodes=no
    	AC_MSG_WARN(iso-codes not found!)
    ])
-])
+fi

 dnl *********************************************************************
 dnl ** Static Analysis **************************************************
 dnl *********************************************************************

-AS_IF([test "x$analyze" = "xyes"], [
-	AS_IF([test "$CC" != "clang"], [
+if test "x$analyze" = "xyes"; then
+	if test "$CC" != "clang"; then
 		AC_MSG_WARN(CC is not clang for static analysis)
 		analyze=no
-	])
-])
+	fi
+fi

 dnl *********************************************************************
 dnl ** CONDITIONALS *****************************************************
@@ -576,6 +611,11 @@ dnl *********************************************************************
 dnl ** CFLAGS ***********************************************************
 dnl *********************************************************************

+dnl these flags might be unwanted
+if test x$minimalflags != xyes; then
+	CC_CHECK_FLAGS_APPEND([CFLAGS], [CFLAGS], [-g])
+fi
+
 CC_CHECK_FLAGS_APPEND([CFLAGS], [CFLAGS], [ \
 	-pipe \
 	-funsigned-char \
@@ -597,12 +637,16 @@ dnl *********************************************************************
 AC_MSG_CHECKING(for modern sigaction)
 dnl libc5 on linux and FreeBSD 3.x doesn\'t have siginfo_t
 dnl and the sa_sigation field.
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <signal.h>]], [[struct sigaction act;
+AC_TRY_COMPILE(
+	[#include <signal.h>],
+	[struct sigaction act;
 	 siginfo_t *si;
-	 act.sa_sigaction = 0;]])],[
+	 act.sa_sigaction = 0;],
+	[
 		AC_MSG_RESULT(yes)
 		AC_DEFINE(USE_SIGACTION) 
-	],[AC_MSG_RESULT(no)])
+	],
+	AC_MSG_RESULT(no))

 AC_CHECK_FUNCS(memrchr)

@@ -626,9 +670,9 @@ AC_EGREP_CPP([socklen_t[^a-zA-Z_0-9]], [#include <sys/types.h>
 ac_cv_type_socklen_t=yes,
 ac_cv_type_socklen_t=no)
 ])
-AS_IF([test $ac_cv_type_socklen_t = no], [
+if test $ac_cv_type_socklen_t = no; then
 	AC_DEFINE(socklen_t, int)
-])
+fi

 dnl Mac OS X and Darwin use lookupd, which caches DNS queries by default
 AC_EGREP_CPP(lookupd, dnl
@@ -648,8 +692,8 @@ AC_SUBST(COMMON_LIBS)
 AC_SUBST(COMMON_CFLAGS)
 AC_SUBST(PERL_CFLAGS)
 AC_SUBST(PERL_LDFLAGS)
-AC_SUBST(PYTHON_CPPFLAGS)
-AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PY_CFLAGS)
+AC_SUBST(PY_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 AC_SUBST(OPENSSL_LIBS)
@@ -659,12 +703,8 @@ AC_SUBST(PLUGIN_LDFLAGS)
 m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig))

 dnl for plugin.c and pixmaps.c
-AS_IF([test "x$prefix" = xNONE], [
-	prefix="$ac_default_prefix"
-])
-AS_IF([test "x$exec_prefix" = xNONE], [
-	exec_prefix="$prefix"
-])
+test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+test "x$exec_prefix" = xNONE && exec_prefix="$prefix"

 AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")

@@ -729,8 +769,6 @@ echo Do At ................. : $doat
 echo FiSHLiM ............... : $fishlim
 echo SysInfo ............... : $sysinfo
 echo
-echo Debug mode ............ : $enable_debug
-echo
 echo The binary will be installed in $prefix/bin
 echo

--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,6 +3,3 @@ SUBDIRS = pkgconfig man
 if DO_GTK
 SUBDIRS += icons misc
 endif
-
-EXTRA_DIST = \
-	hexchat.gresource.xml
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -11,5 +11,3 @@ install-data-hook:

 uninstall-hook:
 	$(UPDATE_ICON_CACHE);
-
-EXTRA_DIST = $(icon_DATA) $(hicolor_DATA)
--- a/data/icons/hexchat-shadowless.svg
+++ b/data/icons/hexchat-shadowless.svg
@@ -1,63 +1,745 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- height="64"
- width="64">
-  <metadata>
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="hexchat.svg"
+   version="1.0"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2289">
+      <stop
+         style="stop-color:#ff2600;stop-opacity:1;"
+         offset="0"
+         id="stop2291" />
+      <stop
+         style="stop-color:#ffd600;stop-opacity:1;"
+         offset="1"
+         id="stop2293" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1317"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1319"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1320"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-160.10656,-7.1914058)"
+       x1="130.2673"
+       y1="78.743134"
+       x2="129.2081"
+       y2="25.771122" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3011"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3030"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3070"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientTransform="matrix(0.99894925,0,0,0.97549134,-3.1829063,4.465557)" />
+    <filter
+       id="filter3281"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3283"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3285"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3287"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3289"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3291"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3293"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3295"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3297"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3299"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3301"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3303"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4089"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4093"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4096"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4098"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientTransform="translate(-70.003571,-2.298097)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient4101"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94969205,0,0,0.89326813,1.6716955,2.7025635)"
+       x1="31.372862"
+       y1="60.111893"
+       x2="31.559002"
+       y2="5.6897221" />
+    <filter
+       id="filter4111"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4113"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4115"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4117"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4119"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4121"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter4123"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4125"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4127"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4129"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4131"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4133"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1330"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1328"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1322-5"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1320-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1319-2"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1317-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1337-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1335-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2289-4">
+      <stop
+         id="stop2291-0"
+         offset="0"
+         style="stop-color:#ff2600;stop-opacity:1;" />
+      <stop
+         id="stop2293-9"
+         offset="1"
+         style="stop-color:#ffd600;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,7.3477348,6.9450134)"
+       x1="46.881573"
+       y1="91.824585"
+       x2="47.225189"
+       y2="1.5596932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3136"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,-120.3871,-29.360443)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <filter
+       id="filter3138"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3140"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3142"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3144"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3146"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3148"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3670"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3672"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3674"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3676"
+         in="composite"
+         stdDeviation="1.5"
+         result="blur" />
+      <feOffset
+         id="feOffset3678"
+         dx="0"
+         dy="4"
+         result="offset" />
+      <feComposite
+         id="feComposite3680"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3682" />
+      <feFlood
+         id="feFlood3684"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         id="feComposite3686"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3688"
+         in="composite"
+         stdDeviation="1.5"
+         result="blur" />
+      <feOffset
+         id="feOffset3690"
+         dx="0"
+         dy="2"
+         result="offset" />
+      <feComposite
+         id="feComposite3692"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3706" />
+      <feFlood
+         id="feFlood3708"
+         flood-opacity="0.2"
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         id="feComposite3710"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3712"
+         in="composite"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset3714"
+         dx="0"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3716"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3123" />
+      <feFlood
+         id="feFlood3125"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         id="feComposite3127"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3129"
+         in="composite"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset3131"
+         dx="0"
+         dy="2"
+         result="offset" />
+      <feComposite
+         id="feComposite3133"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3135"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3137"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3139"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3141"
+         in="composite"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset3143"
+         dx="0"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3145"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3183"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3185"
+         flood-opacity="0.3"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3187"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3189"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3191"
+         dx="0"
+         dy="2"
+         result="offset" />
+      <feComposite
+         id="feComposite3193"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9999999"
+     inkscape:cx="61.011203"
+     inkscape:cy="36.086679"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1270"
+     inkscape:window-height="837"
+     inkscape:window-x="287"
+     inkscape:window-y="27"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
    <rdf:RDF>
-      <cc:Work>
+      <cc:Work
+         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
        <dc:creator>
          <cc:Agent>
            <dc:title>Guglielmi David</dc:title>
          </cc:Agent>
        </dc:creator>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
        <dc:rights>
          <cc:Agent>
            <dc:title>Peter Zelezny</dc:title>
          </cc:Agent>
        </dc:rights>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Samuel Messner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
      </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:requires rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires rdf:resource="http://web.resource.org/cc/SourceCode" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
      </cc:License>
    </rdf:RDF>
  </metadata>
-  <defs>
-    <linearGradient id="hexchatGradient" x1="0" y1="1" x2="0" y2="0">
-      <stop id="hgRedStop" offset="0" style="stop-color: #FF2600; stop-opacity: 1;" />
-      <stop id="hgYellowStop" offset="1" style="stop-color: #FFD600; stop-opacity: 1;" />
-    </linearGradient>
-    <filter inkscape:collect="always" id="dropshadow">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="1.9736701" id="dropshadowGaussian" />
-    </filter>
-  </defs>
-  <path
-   style="fill: #000000; fill-opacity: 1;"
-   d="m 31.62506,4.4248023 c -7.285288,0.0713 -14.595323,0.526836 -15.96875,1.3125 C 12.909458,7.3086297 -0.0321942,29.523731 6.0185229e-5,32.612303 0.0323162,35.700876 13.470952,57.688808 16.25006,59.206053 c 2.779105,1.517245 29.159399,1.258827 31.90625,-0.3125 2.746852,-1.571328 15.688504,-23.786428 15.65625,-26.875 C 63.7803,28.929981 50.372918,6.9107967 47.59381,5.3935523 46.204258,4.6349293 38.910347,4.3535003 31.62506,4.4248023 z m -0.1875,9.2500007 c 3.386631,-0.03246 6.676687,0.05409 8.75,0.28125 l -8.71875,9.71875 -9.0625,-9.5 c 2.055746,-0.283043 5.521157,-0.466366 9.03125,-0.5 z m 17.34375,9.84375 c 2.298293,3.744897 4.302354,7.392556 4.3125,8.34375 0.01126,1.055883 -2.358157,5.507241 -4.875,9.6875 l -9.03125,-8.03125 z m -34.46875,0.25 8.75,9.75 -8.1875,7.875 c -2.482342,-3.992634 -4.707927,-8.110307 -4.71875,-9.125 -0.01021,-0.95736 1.927117,-4.687748 4.15625,-8.5 z m 17.15625,16.90625 9.8125,9.21875 c -4.111037,0.67314 -16.108253,0.781873 -19.46875,0.125 z"
-   id="outline"
-   sodipodi:nodetypes="ssssssssscccscsccccccsccccc" />
-  <path
-   style="fill: url(#hexchatGradient); fill-opacity: 1;"
-   d="m 31.25006,6.4873027 c -6.857093,0.06521 -13.707297,0.469014 -15,1.1875 -2.585405,1.4369712 -14.780358,21.7692653 -14.75,24.5937503 0.03036,2.824486 12.665486,22.924987 15.28125,24.3125 2.615763,1.387513 27.445846,1.186972 30.03125,-0.25 2.585405,-1.436972 14.780359,-21.769265 14.75,-24.59375 C 61.5322,28.912818 48.897074,8.7810649 46.28131,7.3935527 44.973429,6.6997957 38.107152,6.4220967 31.25006,6.4873027 z m 0.0625,5.0625003 c 5.36199,-0.05245 10.696035,0.19201 11.71875,0.75 0.06132,0.03346 0.143803,0.127745 0.21875,0.1875 l -11.28125,12.59375 -0.5,0.53125 -0.46875,-0.53125 -11.75,-12.3125 c 0.10903,-0.09884 0.228263,-0.201843 0.3125,-0.25 1.010846,-0.577879 6.38801,-0.916306 11.75,-0.96875 z m 18.0625,9.46875 c 2.883844,4.661341 5.612556,9.652893 5.625,10.84375 0.01348,1.290331 -3.064699,7.087557 -6.09375,12.09375 l -11.09375,-9.90625 -0.53125,-0.46875 0.5,-0.46875 11.59375,-12.09375 z m -35.78125,0.03125 10.84375,12.0625 0.4375,0.46875 -0.46875,0.4375 -10.28125,9.90625 c -3.04689,-4.86606 -6.049362,-10.36778 -6.0625,-11.625 -0.01271,-1.216102 2.689239,-6.451996 5.53125,-11.25 z m 17.875,17.78125 0.4375,0.4375 12.34375,11.59375 c -0.318014,0.365376 -0.587006,0.638955 -0.78125,0.75 -2.02169,1.155758 -21.423322,1.397228 -23.46875,0.28125 -0.228202,-0.124506 -0.601742,-0.47821 -1,-0.9375 l 12,-11.6875 0.46875,-0.4375 z"
-   id="coloredX" />
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3663">
+      <path
+         style="fill:#000000;fill-opacity:1;"
+         d="m 31.404792,8.7464684 c -6.271873,0.05843 -12.553,0.431777 -13.735377,1.075609 C 15.304661,11.109737 4.1505773,29.32852 4.1783444,31.859522 c 0.02777,2.531005 11.5871596,20.543967 13.9796816,21.787309 2.392519,1.243342 25.106,1.037521 27.470753,-0.250141 C 47.993531,52.109028 59.147618,33.890246 59.119851,31.359242 59.092081,28.828238 47.532689,10.790262 45.140167,9.5469214 43.943907,8.9252504 37.676665,8.6880384 31.404792,8.7464684 z m 0.05429,4.5275596 c 4.90437,-0.047 9.786849,0.175368 10.722281,0.67538 1.870861,1.000021 10.917726,15.499216 10.939439,17.534904 C 53.142512,33.52 44.410541,48.158649 42.561393,49.194315 40.712245,50.229983 22.960549,50.419464 21.089689,49.419444 19.218826,48.419423 10.199106,33.920226 10.177392,31.884537 10.155682,29.84885 18.860508,15.185189 20.709656,14.14952 c 0.924575,-0.517833 5.845056,-0.828498 10.749425,-0.875492 z"
+         id="path4107"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.97890109,0,0,0.98965389,0.52623659,-1.3159842)"
+         style="fill:#000000;fill-opacity:1;"
+         d="M 31.801142,5.3887159 C 24.358829,5.4607629 16.905535,5.9211193 15.502506,6.7149966 12.696449,8.3027513 -0.53918189,30.767467 -0.50623228,33.888328 -0.47328049,37.00919 13.243292,59.220118 16.0823,60.753225 18.921305,62.286332 45.873514,62.032541 48.67957,60.444787 51.485627,58.857032 64.721258,36.392315 64.688309,33.271454 64.655357,30.150593 50.938784,7.9088218 48.099776,6.3757155 46.680274,5.6091623 39.243454,5.3166688 31.801142,5.3887159 z m 0.06442,5.5827171 c 5.81961,-0.05795 11.613244,0.216241 12.723243,0.83278 2.219996,1.233079 12.955163,19.111349 12.980929,21.621461 0.02577,2.51011 -10.335747,20.560333 -12.529979,21.837366 -2.19423,1.277031 -23.2587,1.510671 -25.478697,0.277592 C 17.341063,54.307554 6.638107,36.429283 6.6123418,33.919173 6.5865755,31.409062 16.915878,13.327995 19.110109,12.050964 20.207224,11.412447 26.045952,11.02938 31.865563,10.971433 z"
+         id="path4103"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:transform-center-y="2.25"
+         inkscape:transform-center-x="2.25"
+         style="fill:url(#linearGradient3133);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31593215000000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;"
+         d="m 10.723737,18.285684 7.623916,-7.935243 13.238019,13.886676 12.492701,-13.886676 8.576909,7.935243 -14.294847,14.878584 13.341856,11.902864 -6.670928,6.94334 L 31.585672,39.351071 18.573785,52.010472 11.676724,45.086347 24.065591,33.164268 10.723737,18.285684 z"
+         id="path2297"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3305"
+         d="M 31.293607,6.0952825 C 24.436514,6.1604875 17.569304,6.5771256 16.276601,7.2956116 13.691196,8.7325834 1.4963386,29.063913 1.5266972,31.888398 1.5570579,34.712884 14.195039,54.814527 16.810803,56.20204 19.426566,57.589553 44.25941,57.359866 46.844814,55.922894 49.430219,54.485922 61.625078,34.154591 61.594719,31.330106 61.564358,28.505621 48.926376,8.3760634 46.310612,6.9885506 45.002731,6.294794 38.150699,6.0300774 31.293607,6.0952825 z m 0.05936,5.0525485 c 5.36199,-0.05245 10.700046,0.195704 11.722761,0.753694 2.045429,1.115978 11.936445,17.296419 11.960184,19.568154 0.02374,2.271736 -9.523004,18.6078 -11.544693,19.763557 -2.02169,1.155758 -21.429773,1.36721 -23.475201,0.251232 C 17.970585,50.368491 8.1092472,34.188049 8.085508,31.916313 8.061768,29.644577 17.578834,13.2806 19.600523,12.124842 c 1.010846,-0.577879 6.39045,-0.924567 11.75244,-0.977011 z"
+         style="fill:url(#linearGradient4101);fill-opacity:1;" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3077"
+         d="M 14.640198,55.682743 C 9.6971439,47.360612 2.8950957,35.733851 2.9419881,35.686959 c 0.031272,-0.03127 0.5023581,0.289334 1.0468575,0.712459 0.5444994,0.423125 1.0414462,0.769317 1.1043264,0.769317 0.06288,0 2.6329414,4.276521 5.711247,9.50338 l 5.59692,9.503379 2.159128,0.007 2.159126,0.007 -0.34365,-0.584653 C 20.186937,55.28323 17.303514,50.518786 13.968339,45.017137 10.633164,39.515488 7.9043842,34.929294 7.9043842,34.825595 c 0,-0.103699 0.2455542,-0.59277 0.545676,-1.086823 0.3001218,-0.494053 0.545676,-0.941721 0.545676,-0.994816 0,-0.05309 -0.2788317,-0.09654 -0.619626,-0.09654 -0.8505388,0 -1.0953557,-0.488405 -1.0953557,-2.185211 0,-1.90734 -0.048411,-1.868066 2.30512,-1.870072 l 1.9823345,-0.0017 1.052375,-1.721616 c 0.578806,-0.94689 1.052375,-1.785869 1.052375,-1.8644 0,-0.07853 -0.829918,-0.162484 -1.844262,-0.186561 l -1.8442631,-0.04378 4.4809551,-7.327649 4.480953,-7.32765 12.466741,-0.0399 12.466738,-0.0399 0.517892,0.854518 0.517892,0.854518 2.335995,0.04287 2.335994,0.04287 2.742626,4.521316 c 1.508447,2.486723 4.136212,6.819001 5.839482,9.627283 1.703268,2.808283 3.157599,5.105969 3.231846,5.105969 0.256907,0 0.13186,-0.393635 -0.411085,-1.294044 -0.299901,-0.497351 -0.545275,-0.935841 -0.545275,-0.974422 0,-0.03858 0.310833,-0.07015 0.69074,-0.07015 0.575204,0 0.699074,-0.05324 0.740561,-0.318272 0.03599,-0.229934 0.273254,0.06215 0.854835,1.052375 0.702767,1.196557 0.780303,1.410253 0.610448,1.682462 -0.107012,0.171499 -0.377881,0.627528 -0.601929,1.013399 l -0.407361,0.701583 0.533953,0.857491 c 0.293674,0.47162 0.535536,0.950306 0.537472,1.063747 0.0019,0.113441 -3.098537,5.322698 -6.889942,11.576127 l -6.893462,11.36987 -16.876654,0 -16.876655,0 -1.226996,-2.065773 z"
+         style="fill:none;" />
+    </g>
+  </g>
 </svg>
--- a/data/icons/hexchat.ico
+++ b/data/icons/hexchat.ico
--- a/data/icons/hexchat.png
+++ b/data/icons/hexchat.png
--- a/data/icons/hexchat.svg
+++ b/data/icons/hexchat.svg
@@ -1,58 +1,746 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
- xmlns="http://www.w3.org/2000/svg"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- height="64"
- width="64">
-  <metadata>
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="hexchat.svg"
+   version="1.0"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2289">
+      <stop
+         style="stop-color:#ff2600;stop-opacity:1;"
+         offset="0"
+         id="stop2291" />
+      <stop
+         style="stop-color:#ffd600;stop-opacity:1;"
+         offset="1"
+         id="stop2293" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1317"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1319"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1320"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-160.10656,-7.1914058)"
+       x1="130.2673"
+       y1="78.743134"
+       x2="129.2081"
+       y2="25.771122" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3011"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3030"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3070"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientTransform="matrix(0.99894925,0,0,0.97549134,-3.1829063,4.465557)" />
+    <filter
+       id="filter3281"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3283"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3285"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3287"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3289"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3291"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3293"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3295"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3297"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3299"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3301"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3303"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4089"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4093"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4096"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4098"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientTransform="translate(-70.003571,-2.298097)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient4101"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94969205,0,0,0.89326813,1.6716955,2.7025635)"
+       x1="31.372862"
+       y1="60.111893"
+       x2="31.559002"
+       y2="5.6897221" />
+    <filter
+       id="filter4111"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4113"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4115"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4117"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4119"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4121"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter4123"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4125"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4127"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4129"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4131"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4133"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1330"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1328"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1322-5"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1320-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1319-2"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1317-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1337-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1335-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2289-4">
+      <stop
+         id="stop2291-0"
+         offset="0"
+         style="stop-color:#ff2600;stop-opacity:1;" />
+      <stop
+         id="stop2293-9"
+         offset="1"
+         style="stop-color:#ffd600;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,7.3477348,6.9450134)"
+       x1="46.881573"
+       y1="91.824585"
+       x2="47.225189"
+       y2="1.5596932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3136"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,-120.3871,-29.360443)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <filter
+       id="filter3138"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3140"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3142"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3144"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3146"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3148"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3670"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3672"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3674"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3676"
+         in="composite"
+         stdDeviation="1.5"
+         result="blur" />
+      <feOffset
+         id="feOffset3678"
+         dx="0"
+         dy="4"
+         result="offset" />
+      <feComposite
+         id="feComposite3680"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3682" />
+      <feFlood
+         id="feFlood3684"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         id="feComposite3686"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3688"
+         in="composite"
+         stdDeviation="1.5"
+         result="blur" />
+      <feOffset
+         id="feOffset3690"
+         dx="0"
+         dy="2"
+         result="offset" />
+      <feComposite
+         id="feComposite3692"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3706" />
+      <feFlood
+         id="feFlood3708"
+         flood-opacity="0.2"
+         flood-color="rgb(255,255,255)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         id="feComposite3710"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3712"
+         in="composite"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset3714"
+         dx="0"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3716"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="fbSourceGraphic" />
+      <feColorMatrix
+         result="fbSourceGraphicAlpha"
+         in="fbSourceGraphic"
+         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
+         id="feColorMatrix3123" />
+      <feFlood
+         id="feFlood3125"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         in="fbSourceGraphic" />
+      <feComposite
+         id="feComposite3127"
+         in2="fbSourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3129"
+         in="composite"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset3131"
+         dx="0"
+         dy="2"
+         result="offset" />
+      <feComposite
+         id="feComposite3133"
+         in2="offset"
+         in="fbSourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3135"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3137"
+         flood-opacity="0.2"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3139"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3141"
+         in="composite"
+         stdDeviation="1"
+         result="blur" />
+      <feOffset
+         id="feOffset3143"
+         dx="0"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3145"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3183"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3185"
+         flood-opacity="0.3"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3187"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3189"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3191"
+         dx="0"
+         dy="2"
+         result="offset" />
+      <feComposite
+         id="feComposite3193"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9999999"
+     inkscape:cx="60.761203"
+     inkscape:cy="36.086679"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1270"
+     inkscape:window-height="837"
+     inkscape:window-x="287"
+     inkscape:window-y="27"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
    <rdf:RDF>
-      <cc:Work>
+      <cc:Work
+         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
        <dc:creator>
          <cc:Agent>
            <dc:title>Guglielmi David</dc:title>
          </cc:Agent>
        </dc:creator>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
        <dc:rights>
          <cc:Agent>
            <dc:title>Peter Zelezny</dc:title>
          </cc:Agent>
        </dc:rights>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Samuel Messner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
      </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:requires rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires rdf:resource="http://web.resource.org/cc/SourceCode" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
      </cc:License>
    </rdf:RDF>
  </metadata>
-  <defs>
-    <linearGradient id="hexchatGradient" x1="0" y1="0" x2="0" y2="1">
-      <stop id="hgYellowStop" offset="0" style="stop-color: #FFD600" />
-      <stop id="hgRedStop" offset="1" style="stop-color: #FF2600" />
-    </linearGradient>
-  </defs>
-  <use xlink:href="#outline" style="opacity:0.15" transform="translate(0,2)" id="shadow" />
-  <path
-     style="fill:#000000; fill-opacity: 1;"
-     d="M 31.71875,4.1088109 C 24.433462,4.1801109 17.123427,4.6356469 15.75,5.4213109 13.003148,6.9926379 0.06149557,29.207739 0.09374996,32.296311 0.12600597,35.384884 13.564642,57.372816 16.34375,58.890061 19.122855,60.407306 45.503149,60.148888 48.25,58.577561 50.996852,57.006233 63.938504,34.791133 63.90625,31.702561 63.87399,28.613989 50.466608,6.5948049 47.6875,5.0775609 46.297948,4.3189379 39.004037,4.0375089 31.71875,4.1088109 Z m -0.1875,9.2500001 c 3.386631,-0.03246 6.676687,0.05409 8.75,0.28125 l -8.71875,9.71875 -9.0625,-9.5 c 2.055746,-0.283043 5.521157,-0.466366 9.03125,-0.5 z m 17.34375,9.84375 c 2.298293,3.744897 4.302354,7.392556 4.3125,8.34375 0.01126,1.055883 -2.358157,5.507241 -4.875,9.6875 l -9.03125,-8.03125 z m -34.46875,0.25 8.75,9.75 -8.1875,7.875 c -2.482342,-3.992634 -4.707927,-8.110307 -4.71875,-9.125 -0.01021,-0.95736 1.927117,-4.687748 4.15625,-8.5 z m 17.15625,16.90625 9.8125,9.21875 c -4.111037,0.67314 -16.108253,0.781873 -19.46875,0.125 z"
-     id="outline" />
-  <path
-   style="fill:url(#hexchatGradient); fill-opacity: 1;"
-   d="m 31.34375,6.1713109 c -6.857093,0.06521 -13.707297,0.469014 -15,1.1875 C 13.758345,8.7957819 1.5633917,29.128076 1.5937497,31.952561 c 0.03036,2.824486 12.6654863,22.924987 15.2812503,24.3125 2.615763,1.387513 27.445846,1.186972 30.03125,-0.25 2.585405,-1.436972 14.780359,-21.769265 14.75,-24.59375 C 61.62589,28.596826 48.990764,8.4650729 46.375,7.0775609 45.067119,6.3838039 38.200842,6.1061049 31.34375,6.1713109 Z m 0.0625,5.0625001 c 5.36199,-0.05245 10.696035,0.19201 11.71875,0.75 0.06132,0.03346 0.143803,0.127745 0.21875,0.1875 l -11.28125,12.59375 -0.5,0.53125 -0.46875,-0.53125 -11.75,-12.3125 c 0.10903,-0.09884 0.228263,-0.201843 0.3125,-0.25 1.010846,-0.577879 6.38801,-0.916306 11.75,-0.96875 z m 18.0625,9.46875 c 2.883844,4.661341 5.612556,9.652893 5.625,10.84375 0.01348,1.290331 -3.064699,7.087557 -6.09375,12.09375 l -11.09375,-9.90625 -0.53125,-0.46875 0.5,-0.46875 11.59375,-12.09375 z m -35.78125,0.03125 10.84375,12.0625 0.4375,0.46875 -0.46875,0.4375 -10.28125,9.90625 c -3.04689,-4.86606 -6.0493623,-10.36778 -6.0625003,-11.625 -0.01271,-1.216102 2.6892393,-6.451996 5.5312503,-11.25 z m 17.875,17.78125 0.4375,0.4375 12.34375,11.59375 c -0.318014,0.365376 -0.587006,0.638955 -0.78125,0.75 -2.02169,1.155758 -21.423322,1.397228 -23.46875,0.28125 -0.228202,-0.124506 -0.601742,-0.47821 -1,-0.9375 l 12,-11.6875 0.46875,-0.4375 z"
-   id="coloredX" />
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3663"
+       style="filter:url(#filter3183)">
+      <path
+         style="fill:#000000;fill-opacity:1;"
+         d="m 31.404792,8.7464684 c -6.271873,0.05843 -12.553,0.431777 -13.735377,1.075609 C 15.304661,11.109737 4.1505773,29.32852 4.1783444,31.859522 c 0.02777,2.531005 11.5871596,20.543967 13.9796816,21.787309 2.392519,1.243342 25.106,1.037521 27.470753,-0.250141 C 47.993531,52.109028 59.147618,33.890246 59.119851,31.359242 59.092081,28.828238 47.532689,10.790262 45.140167,9.5469214 43.943907,8.9252504 37.676665,8.6880384 31.404792,8.7464684 z m 0.05429,4.5275596 c 4.90437,-0.047 9.786849,0.175368 10.722281,0.67538 1.870861,1.000021 10.917726,15.499216 10.939439,17.534904 C 53.142512,33.52 44.410541,48.158649 42.561393,49.194315 40.712245,50.229983 22.960549,50.419464 21.089689,49.419444 19.218826,48.419423 10.199106,33.920226 10.177392,31.884537 10.155682,29.84885 18.860508,15.185189 20.709656,14.14952 c 0.924575,-0.517833 5.845056,-0.828498 10.749425,-0.875492 z"
+         id="path4107"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.97890109,0,0,0.98965389,0.52623659,-1.3159842)"
+         style="fill:#000000;fill-opacity:1;"
+         d="M 31.801142,5.3887159 C 24.358829,5.4607629 16.905535,5.9211193 15.502506,6.7149966 12.696449,8.3027513 -0.53918189,30.767467 -0.50623228,33.888328 -0.47328049,37.00919 13.243292,59.220118 16.0823,60.753225 18.921305,62.286332 45.873514,62.032541 48.67957,60.444787 51.485627,58.857032 64.721258,36.392315 64.688309,33.271454 64.655357,30.150593 50.938784,7.9088218 48.099776,6.3757155 46.680274,5.6091623 39.243454,5.3166688 31.801142,5.3887159 z m 0.06442,5.5827171 c 5.81961,-0.05795 11.613244,0.216241 12.723243,0.83278 2.219996,1.233079 12.955163,19.111349 12.980929,21.621461 0.02577,2.51011 -10.335747,20.560333 -12.529979,21.837366 -2.19423,1.277031 -23.2587,1.510671 -25.478697,0.277592 C 17.341063,54.307554 6.638107,36.429283 6.6123418,33.919173 6.5865755,31.409062 16.915878,13.327995 19.110109,12.050964 20.207224,11.412447 26.045952,11.02938 31.865563,10.971433 z"
+         id="path4103"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:transform-center-y="2.25"
+         inkscape:transform-center-x="2.25"
+         style="fill:url(#linearGradient3133);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31593215000000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;"
+         d="m 10.723737,18.285684 7.623916,-7.935243 13.238019,13.886676 12.492701,-13.886676 8.576909,7.935243 -14.294847,14.878584 13.341856,11.902864 -6.670928,6.94334 L 31.585672,39.351071 18.573785,52.010472 11.676724,45.086347 24.065591,33.164268 10.723737,18.285684 z"
+         id="path2297"
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3305"
+         d="M 31.293607,6.0952825 C 24.436514,6.1604875 17.569304,6.5771256 16.276601,7.2956116 13.691196,8.7325834 1.4963386,29.063913 1.5266972,31.888398 1.5570579,34.712884 14.195039,54.814527 16.810803,56.20204 19.426566,57.589553 44.25941,57.359866 46.844814,55.922894 49.430219,54.485922 61.625078,34.154591 61.594719,31.330106 61.564358,28.505621 48.926376,8.3760634 46.310612,6.9885506 45.002731,6.294794 38.150699,6.0300774 31.293607,6.0952825 z m 0.05936,5.0525485 c 5.36199,-0.05245 10.700046,0.195704 11.722761,0.753694 2.045429,1.115978 11.936445,17.296419 11.960184,19.568154 0.02374,2.271736 -9.523004,18.6078 -11.544693,19.763557 -2.02169,1.155758 -21.429773,1.36721 -23.475201,0.251232 C 17.970585,50.368491 8.1092472,34.188049 8.085508,31.916313 8.061768,29.644577 17.578834,13.2806 19.600523,12.124842 c 1.010846,-0.577879 6.39045,-0.924567 11.75244,-0.977011 z"
+         style="fill:url(#linearGradient4101);fill-opacity:1;" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3077"
+         d="M 14.640198,55.682743 C 9.6971439,47.360612 2.8950957,35.733851 2.9419881,35.686959 c 0.031272,-0.03127 0.5023581,0.289334 1.0468575,0.712459 0.5444994,0.423125 1.0414462,0.769317 1.1043264,0.769317 0.06288,0 2.6329414,4.276521 5.711247,9.50338 l 5.59692,9.503379 2.159128,0.007 2.159126,0.007 -0.34365,-0.584653 C 20.186937,55.28323 17.303514,50.518786 13.968339,45.017137 10.633164,39.515488 7.9043842,34.929294 7.9043842,34.825595 c 0,-0.103699 0.2455542,-0.59277 0.545676,-1.086823 0.3001218,-0.494053 0.545676,-0.941721 0.545676,-0.994816 0,-0.05309 -0.2788317,-0.09654 -0.619626,-0.09654 -0.8505388,0 -1.0953557,-0.488405 -1.0953557,-2.185211 0,-1.90734 -0.048411,-1.868066 2.30512,-1.870072 l 1.9823345,-0.0017 1.052375,-1.721616 c 0.578806,-0.94689 1.052375,-1.785869 1.052375,-1.8644 0,-0.07853 -0.829918,-0.162484 -1.844262,-0.186561 l -1.8442631,-0.04378 4.4809551,-7.327649 4.480953,-7.32765 12.466741,-0.0399 12.466738,-0.0399 0.517892,0.854518 0.517892,0.854518 2.335995,0.04287 2.335994,0.04287 2.742626,4.521316 c 1.508447,2.486723 4.136212,6.819001 5.839482,9.627283 1.703268,2.808283 3.157599,5.105969 3.231846,5.105969 0.256907,0 0.13186,-0.393635 -0.411085,-1.294044 -0.299901,-0.497351 -0.545275,-0.935841 -0.545275,-0.974422 0,-0.03858 0.310833,-0.07015 0.69074,-0.07015 0.575204,0 0.699074,-0.05324 0.740561,-0.318272 0.03599,-0.229934 0.273254,0.06215 0.854835,1.052375 0.702767,1.196557 0.780303,1.410253 0.610448,1.682462 -0.107012,0.171499 -0.377881,0.627528 -0.601929,1.013399 l -0.407361,0.701583 0.533953,0.857491 c 0.293674,0.47162 0.535536,0.950306 0.537472,1.063747 0.0019,0.113441 -3.098537,5.322698 -6.889942,11.576127 l -6.893462,11.36987 -16.876654,0 -16.876655,0 -1.226996,-2.065773 z"
+         style="fill:none;" />
+    </g>
+  </g>
 </svg>
--- a/data/icons/tray_fileoffer.png
+++ b/data/icons/tray_fileoffer.png
--- a/data/icons/tray_highlight.png
+++ b/data/icons/tray_highlight.png
--- a/data/icons/tray_message.png
+++ b/data/icons/tray_message.png
--- a/data/misc/Makefile.am
+++ b/data/misc/Makefile.am
@@ -26,6 +26,4 @@ uninstall-hook:
 	$(UPDATE_MIME_DATABASE);
 	$(UPDATE_DESKTOP_DATABASE);

-EXTRA_DIST = hexchat.appdata.xml.in hexchat.desktop.in htm.desktop.in htm-mime.xml
-
 CLEANFILES = $(appdata_DATA) $(data_desktop_DATA)
--- a/m4/ax_check_enable_debug.m4
+++ b/m4/ax_check_enable_debug.m4
@@ -1,124 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], [ENABLE DEBUG VARIABLES ...], [DISABLE DEBUG VARIABLES NDEBUG ...], [IS-RELEASE])
-#
-# DESCRIPTION
-#
-#   Check for the presence of an --enable-debug option to configure, with
-#   the specified default value used when the option is not present.  Return
-#   the value in the variable $ax_enable_debug.
-#
-#   Specifying 'yes' adds '-g -O0' to the compilation flags for all
-#   languages. Specifying 'info' adds '-g' to the compilation flags.
-#   Specifying 'profile' adds '-g -pg' to the compilation flags and '-pg' to
-#   the linking flags. Otherwise, nothing is added.
-#
-#   Define the variables listed in the second argument if debug is enabled,
-#   defaulting to no variables.  Defines the variables listed in the third
-#   argument if debug is disabled, defaulting to NDEBUG.  All lists of
-#   variables should be space-separated.
-#
-#   If debug is not enabled, ensure AC_PROG_* will not add debugging flags.
-#   Should be invoked prior to any AC_PROG_* compiler checks.
-#
-#   IS-RELEASE can be used to change the default to 'no' when making a
-#   release.  Set IS-RELEASE to 'yes' or 'no' as appropriate. By default, it
-#   uses the value of $ax_is_release, so if you are using the AX_IS_RELEASE
-#   macro, there is no need to pass this parameter.
-#
-#     AX_IS_RELEASE([git-directory])
-#     AX_CHECK_ENABLE_DEBUG()
-#
-# LICENSE
-#
-#   Copyright (c) 2011 Rhys Ulerich <rhys.ulerich@gmail.com>
-#   Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.co.uk>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-#serial 5
-
-AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
-    AC_BEFORE([$0],[AC_PROG_CC])dnl
-    AC_BEFORE([$0],[AC_PROG_CXX])dnl
-    AC_BEFORE([$0],[AC_PROG_F77])dnl
-    AC_BEFORE([$0],[AC_PROG_FC])dnl
-
-    AC_MSG_CHECKING(whether to enable debugging)
-
-    ax_enable_debug_default=m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))
-    ax_enable_debug_is_release=m4_tolower(m4_normalize(ifelse([$4],,
-                                                              [$ax_is_release],
-                                                              [$4])))
-
-    # If this is a release, override the default.
-    AS_IF([test "$ax_enable_debug_is_release" = "yes"],
-      [ax_enable_debug_default="no"])
-
-    m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))])
-    m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))])
-
-    AC_ARG_ENABLE(debug,
-	[AS_HELP_STRING([--enable-debug=]@<:@yes/info/profile/no@:>@,[compile with debugging])],
-	[],enable_debug=$ax_enable_debug_default)
-
-    # empty mean debug yes
-    AS_IF([test "x$enable_debug" = "x"],
-      [enable_debug="yes"])
-
-    # case of debug
-    AS_CASE([$enable_debug],
-      [yes],[
-	AC_MSG_RESULT(yes)
-	CFLAGS="${CFLAGS} -g -O0"
-	CXXFLAGS="${CXXFLAGS} -g -O0"
-	FFLAGS="${FFLAGS} -g -O0"
-	FCFLAGS="${FCFLAGS} -g -O0"
-	OBJCFLAGS="${OBJCFLAGS} -g -O0"
-      ],
-      [info],[
-	AC_MSG_RESULT(info)
-	CFLAGS="${CFLAGS} -g"
-	CXXFLAGS="${CXXFLAGS} -g"
-	FFLAGS="${FFLAGS} -g"
-	FCFLAGS="${FCFLAGS} -g"
-	OBJCFLAGS="${OBJCFLAGS} -g"
-      ],
-      [profile],[
-	AC_MSG_RESULT(profile)
-	CFLAGS="${CFLAGS} -g -pg"
-	CXXFLAGS="${CXXFLAGS} -g -pg"
-	FFLAGS="${FFLAGS} -g -pg"
-	FCFLAGS="${FCFLAGS} -g -pg"
-	OBJCFLAGS="${OBJCFLAGS} -g -pg"
-	LDFLAGS="${LDFLAGS} -pg"
-      ],
-      [
-	AC_MSG_RESULT(no)
-	dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags
-	dnl by setting any unset environment flag variables
-	AS_IF([test "x${CFLAGS+set}" != "xset"],
-	  [CFLAGS=""])
-	AS_IF([test "x${CXXFLAGS+set}" != "xset"],
-	  [CXXFLAGS=""])
-	AS_IF([test "x${FFLAGS+set}" != "xset"],
-	  [FFLAGS=""])
-	AS_IF([test "x${FCFLAGS+set}" != "xset"],
-	  [FCFLAGS=""])
-	AS_IF([test "x${OBJCFLAGS+set}" != "xset"],
-	  [OBJCFLAGS=""])
-      ])
-
-    dnl Define various variables if debugging is disabled.
-    dnl assert.h is a NOP if NDEBUG is defined, so define it by default.
-    AS_IF([test "x$enable_debug" = "xyes"],
-      [m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])],
-      [m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])])
-    ax_enable_debug=$enable_debug
-])
--- a/m4/ax_is_release.m4
+++ b/m4/ax_is_release.m4
@@ -1,69 +0,0 @@
-# ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_is_release.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_IS_RELEASE(POLICY)
-#
-# DESCRIPTION
-#
-#   Determine whether the code is being configured as a release, or from
-#   git. Set the ax_is_release variable to 'yes' or 'no'.
-#
-#   If building a release version, it is recommended that the configure
-#   script disable compiler errors and debug features, by conditionalising
-#   them on the ax_is_release variable.  If building from git, these
-#   features should be enabled.
-#
-#   The POLICY parameter specifies how ax_is_release is determined. It can
-#   take the following values:
-#
-#    * git-directory:  ax_is_release will be 'no' if a '.git' directory exists
-#    * minor-version:  ax_is_release will be 'no' if the minor version number
-#                      in $PACKAGE_VERSION is odd; this assumes
-#                      $PACKAGE_VERSION follows the 'major.minor.micro' scheme
-#    * micro-version:  ax_is_release will be 'no' if the micro version number
-#                      in $PACKAGE_VERSION is odd; this assumes
-#                      $PACKAGE_VERSION follows the 'major.minor.micro' scheme
-#    * always:         ax_is_release will always be 'yes'
-#    * never:          ax_is_release will always be 'no'
-#
-#   Other policies may be added in future.
-#
-# LICENSE
-#
-#   Copyright (c) 2015 Philip Withnall <philip@tecnocode.co.uk>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-#serial 3
-
-AC_DEFUN([AX_IS_RELEASE],[
-    AC_BEFORE([AC_INIT],[$0])
-
-    m4_case([$1],
-      [git-directory],[
-        # $is_release = (.git directory does not exist)
-        AS_IF([test -d .git],[ax_is_release=no],[ax_is_release=yes])
-      ],
-      [minor-version],[
-        # $is_release = ($minor_version is even)
-        minor_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]][[^.]]*.\([[^.]][[^.]]*\).*/\1/'`
-        AS_IF([test "$(( $minor_version % 2 ))" -ne 0],
-              [ax_is_release=no],[ax_is_release=yes])
-      ],
-      [micro-version],[
-        # $is_release = ($micro_version is even)
-        micro_version=`echo "$PACKAGE_VERSION" | sed 's/[[^.]]*\.[[^.]]*\.\([[^.]]*\).*/\1/'`
-        AS_IF([test "$(( $micro_version % 2 ))" -ne 0],
-              [ax_is_release=no],[ax_is_release=yes])
-      ],
-      [always],[ax_is_release=yes],
-      [never],[ax_is_release=no],
-      [
-        AC_MSG_ERROR([Invalid policy. Valid policies: git-directory, minor-version.])
-      ])
-])
--- a/m4/ax_perl_ext_flags.m4
+++ b/m4/ax_perl_ext_flags.m4
@@ -1,116 +0,0 @@
-# ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_perl_ext_flags.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PERL_EXT_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [EXTRA-MODULES])
-#   AX_PERL_EXT_CFLAGS([CFLAGS-VARIABLE])
-#   AX_PERL_EXT_LDFLAGS([LDFLAGS-VARIABLE], [EXTRA-MODULES])
-#
-# DESCRIPTION
-#
-#   Fetches the linker flags and C compiler flags for compiling and linking
-#   programs that embed a Perl interpreter. If the EXTRA-MODULES argument is
-#   submitted, it is a space separated list of extra modules to link. The
-#   flags will be stored in the provided variables.
-#
-#   Examples:
-#
-#     AX_PERL_EXT_FLAGS([PERLXS_CFLAGS], [PERLXS_LDFLAGS])
-#     AC_SUBST([PERLXS_CFLAGS])
-#     AC_SUBST([PERLXS_LDFLAGS])
-#
-#     AX_PERL_EXT_CFLAGS([PERLXS_CFLAGS])
-#     AC_SUBST([PERLXS_CFLAGS])
-#
-#     AX_PERL_EXT_LDFLAGS([PERLXS_LDFLAGS], [-std Socket])
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Mats Kindahl of Sun Microsystems <mats@sun.com>
-#
-#   Redistribution and use in source and binary forms, with or without
-#   modification, are permitted provided that the following conditions are
-#   met:
-#
-#   1. Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-#
-#   2. Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-#
-#   3. The name of the author may not be used to endorse or promote products
-#   derived from this software without specific prior written permission.
-#
-#   THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-#   IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-#   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-#   DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-#   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-#   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-#   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-#   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-#   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-#   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-#   POSSIBILITY OF SUCH DAMAGE.
-
-#serial 5
-
-AC_DEFUN([AX_PERL_EXT_CFLAGS],
-[AC_CHECK_PROG(PERL,perl,perl)
- _AX_PERL_EXT_MODULE_CHECK([ExtUtils::Embed], [have_embed=yes],
-                           [have_embed=no])
- AS_IF([test $have_embed = no],
-       AC_MSG_ERROR([Require ExtUtils::Embed to proceed]))
- _AX_PERL_EXT_EMBED_CHECK([$1],[ccopts])
-])
-
-
-AC_DEFUN([AX_PERL_EXT_LDFLAGS],
-[AC_CHECK_PROG(PERL,perl,perl)
- _AX_PERL_EXT_MODULE_CHECK([ExtUtils::Embed], [have_embed=yes],
-                           [have_embed=no])
- AS_IF([test $have_embed = no],
-       AC_MSG_ERROR([Require ExtUtils::Embed to proceed]))
- _AX_PERL_EXT_EMBED_CHECK([$1],[ldopts],[$2])
-])
-
-
-AC_DEFUN([AX_PERL_EXT_FLAGS],
-[AC_CHECK_PROG(PERL,perl,perl)
- _AX_PERL_EXT_MODULE_CHECK([ExtUtils::Embed], [have_embed=yes],
-                           [have_embed=no])
- AS_IF([test $have_embed = no],
-       AC_MSG_ERROR([Require ExtUtils::Embed to proceed]))
- _AX_PERL_EXT_EMBED_CHECK([$1],[ccopts])
- _AX_PERL_EXT_EMBED_CHECK([$2],[ldopts],[$3])
-])
-
-
-dnl _AX_PERL_EXT_MODULE_CHECK(MODULE-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-dnl
-dnl Check for the existance of the perl module given by MODULE-NAME.
-dnl
-AC_DEFUN([_AX_PERL_EXT_MODULE_CHECK],
-[AC_MSG_CHECKING([for perl module $1])
- $PERL "-M$1" -e exit > /dev/null 2>&1
- AS_IF([test $? -eq 0],
- [AC_MSG_RESULT(yes)
-  $2],
- [AC_MSG_RESULT(no)
-  $3])
-])
-
-dnl _AX_PERL_EXT_EMBED_CHECK(VARIABLE, COMMAND, [EXTRA-FLAGS]) Use
-dnl
-dnl ExtUtils::Embed fetch flags for embedding Perl in a C/C++
-dnl application
-dnl
-AC_DEFUN([_AX_PERL_EXT_EMBED_CHECK],
-[AC_MSG_CHECKING([for perl $2 embed flags])
- ax_c_perlxs_extras="$3"
- $1=`$PERL -MExtUtils::Embed -e $2 ${ax_c_perlxs_extras:+"-- $3"}`
- AC_MSG_RESULT($$1)
-])
--- a/m4/ax_python_devel.m4
+++ b/m4/ax_python_devel.m4
@@ -1,327 +0,0 @@
-# ===========================================================================
-#      http://www.gnu.org/software/autoconf-archive/ax_python_devel.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PYTHON_DEVEL([version])
-#
-# DESCRIPTION
-#
-#   Note: Defines as a precious variable "PYTHON_VERSION". Don't override it
-#   in your configure.ac.
-#
-#   This macro checks for Python and tries to get the include path to
-#   'Python.h'. It provides the $(PYTHON_CPPFLAGS) and $(PYTHON_LIBS) output
-#   variables. It also exports $(PYTHON_EXTRA_LIBS) and
-#   $(PYTHON_EXTRA_LDFLAGS) for embedding Python in your code.
-#
-#   You can search for some particular version of Python by passing a
-#   parameter to this macro, for example ">= '2.3.1'", or "== '2.4'". Please
-#   note that you *have* to pass also an operator along with the version to
-#   match, and pay special attention to the single quotes surrounding the
-#   version number. Don't use "PYTHON_VERSION" for this: that environment
-#   variable is declared as precious and thus reserved for the end-user.
-#
-#   This macro should work for all versions of Python >= 2.1.0. As an end
-#   user, you can disable the check for the python version by setting the
-#   PYTHON_NOVERSIONCHECK environment variable to something else than the
-#   empty string.
-#
-#   If you need to use this macro for an older Python version, please
-#   contact the authors. We're always open for feedback.
-#
-# LICENSE
-#
-#   Copyright (c) 2009 Sebastian Huber <sebastian-huber@web.de>
-#   Copyright (c) 2009 Alan W. Irwin
-#   Copyright (c) 2009 Rafael Laboissiere <rafael@laboissiere.net>
-#   Copyright (c) 2009 Andrew Collier
-#   Copyright (c) 2009 Matteo Settenvini <matteo@member.fsf.org>
-#   Copyright (c) 2009 Horst Knorr <hk_classes@knoda.org>
-#   Copyright (c) 2013 Daniel Mullner <muellner@math.stanford.edu>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 18
-
-AU_ALIAS([AC_PYTHON_DEVEL], [AX_PYTHON_DEVEL])
-AC_DEFUN([AX_PYTHON_DEVEL],[
-	#
-	# Allow the use of a (user set) custom python version
-	#
-	AC_ARG_VAR([PYTHON_VERSION],[The installed Python
-		version to use, for example '2.3'. This string
-		will be appended to the Python interpreter
-		canonical name.])
-
-	AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]])
-	if test -z "$PYTHON"; then
-	   AC_MSG_ERROR([Cannot find python$PYTHON_VERSION in your system path])
-	   PYTHON_VERSION=""
-	fi
-
-	#
-	# Check for a version of Python >= 2.1.0
-	#
-	AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-	ac_supports_python_ver=`$PYTHON -c "import sys; \
-		ver = sys.version.split ()[[0]]; \
-		print (ver >= '2.1.0')"`
-	if test "$ac_supports_python_ver" != "True"; then
-		if test -z "$PYTHON_NOVERSIONCHECK"; then
-			AC_MSG_RESULT([no])
-			AC_MSG_FAILURE([
-This version of the AC@&t@_PYTHON_DEVEL macro
-doesn't work properly with versions of Python before
-2.1.0. You may need to re-run configure, setting the
-variables PYTHON_CPPFLAGS, PYTHON_LIBS, PYTHON_SITE_PKG,
-PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand.
-Moreover, to disable this check, set PYTHON_NOVERSIONCHECK
-to something else than an empty string.
-])
-		else
-			AC_MSG_RESULT([skip at user request])
-		fi
-	else
-		AC_MSG_RESULT([yes])
-	fi
-
-	#
-	# if the macro parameter ``version'' is set, honour it
-	#
-	if test -n "$1"; then
-		AC_MSG_CHECKING([for a version of Python $1])
-		ac_supports_python_ver=`$PYTHON -c "import sys; \
-			ver = sys.version.split ()[[0]]; \
-			print (ver $1)"`
-		if test "$ac_supports_python_ver" = "True"; then
-		   AC_MSG_RESULT([yes])
-		else
-			AC_MSG_RESULT([no])
-			AC_MSG_ERROR([this package requires Python $1.
-If you have it installed, but it isn't the default Python
-interpreter in your system path, please pass the PYTHON_VERSION
-variable to configure. See ``configure --help'' for reference.
-])
-			PYTHON_VERSION=""
-		fi
-	fi
-
-	#
-	# Check if you have distutils, else fail
-	#
-	AC_MSG_CHECKING([for the distutils Python package])
-	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-	if test -z "$ac_distutils_result"; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		AC_MSG_ERROR([cannot import Python module "distutils".
-Please check your Python installation. The error was:
-$ac_distutils_result])
-		PYTHON_VERSION=""
-	fi
-
-	#
-	# Check for Python include path
-	#
-	AC_MSG_CHECKING([for Python include path])
-	if test -z "$PYTHON_CPPFLAGS"; then
-		python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_inc ());"`
-		plat_python_path=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_inc (plat_specific=1));"`
-		if test -n "${python_path}"; then
-			if test "${plat_python_path}" != "${python_path}"; then
-				python_path="-I$python_path -I$plat_python_path"
-			else
-				python_path="-I$python_path"
-			fi
-		fi
-		PYTHON_CPPFLAGS=$python_path
-	fi
-	AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-	AC_SUBST([PYTHON_CPPFLAGS])
-
-	#
-	# Check for Python library path
-	#
-	AC_MSG_CHECKING([for Python library path])
-	if test -z "$PYTHON_LIBS"; then
-		# (makes two attempts to ensure we've got a version number
-		# from the interpreter)
-		ac_python_version=`cat<<EOD | $PYTHON -
-
-# join all versioning strings, on some systems
-# major/minor numbers could be in different list elements
-from distutils.sysconfig import *
-e = get_config_var('VERSION')
-if e is not None:
-	print(e)
-EOD`
-
-		if test -z "$ac_python_version"; then
-			if test -n "$PYTHON_VERSION"; then
-				ac_python_version=$PYTHON_VERSION
-			else
-				ac_python_version=`$PYTHON -c "import sys; \
-					print (sys.version[[:3]])"`
-			fi
-		fi
-
-		# Make the versioning information available to the compiler
-		AC_DEFINE_UNQUOTED([HAVE_PYTHON], ["$ac_python_version"],
-                                   [If available, contains the Python version number currently in use.])
-
-		# First, the library directory:
-		ac_python_libdir=`cat<<EOD | $PYTHON -
-
-# There should be only one
-import distutils.sysconfig
-e = distutils.sysconfig.get_config_var('LIBDIR')
-if e is not None:
-	print (e)
-EOD`
-
-		# Now, for the library:
-		ac_python_library=`cat<<EOD | $PYTHON -
-
-import distutils.sysconfig
-c = distutils.sysconfig.get_config_vars()
-if 'LDVERSION' in c:
-	print ('python'+c[['LDVERSION']])
-else:
-	print ('python'+c[['VERSION']])
-EOD`
-
-		# This small piece shamelessly adapted from PostgreSQL python macro;
-		# credits goes to momjian, I think. I'd like to put the right name
-		# in the credits, if someone can point me in the right direction... ?
-		#
-		if test -n "$ac_python_libdir" -a -n "$ac_python_library"
-		then
-			# use the official shared library
-			ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"`
-			PYTHON_LIBS="-L$ac_python_libdir -l$ac_python_library"
-		else
-			# old way: use libpython from python_configdir
-			ac_python_libdir=`$PYTHON -c \
-			  "from distutils.sysconfig import get_python_lib as f; \
-			  import os; \
-			  print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"`
-			PYTHON_LIBS="-L$ac_python_libdir -lpython$ac_python_version"
-		fi
-
-		if test -z "PYTHON_LIBS"; then
-			AC_MSG_ERROR([
-  Cannot determine location of your Python DSO. Please check it was installed with
-  dynamic libraries enabled, or try setting PYTHON_LIBS by hand.
-			])
-		fi
-	fi
-	AC_MSG_RESULT([$PYTHON_LIBS])
-	AC_SUBST([PYTHON_LIBS])
-
-	#
-	# Check for site packages
-	#
-	AC_MSG_CHECKING([for Python site-packages path])
-	if test -z "$PYTHON_SITE_PKG"; then
-		PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-			print (distutils.sysconfig.get_python_lib(0,0));"`
-	fi
-	AC_MSG_RESULT([$PYTHON_SITE_PKG])
-	AC_SUBST([PYTHON_SITE_PKG])
-
-	#
-	# libraries which must be linked in when embedding
-	#
-	AC_MSG_CHECKING(python extra libraries)
-	if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-	   PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-                conf = distutils.sysconfig.get_config_var; \
-                print (conf('LIBS') + ' ' + conf('SYSLIBS'))"`
-	fi
-	AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
-	AC_SUBST(PYTHON_EXTRA_LDFLAGS)
-
-	#
-	# linking flags needed when embedding
-	#
-	AC_MSG_CHECKING(python extra linking flags)
-	if test -z "$PYTHON_EXTRA_LIBS"; then
-		PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-			conf = distutils.sysconfig.get_config_var; \
-			print (conf('LINKFORSHARED'))"`
-	fi
-	AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
-	AC_SUBST(PYTHON_EXTRA_LIBS)
-
-	#
-	# final check to see if everything compiles alright
-	#
-	AC_MSG_CHECKING([consistency of all components of python development environment])
-	# save current global flags
-	ac_save_LIBS="$LIBS"
-	ac_save_LDFLAGS="$LDFLAGS"
-	ac_save_CPPFLAGS="$CPPFLAGS"
-	LIBS="$ac_save_LIBS $PYTHON_LIBS $PYTHON_EXTRA_LIBS $PYTHON_EXTRA_LIBS"
-	LDFLAGS="$ac_save_LDFLAGS $PYTHON_EXTRA_LDFLAGS"
-	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
-	AC_LANG_PUSH([C])
-	AC_LINK_IFELSE([
-		AC_LANG_PROGRAM([[#include <Python.h>]],
-				[[Py_Initialize();]])
-		],[pythonexists=yes],[pythonexists=no])
-	AC_LANG_POP([C])
-	# turn back to default flags
-	CPPFLAGS="$ac_save_CPPFLAGS"
-	LIBS="$ac_save_LIBS"
-	LDFLAGS="$ac_save_LDFLAGS"
-
-	AC_MSG_RESULT([$pythonexists])
-
-        if test ! "x$pythonexists" = "xyes"; then
-	   AC_MSG_FAILURE([
-  Could not link test program to Python. Maybe the main Python library has been
-  installed in some non-standard library path. If so, pass it to configure,
-  via the LIBS environment variable.
-  Example: ./configure LIBS="-L/usr/non-standard-path/python/lib"
-  ============================================================================
-   ERROR!
-   You probably have to install the development version of the Python package
-   for your distribution.  The exact name of this package varies among them.
-  ============================================================================
-	   ])
-	  PYTHON_VERSION=""
-	fi
-
-	#
-	# all done!
-	#
-])
--- a/m4/ax_require_defined.m4
+++ b/m4/ax_require_defined.m4
@@ -1,37 +0,0 @@
-# ===========================================================================
-#    http://www.gnu.org/software/autoconf-archive/ax_require_defined.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_REQUIRE_DEFINED(MACRO)
-#
-# DESCRIPTION
-#
-#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
-#   been defined and thus are available for use.  This avoids random issues
-#   where a macro isn't expanded.  Instead the configure script emits a
-#   non-fatal:
-#
-#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
-#
-#   It's like AC_REQUIRE except it doesn't expand the required macro.
-#
-#   Here's an example:
-#
-#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
-#
-# LICENSE
-#
-#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 1
-
-AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
-  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
-])dnl AX_REQUIRE_DEFINED
--- a/plugins/checksum/checksum.vcxproj
+++ b/plugins/checksum/checksum.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/doat/doat.vcxproj
+++ b/plugins/doat/doat.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/exec/exec.vcxproj
+++ b/plugins/exec/exec.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/fishlim/Makefile.am
+++ b/plugins/fishlim/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = INSTALL LICENSE fish.h irc.h keystore.h plugin_hexchat.h
+EXTRA_DIST = INSTALL LICENSE

 libdir = $(hexchatlibdir)

--- a/plugins/fishlim/fishlim.vcxproj
+++ b/plugins/fishlim/fishlim.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/fishlim/test.c
+++ b/plugins/fishlim/test.c
@@ -0,0 +1,94 @@
+/*
+
+  Copyright (c) 2010 Samuel Lidén Borell <samuel@kodafritt.se>
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+*/
+
+#include <glib.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "fish.h"
+
+// We can't use the HexChat plugin API from here...
+gchar *get_config_filename() {
+    const gchar *homedir = g_get_home_dir();
+    return g_build_filename(homedir, ".config", "hexchat", "blow.ini", NULL);
+}
+
+
+static int decrypt(int nick_count, char *nicks[]) {
+    char encrypted[8192];
+    while (fgets(encrypted, sizeof(encrypted), stdin)) {
+        char *msg;
+        for (int i = 0; i < nick_count; i++) {
+            msg = fish_decrypt_from_nick(nicks[i], encrypted);
+            if (msg) goto success;
+        }
+        fprintf(stderr, "None of the recipients were found in the key store!\n");
+        return 1;
+      success:
+        fprintf(stderr, "Decrypted text >>>%s<<<\n", msg);
+        g_free(msg);
+    }
+    return 0;
+}
+
+static int encrypt(int nick_count, char *nicks[]) {
+    char message[8192];
+    while (fgets(message, sizeof(message), stdin)) {
+        // Remove newline character
+        char *newline = strchr(message, '\n');
+        if (newline) *newline = '\0';
+        
+        bool error = false;
+        for (int i = 0; i < nick_count; i++) {
+            char *encrypted = fish_encrypt_for_nick(nicks[i], message);
+            if (encrypted) {
+                fprintf(stderr, "Encrypted [%s]:  >>>%s<<<\n", nicks[i], encrypted);
+                g_free(encrypted);
+            } else {
+                error = true;
+            }
+        }
+        
+        if (error) {
+            fprintf(stderr, "Some of the recipients were't found in the key store!\n");
+            return 1;
+        }
+    }
+    return 0;
+}
+
+int main(int argc, char *argv[]) {
+    if (argc < 2) {
+        fprintf(stderr, "usage: %s [-e] nick...\n", argv[0]);
+        return 2;
+    }
+    
+    if (strcmp(argv[1], "-e") == 0) {
+        return encrypt(argc-2, &argv[2]);
+    } else {
+        return decrypt(argc-1, &argv[1]);
+    }
+}
+
+
--- a/plugins/mpcinfo/mpcinfo.vcxproj
+++ b/plugins/mpcinfo/mpcinfo.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@@ -7,7 +7,7 @@ libdir = $(hexchatlibdir)
 lib_LTLIBRARIES = perl.la
 perl_la_SOURCES = perl.c
 perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module
-perl_la_LIBADD = $(GLIB_LIBS)
+perl_la_LIBADD = $(PERL_LIBS) $(GLIB_LIBS)
 perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common

 BUILT_SOURCES = hexchat.pm.h irc.pm.h
--- a/plugins/perl/perl.vcxproj
+++ b/plugins/perl/perl.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -49,7 +49,7 @@ move hexchat.pm.h "$(IntDir)"</Command>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(IntDir);..\..\src\common;$(HexChatLib);$(PerlPath)\lib\CORE;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@@ -3,7 +3,6 @@ libdir = $(hexchatlibdir)
 lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c
 python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
-python_la_LIBADD = $(PYTHON_LIBS) $(GLIB_LIBS)
-python_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
-python_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
+python_la_LIBADD = $(PY_LIBS) $(GLIB_LIBS)
+python_la_CFLAGS = $(PY_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common

--- a/plugins/python/python2.vcxproj
+++ b/plugins/python/python2.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/python/python3.vcxproj
+++ b/plugins/python/python3.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/sysinfo/sysinfo.vcxproj
+++ b/plugins/sysinfo/sysinfo.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -36,7 +36,7 @@
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wbemuuid.lib;comsupp.lib;$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
      <IgnoreSpecificDefaultLibraries>comsupp.lib</IgnoreSpecificDefaultLibraries>
      <ModuleDefinitionFile>sysinfo.def</ModuleDefinitionFile>
    </Link>
@@ -49,7 +49,7 @@
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>wbemuuid.lib;comsupp.lib;$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
      <IgnoreSpecificDefaultLibraries>comsupp.lib</IgnoreSpecificDefaultLibraries>
      <ModuleDefinitionFile>sysinfo.def</ModuleDefinitionFile>
    </Link>
--- a/plugins/sysinfo/win32/backend.c
+++ b/plugins/sysinfo/win32/backend.c
@@ -26,18 +26,38 @@

 #include <glib.h>

-#include "../../../src/common/sysinfo/sysinfo.h"
-
 #include "../format.h"

+/* Cache the info for subsequent invocations of /SYSINFO */
+static int cpu_arch = 0;
+static char *os_name = NULL;
+static char *cpu_info = NULL;
+static char *vga_name = NULL;
+
 static int command_callback (char *word[], char *word_eol[], void *user_data);

+typedef enum
+{
+	QUERY_WMI_OS,
+	QUERY_WMI_CPU,
+	QUERY_WMI_VGA,
+	QUERY_WMI_HDD,
+} QueryWmiType;
+
 void print_info (void);
+int get_cpu_arch (void);
+char *query_wmi (QueryWmiType mode);
+char *read_os_name (IWbemClassObject *object);
+char *read_cpu_info (IWbemClassObject *object);
+char *read_vga_name (IWbemClassObject *object);

 guint64 hdd_capacity;
 guint64 hdd_free_space;
 char *read_hdd_info (IWbemClassObject *object);
+
 char *get_memory_info (void);
+char *bstr_to_utf8 (BSTR bstr);
+guint64 variant_to_uint64 (VARIANT *variant);

 char *
 sysinfo_backend_get_sound (void)
@@ -60,15 +80,14 @@ sysinfo_backend_get_uptime (void)
 char *
 sysinfo_backend_get_disk (void)
 {
-	guint64 hdd_capacity;
-	guint64 hdd_free_space;
+	char *hdd_info;

-	sysinfo_get_hdd_info (&hdd_capacity, &hdd_free_space);
-
-	if (hdd_capacity != 0)
-	{
-		return sysinfo_format_disk(hdd_capacity, hdd_free_space);
-	}
+	/* HDD information is always loaded dynamically since it includes the current amount of free space */
+	hdd_capacity = 0;
+	hdd_free_space = 0;
+	hdd_info = query_wmi (QUERY_WMI_HDD);
+	if (hdd_info)
+		return sysinfo_format_disk (hdd_capacity, hdd_free_space);

 	return NULL;
 }
@@ -76,7 +95,10 @@ sysinfo_backend_get_disk (void)
 char *
 sysinfo_backend_get_cpu (void)
 {
-	return sysinfo_get_cpu ();
+	if (cpu_info == NULL)
+		cpu_info = query_wmi (QUERY_WMI_CPU);
+
+	return g_strdup (cpu_info);
 }

 char *
@@ -89,18 +111,352 @@ sysinfo_backend_get_memory (void)
 char *
 sysinfo_backend_get_gpu (void)
 {
-	return sysinfo_get_gpu ();
+	if (vga_name == NULL)
+		vga_name = query_wmi (QUERY_WMI_VGA);
+
+	return g_strdup (vga_name);
 }

 char *
 sysinfo_backend_get_os (void)
 {
-	return sysinfo_get_os ();
+	if (os_name == NULL)
+		os_name = query_wmi (QUERY_WMI_OS);
+
+	if (cpu_arch == 0)
+		cpu_arch = get_cpu_arch ();
+
+	return g_strdup_printf ("%s (x%d)", os_name, cpu_arch);
 }

 static int get_cpu_arch (void)
 {
-	return sysinfo_get_cpu_arch ();
+	SYSTEM_INFO si;
+
+	GetNativeSystemInfo (&si);
+
+	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
+	{
+		return 64;
+	}
+	else
+	{
+		return 86;
+	}
+}
+
+/* http://msdn.microsoft.com/en-us/site/aa390423 */
+static char *query_wmi (QueryWmiType type)
+{
+	GString *result = NULL;
+	HRESULT hr;
+
+	IWbemLocator *locator = NULL;
+	BSTR namespaceName = NULL;
+	BSTR queryLanguageName = NULL;
+	BSTR query = NULL;
+	IWbemServices *namespace = NULL;
+	IUnknown *namespaceUnknown = NULL;
+	IEnumWbemClassObject *enumerator = NULL;
+	int i;
+	gboolean atleast_one_appended = FALSE;
+
+	hr = CoCreateInstance (&CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (LPVOID *) &locator);
+	if (FAILED (hr))
+	{
+		goto exit;
+	}
+
+	namespaceName = SysAllocString (L"root\\CIMV2");
+
+	hr = locator->lpVtbl->ConnectServer (locator, namespaceName, NULL, NULL, NULL, 0, NULL, NULL, &namespace);
+	if (FAILED (hr))
+	{
+		goto release_locator;
+	}
+
+	hr = namespace->lpVtbl->QueryInterface (namespace, &IID_IUnknown, &namespaceUnknown);
+	if (FAILED (hr))
+	{
+		goto release_namespace;
+	}
+
+	hr = CoSetProxyBlanket (namespaceUnknown, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE);
+	if (FAILED (hr))
+	{
+		goto release_namespaceUnknown;
+	}
+
+	queryLanguageName = SysAllocString (L"WQL");
+
+	switch (type)
+	{
+	case QUERY_WMI_OS:
+		query = SysAllocString (L"SELECT Caption FROM Win32_OperatingSystem");
+		break;
+	case QUERY_WMI_CPU:
+		query = SysAllocString (L"SELECT Name, MaxClockSpeed FROM Win32_Processor");
+		break;
+	case QUERY_WMI_VGA:
+		query = SysAllocString (L"SELECT Name FROM Win32_VideoController");
+		break;
+	case QUERY_WMI_HDD:
+		query = SysAllocString (L"SELECT Name, Capacity, FreeSpace FROM Win32_Volume");
+		break;
+	default:
+		goto release_queryLanguageName;
+	}
+
+	hr = namespace->lpVtbl->ExecQuery (namespace, queryLanguageName, query, WBEM_FLAG_FORWARD_ONLY, NULL, &enumerator);
+	if (FAILED (hr))
+	{
+		goto release_query;
+	}
+
+	result = g_string_new ("");
+
+	for (i = 0;; i++)
+	{
+		ULONG numReturned = 0;
+		IWbemClassObject *object;
+		char *line;
+
+		hr = enumerator->lpVtbl->Next (enumerator, WBEM_INFINITE, 1, &object, &numReturned);
+		if (FAILED (hr) || numReturned == 0)
+		{
+			break;
+		}
+
+		switch (type)
+		{
+			case QUERY_WMI_OS:
+				line = read_os_name (object);
+				break;
+
+			case QUERY_WMI_CPU:
+				line = read_cpu_info (object);
+				break;
+
+			case QUERY_WMI_VGA:
+				line = read_vga_name (object);
+				break;
+
+			case QUERY_WMI_HDD:
+				line = read_hdd_info (object);
+				break;
+
+			default:
+				break;
+		}
+
+		object->lpVtbl->Release (object);
+
+		if (line != NULL)
+		{
+			if (atleast_one_appended)
+			{
+				g_string_append (result, ", ");
+			}
+
+			g_string_append (result, line);
+
+			g_free (line);
+
+			atleast_one_appended = TRUE;
+		}
+	}
+
+	enumerator->lpVtbl->Release (enumerator);
+
+release_query:
+	SysFreeString (query);
+
+release_queryLanguageName:
+	SysFreeString (queryLanguageName);
+
+release_namespaceUnknown:
+	namespaceUnknown->lpVtbl->Release (namespaceUnknown);
+
+release_namespace:
+	namespace->lpVtbl->Release (namespace);
+
+release_locator:
+	locator->lpVtbl->Release (locator);
+	SysFreeString (namespaceName);
+
+exit:
+	if (result == NULL)
+	{
+		return NULL;
+	}
+
+	return g_string_free (result, FALSE);
+}
+
+static char *read_os_name (IWbemClassObject *object)
+{
+	HRESULT hr;
+	VARIANT caption_variant;
+	char *caption_utf8;
+
+	hr = object->lpVtbl->Get (object, L"Caption", 0, &caption_variant, NULL, NULL);
+	if (FAILED (hr))
+	{
+		return NULL;
+	}
+
+	caption_utf8 = bstr_to_utf8 (caption_variant.bstrVal);
+
+	VariantClear(&caption_variant);
+
+	if (caption_utf8 == NULL)
+	{
+		return NULL;
+	}
+
+	g_strchomp (caption_utf8);
+
+	return caption_utf8;
+}
+
+static char *read_cpu_info (IWbemClassObject *object)
+{
+	HRESULT hr;
+	VARIANT name_variant;
+	char *name_utf8;
+	VARIANT max_clock_speed_variant;
+	guint cpu_freq_mhz;
+	char *result;
+
+	hr = object->lpVtbl->Get (object, L"Name", 0, &name_variant, NULL, NULL);
+	if (FAILED (hr))
+	{
+		return NULL;
+	}
+
+	name_utf8 = bstr_to_utf8 (name_variant.bstrVal);
+
+	VariantClear (&name_variant);
+
+	if (name_utf8 == NULL)
+	{
+		return NULL;
+	}
+
+	hr = object->lpVtbl->Get (object, L"MaxClockSpeed", 0, &max_clock_speed_variant, NULL, NULL);
+	if (FAILED (hr))
+	{
+		g_free (name_utf8);
+
+		return NULL;
+	}
+
+	cpu_freq_mhz = max_clock_speed_variant.uintVal;
+
+	VariantClear (&max_clock_speed_variant);
+
+	if (cpu_freq_mhz > 1000)
+	{
+		result = g_strdup_printf ("%s (%.2fGHz)", name_utf8, cpu_freq_mhz / 1000.f);
+	}
+	else
+	{
+		result = g_strdup_printf ("%s (%" G_GUINT32_FORMAT "MHz)", name_utf8, cpu_freq_mhz);
+	}
+
+	g_free (name_utf8);
+
+	return result;
+}
+
+static char *read_vga_name (IWbemClassObject *object)
+{
+	HRESULT hr;
+	VARIANT name_variant;
+	char *name_utf8;
+
+	hr = object->lpVtbl->Get (object, L"Name", 0, &name_variant, NULL, NULL);
+	if (FAILED (hr))
+	{
+		return NULL;
+	}
+
+	name_utf8 = bstr_to_utf8 (name_variant.bstrVal);
+
+	VariantClear (&name_variant);
+
+	if (name_utf8 == NULL)
+	{
+		return NULL;
+	}
+
+	return g_strchomp (name_utf8);
+}
+
+static char *read_hdd_info (IWbemClassObject *object)
+{
+	HRESULT hr;
+	VARIANT name_variant;
+	BSTR name_bstr;
+	gsize name_len;
+	VARIANT capacity_variant;
+	guint64 capacity;
+	VARIANT free_space_variant;
+	guint64 free_space;
+
+	hr = object->lpVtbl->Get (object, L"Name", 0, &name_variant, NULL, NULL);
+	if (FAILED (hr))
+	{
+		return NULL;
+	}
+
+	name_bstr = name_variant.bstrVal;
+	name_len = SysStringLen (name_variant.bstrVal);
+
+	if (name_len >= 4 && name_bstr[0] == L'\\' && name_bstr[1] == L'\\' && name_bstr[2] == L'?' && name_bstr[3] == L'\\')
+	{
+		// This is not a named volume. Skip it.
+		VariantClear (&name_variant);
+
+		return NULL;
+	}
+
+	VariantClear (&name_variant);
+
+	hr = object->lpVtbl->Get (object, L"Capacity", 0, &capacity_variant, NULL, NULL);
+	if (FAILED (hr))
+	{
+		return NULL;
+	}
+
+	capacity = variant_to_uint64 (&capacity_variant);
+
+	VariantClear (&capacity_variant);
+
+	if (capacity == 0)
+	{
+		return NULL;
+	}
+
+	hr = object->lpVtbl->Get (object, L"FreeSpace", 0, &free_space_variant, NULL, NULL);
+	if (FAILED (hr))
+	{
+		return NULL;
+	}
+
+	free_space = variant_to_uint64 (&free_space_variant);
+
+	VariantClear (&free_space_variant);
+
+	if (free_space == 0)
+	{
+		return NULL;
+	}
+
+	hdd_capacity += capacity;
+	hdd_free_space += free_space;
+
+	return NULL;
 }

 static char *get_memory_info (void)
@@ -115,3 +471,23 @@ static char *get_memory_info (void)

 	return sysinfo_format_memory (meminfo.ullTotalPhys, meminfo.ullAvailPhys);
 }
+
+static char *bstr_to_utf8 (BSTR bstr)
+{
+	return g_utf16_to_utf8 (bstr, SysStringLen (bstr), NULL, NULL, NULL);
+}
+
+static guint64 variant_to_uint64 (VARIANT *variant)
+{
+	switch (V_VT (variant))
+	{
+	case VT_UI8:
+		return variant->ullVal;
+
+	case VT_BSTR:
+		return wcstoull (variant->bstrVal, NULL, 10);
+
+	default:
+		return 0;
+	}
+}
--- a/plugins/upd/upd.vcxproj
+++ b/plugins/upd/upd.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/plugins/winamp/winamp.c
+++ b/plugins/winamp/winamp.c
@@ -13,7 +13,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>

 #include "hexchat-plugin.h"

@@ -22,127 +21,163 @@

 static hexchat_plugin *ph;   /* plugin handle */

+BOOL winamp_found = FALSE;
+
+int status = 0;
+
+/* Slightly modified from X-Chat's log_escape_strcpy */
+static char *
+song_strcpy (char *dest, char *src)
+{
+	while (*src)
+	{
+		*dest = *src;
+		dest++;
+		src++;
+
+		if (*src == '%')
+		{
+			dest[0] = '%';
+			dest++;
+		}
+	}
+
+	dest[0] = 0;
+	return dest - 1;
+}
+
 static int
 winamp(char *word[], char *word_eol[], void *userdata)
 {
-	HWND hwndWinamp = FindWindowW(L"Winamp v1.x",NULL);

-	if (hwndWinamp)
+char current_play[2048], *p;
+char p_esc[2048];
+char cur_esc[2048];
+char truc[2048];
+HWND hwndWinamp = FindWindow("Winamp v1.x",NULL);
+
+    if (hwndWinamp)
 	{
-		if (!stricmp("PAUSE", word[2]))
-		{
-			if (SendMessage(hwndWinamp,WM_USER, 0, 104))
+	    {
+	        if (!stricmp("PAUSE", word[2]))
 			{
-				SendMessage(hwndWinamp, WM_COMMAND, 40046, 0);
-			
-				if (SendMessage(hwndWinamp, WM_USER, 0, 104) == PLAYING)
-					hexchat_printf(ph, "Winamp: playing");
-				else
-					hexchat_printf(ph, "Winamp: paused");
-			}
-		}
-		else if (!stricmp("STOP", word[2]))
-		{
-			SendMessage(hwndWinamp, WM_COMMAND, 40047, 0);
-			hexchat_printf(ph, "Winamp: stopped");
-		}
-		else if (!stricmp("PLAY", word[2]))
-		{
-			SendMessage(hwndWinamp, WM_COMMAND, 40045, 0);
-			hexchat_printf(ph, "Winamp: playing");
-		}
-		else if (!stricmp("NEXT", word[2]))
-		{
-			SendMessage(hwndWinamp, WM_COMMAND, 40048, 0);
-			hexchat_printf(ph, "Winamp: next playlist entry");
-		}
-		else if (!stricmp("PREV", word[2]))
-		{
-			SendMessage(hwndWinamp, WM_COMMAND, 40044, 0);
-			hexchat_printf(ph, "Winamp: previous playlist entry");
-		}
-		else if (!stricmp("START", word[2]))
-		{
-			SendMessage(hwndWinamp, WM_COMMAND, 40154, 0);
-			hexchat_printf(ph, "Winamp: playlist start");
-		}
-		else if (!word_eol[2][0])
-		{
-			wchar_t wcurrent_play[2048];
-			char *current_play, *p;
-			int len = GetWindowTextW(hwndWinamp, wcurrent_play, G_N_ELEMENTS(wcurrent_play));
-
-			current_play = g_utf16_to_utf8 (wcurrent_play, len, NULL, NULL, NULL);
-			if (!current_play)
-			{
-				hexchat_print (ph, "Winamp: Error getting song information.");
-				return HEXCHAT_EAT_ALL;
-			}
-
-			if (strchr(current_play, '-'))
-			{
-				/* Remove any trailing text and whitespace */
-				p = current_play + strlen(current_play) - 8;
-				while (p >= current_play)
+			   if (SendMessage(hwndWinamp,WM_USER, 0, 104))
 				{
-					if (!strnicmp(p, "- Winamp", 8))
-						break;
-					p--;
+			   	   SendMessage(hwndWinamp, WM_COMMAND, 40046, 0);
+			
+			       if (SendMessage(hwndWinamp, WM_USER, 0, 104) == PLAYING)
+			   	       hexchat_printf(ph, "Winamp: playing");
+			       else
+                       hexchat_printf(ph, "Winamp: paused");
 				}
-
-				if (p >= current_play)
-					p--;
-
-				while (p >= current_play && *p == ' ')
-					p--;
-				*++p = '\0';
-
-				/* Ignore any leading track number */
-				p = strstr (current_play, ". ");
-				if (p)
-					p += 2;
-				else
-					p = current_play;
-
-				if (*p != '\0')
-					hexchat_commandf (ph, "me is now playing: %s", p);
-				else
-					hexchat_print (ph, "Winamp: No song information found.");
-				g_free (current_play);
-			}
+            }
 			else
-				hexchat_print(ph, "Winamp: Nothing being played.");
-		}
-		else
-			hexchat_printf(ph, "Usage: /WINAMP [PAUSE|PLAY|STOP|NEXT|PREV|START]\n");
+		        if (!stricmp("STOP", word[2]))
+			    {
+			       SendMessage(hwndWinamp, WM_COMMAND, 40047, 0);
+			       hexchat_printf(ph, "Winamp: stopped");
+			    }
+			else
+			    if (!stricmp("PLAY", word[2]))
+			    {
+			         SendMessage(hwndWinamp, WM_COMMAND, 40045, 0);
+			         hexchat_printf(ph, "Winamp: playing");
+			    }
+        	else
+
+			    if (!stricmp("NEXT", word[2]))
+			    {
+			         SendMessage(hwndWinamp, WM_COMMAND, 40048, 0);
+			         hexchat_printf(ph, "Winamp: next playlist entry");
+			    }
+			else
+
+                if (!stricmp("PREV", word[2]))
+			    {
+			         SendMessage(hwndWinamp, WM_COMMAND, 40044, 0);
+			         hexchat_printf(ph, "Winamp: previous playlist entry");
+			    }
+		    else
+
+                if (!stricmp("START", word[2]))
+			    {
+			         SendMessage(hwndWinamp, WM_COMMAND, 40154, 0);
+			         hexchat_printf(ph, "Winamp: playlist start");
+			    }
+
+		    else
+
+                if (!word_eol[2][0])
+			    {
+					GetWindowText(hwndWinamp, current_play, sizeof(current_play));
+
+					if (strchr(current_play, '-'))
+					{
+	
+					p = current_play + strlen(current_play) - 8;
+					while (p >= current_play)
+					{
+						if (!strnicmp(p, "- Winamp", 8)) break;
+							p--;
+					}
+
+					if (p >= current_play) p--;
+	
+					while (p >= current_play && *p == ' ') p--;
+						*++p=0;
+	
+	
+					p = strchr(current_play, '.') + 1;
+
+ 					song_strcpy(p_esc, p);
+ 					song_strcpy(cur_esc, current_play);
+	
+					if (p)
+					{
+						sprintf(truc, "me is now playing:%s", p_esc);
+					}
+					else
+					{
+						sprintf(truc, "me is now playing:%s", cur_esc);
+					}
+	
+	   				hexchat_commandf(ph, truc);
+	
+				}
+				else hexchat_print(ph, "Winamp: Nothing being played.");
+			}
+		    else
+                hexchat_printf(ph, "Usage: /WINAMP [PAUSE|PLAY|STOP|NEXT|PREV|START]\n");
+         }
+
 	}
 	else
 	{
-		hexchat_print(ph, "Winamp not found.\n");
+       hexchat_print(ph, "Winamp not found.\n");
 	}
 	return HEXCHAT_EAT_ALL;
 }

 int
 hexchat_plugin_init(hexchat_plugin *plugin_handle,
-					  char **plugin_name,
-					  char **plugin_desc,
-					  char **plugin_version,
-					  char *arg)
+                      char **plugin_name,
+                      char **plugin_desc,
+                      char **plugin_version,
+                      char *arg)
 {
 	/* we need to save this for use with any hexchat_* functions */
 	ph = plugin_handle;

 	*plugin_name = "Winamp";
 	*plugin_desc = "Winamp plugin for HexChat";
-	*plugin_version = "0.6";
+	*plugin_version = "0.5";

 	hexchat_hook_command (ph, "WINAMP", HEXCHAT_PRI_NORM, winamp, "Usage: /WINAMP [PAUSE|PLAY|STOP|NEXT|PREV|START] - control Winamp or show what's currently playing", 0);
   	hexchat_command (ph, "MENU -ishare\\music.png ADD \"Window/Display Current Song (Winamp)\" \"WINAMP\"");

 	hexchat_print (ph, "Winamp plugin loaded\n");

-	return 1;	   /* return 1 for success */
+	return 1;       /* return 1 for success */
 }

 int
--- a/plugins/winamp/winamp.vcxproj
+++ b/plugins/winamp/winamp.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
@@ -30,21 +30,19 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
+    <Link>
+      <ModuleDefinitionFile>winamp.def</ModuleDefinitionFile>
+    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
      <ModuleDefinitionFile>winamp.def</ModuleDefinitionFile>
-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,4 @@
-# HexChat [![Build Status](http://img.shields.io/travis/hexchat/hexchat.svg?style=flat)](https://travis-ci.org/hexchat/hexchat) [![Build Status](http://img.shields.io/jenkins/s/http/node1.sored.pl:8090/hexchat.svg?style=flat)](http://node1.sored.pl:8090/job/hexchat/)
+# HexChat [![Build Status](http://img.shields.io/travis/hexchat/hexchat.svg?style=flat)](https://travis-ci.org/hexchat/hexchat) [![Build Status](http://img.shields.io/jenkins/s/http/nekomimi.cloudapp.net:8080/hexchat.svg?style=flat)](http://nekomimi.cloudapp.net:8080/job/hexchat/)

 HexChat is an IRC client for Windows and UNIX-like operating systems.  
 See [IRCHelp.org](http://irchelp.org) for information about IRC in general.  
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -20,7 +20,6 @@ EXTRA_DIST = \
 	inbound.h \
 	inet.h \
 	make-te.c \
-	marshalers.list \
 	modes.h \
 	network.h \
 	notify.h \
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -39,7 +39,7 @@
 #endif

 #define DEF_FONT "Monospace 9"
-#define DEF_FONT_ALTER "Arial Unicode MS,Segoe UI Emoji,Lucida Sans Unicode,Meiryo,Symbola,Unifont"
+#define DEF_FONT_ALTER "Arial Unicode MS,Lucida Sans Unicode,Meiryo,Symbola,Unifont"

 const char * const languages[LANGUAGES_LENGTH] = {
 	"af", "sq", "am", "ast", "az", "eu", "be", "bg", "ca", "zh_CN",      /*  0 ..  9 */
@@ -77,7 +77,7 @@ list_addentry (GSList ** list, char *cmd, char *name)
 /* read it in from a buffer to our linked list */

 static void
-list_load_from_data (GSList ** list, char *ibuf, gsize size)
+list_load_from_data (GSList ** list, char *ibuf, int size)
 {
 	char cmd[384];
 	char name[128];
@@ -110,28 +110,36 @@ list_load_from_data (GSList ** list, char *ibuf, gsize size)
 }

 void
-list_loadconf (char *filename, GSList ** list, char *defaultconf)
+list_loadconf (char *file, GSList ** list, char *defaultconf)
 {
-	GFile *file;
-	char *data;
-	gsize len;
+	char *filebuf;
+	char *ibuf;
+	int fd;
+	struct stat st;

-	file = hexchat_open_gfile (filename);
+	filebuf = g_build_filename (get_xdir (), file, NULL);
+	fd = g_open (filebuf, O_RDONLY | OFLAGS, 0);
+	g_free (filebuf);

-	if (!g_file_query_exists (file, NULL))
+	if (fd == -1)
 	{
 		if (defaultconf)
 			list_load_from_data (list, defaultconf, strlen (defaultconf));
 		return;
 	}
-
-	if (g_file_load_contents (file, NULL, &data, &len, NULL, NULL))
+	if (fstat (fd, &st) != 0)
 	{
-		list_load_from_data (list, data, len);
-		g_free (data);
+		perror ("fstat");
+		abort ();
 	}

-	g_object_unref (file);
+	ibuf = g_malloc (st.st_size);
+	read (fd, ibuf, st.st_size);
+	close (fd);
+
+	list_load_from_data (list, ibuf, st.st_size);
+
+	g_free (ibuf);
 }

 void
@@ -206,25 +214,40 @@ cfg_get_str (char *cfg, const char *var, char *dest, int dest_len)
 	}
 }

-int
-cfg_put_str (GOutputStream *ostream, const char *var, const char *value)
+static int
+cfg_put_str (int fh, char *var, char *value)
 {
-	return (stream_writef (ostream, "%s = %s\n", var, value) != 0);
+	char buf[512];
+	int len;
+
+	g_snprintf (buf, sizeof buf, "%s = %s\n", var, value);
+	len = strlen (buf);
+	return (write (fh, buf, len) == len);
 }

 int
-cfg_put_color (GOutputStream *ostream, guint16 r, guint16 g, guint16 b, char *var)
+cfg_put_color (int fh, guint16 r, guint16 g, guint16 b, char *var)
 {
-	return (stream_writef (ostream, "%s = %04x %04x %04x\n", var, r, g, b) != 0);
+	char buf[400];
+	int len;
+
+	g_snprintf (buf, sizeof buf, "%s = %04hx %04hx %04hx\n", var, r, g, b);
+	len = strlen (buf);
+	return (write (fh, buf, len) == len);
 }

 int
-cfg_put_int (GOutputStream *ostream, int value, char *var)
+cfg_put_int (int fh, int value, char *var)
 {
+	char buf[400];
+	int len;
+
 	if (value == -1)
 		value = 1;

-	return (stream_writef (ostream, "%s = %d\n", var, value) != 0);
+	g_snprintf (buf, sizeof buf, "%s = %d\n", var, value);
+	len = strlen (buf);
+	return (write (fh, buf, len) == len);
 }

 int
@@ -315,6 +338,18 @@ check_config_dir (void)
 	return g_access (get_xdir (), F_OK);
 }

+static char *
+default_file (void)
+{
+	static char *dfile = NULL;
+
+	if (!dfile)
+	{
+		dfile = g_build_filename (get_xdir (), "hexchat.conf", NULL);
+	}
+	return dfile;
+}
+
 /* Keep these sorted!! */

 const struct prefs vars[] =
@@ -441,7 +476,7 @@ const struct prefs vars[] =
 	{"gui_win_ucount", P_OFFINT (hex_gui_win_ucount), TYPE_BOOL},
 	{"gui_win_width", P_OFFINT (hex_gui_win_width), TYPE_INT},

-	{"identd_server", P_OFFINT (hex_identd_server), TYPE_BOOL},
+	{"identd", P_OFFINT (hex_identd), TYPE_BOOL},
 	{"identd_port", P_OFFINT (hex_identd_port), TYPE_INT},

 	{"input_balloon_chans", P_OFFINT (hex_input_balloon_chans), TYPE_BOOL},
@@ -550,17 +585,16 @@ const struct prefs vars[] =
 	{0, 0, 0},
 };

-
-static char *
-convert_with_fallback (char *str, const char *fallback)
+static const char *
+convert_with_fallback (const char *str, const char *fallback)
 {
-	char *utf;
+	const char *utf;

 #ifndef WIN32
 	/* On non-Windows, g_get_user_name and g_get_real_name return a string in system locale, so convert it to utf-8. */
 	utf = g_locale_to_utf8 (str, -1, NULL, NULL, 0);

-	g_free (str);
+	g_free ((char*)str);

 	/* The returned string is NULL if conversion from locale to utf-8 failed for any reason. Return the fallback. */
 	if (!utf)
@@ -677,15 +711,14 @@ get_default_spell_languages (void)
 void
 load_default_config(void)
 {
-	char *username, *realname, *langs;
-	const char *font;
+	const char *username, *realname, *font, *langs;
 	char *sp;
 #ifdef WIN32
 	wchar_t* roaming_path_wide;
 	gchar* roaming_path;
 #endif

-	username = g_strdup(g_get_user_name ());
+	username = g_get_user_name ();
 	if (!username)
 		username = g_strdup ("root");

@@ -871,9 +904,9 @@ load_default_config(void)
 	if (sp)
 		sp[0] = 0;	/* spaces in username would break the login */

-	g_free (username);
-	g_free (realname);
-	g_free (langs);
+	g_free ((char *)username);
+	g_free ((char *)realname);
+	g_free ((char *)langs);
 }

 int
@@ -918,21 +951,13 @@ make_dcc_dirs (void)
 int
 load_config (void)
 {
-	GFile *file;
 	char *cfg, *sp;
 	int res, val, i;

 	g_assert(check_config_dir () == 0);

-	file = hexchat_open_gfile ("hexchat.conf");
-
-	if (!g_file_load_contents (file, NULL, &cfg, NULL, NULL, NULL))
-	{
-		g_object_unref (file);
+	if (!g_file_get_contents (default_file (), &cfg, NULL, NULL))
 		return -1;
-	}
-	
-	g_object_unref (file);

 	/* If the config is incomplete we have the default values loaded */
 	load_default_config();
@@ -974,26 +999,26 @@ load_config (void)
 int
 save_config (void)
 {
-	GFile *file, *tmpfile;
-	GOutputStream *ostream;
-	GFileIOStream *tmpstream;
-	gboolean ret;
-	int i;
+	int fh, i;
+	char *config, *new_config;

 	if (check_config_dir () != 0)
 		make_config_dirs ();

-	tmpfile = g_file_new_tmp (NULL, &tmpstream, NULL);
-	if (!tmpfile)
+	config = default_file ();
+	new_config = g_strconcat (config, ".new", NULL);
+	
+	fh = g_open (new_config, OFLAGS | O_TRUNC | O_WRONLY | O_CREAT, 0600);
+	if (fh == -1)
 	{
+		g_free (new_config);
 		return 0;
 	}

-	ostream = g_io_stream_get_output_stream (G_IO_STREAM(tmpstream));
-
-	if (!cfg_put_str (ostream, "version", PACKAGE_VERSION))
+	if (!cfg_put_str (fh, "version", PACKAGE_VERSION))
 	{
-		g_object_unref (tmpfile);
+		close (fh);
+		g_free (new_config);
 		return 0;
 	}
 		
@@ -1003,17 +1028,19 @@ save_config (void)
 		switch (vars[i].type)
 		{
 		case TYPE_STR:
-			if (!cfg_put_str (ostream, vars[i].name, (char *) &prefs + vars[i].offset))
+			if (!cfg_put_str (fh, vars[i].name, (char *) &prefs + vars[i].offset))
 			{
-				g_object_unref (tmpfile);
+				close (fh);
+				g_free (new_config);
 				return 0;
 			}
 			break;
 		case TYPE_INT:
 		case TYPE_BOOL:
-			if (!cfg_put_int (ostream, *((int *) &prefs + vars[i].offset), vars[i].name))
+			if (!cfg_put_int (fh, *((int *) &prefs + vars[i].offset), vars[i].name))
 			{
-				g_object_unref (tmpfile);
+				close (fh);
+				g_free (new_config);
 				return 0;
 			}
 		}
@@ -1021,15 +1048,23 @@ save_config (void)
 	}
 	while (vars[i].name);

-	g_object_unref (ostream);
+	if (close (fh) == -1)
+	{
+		g_free (new_config);
+		return 0;
+	}

-	file = hexchat_open_gfile ("hexchat.conf");
-	ret = g_file_move (tmpfile, file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL);
+#ifdef WIN32
+	g_unlink (config);	/* win32 can't rename to an existing file */
+#endif
+	if (g_rename (new_config, config) == -1)
+	{
+		g_free (new_config);
+		return 0;
+	}
+	g_free (new_config);

-	g_object_unref (tmpfile);
-	g_object_unref (file);
-
-	return ret;
+	return 1;
 }

 static void
@@ -1320,69 +1355,3 @@ hexchat_fopen_file (const char *file, const char *mode, int xof_flags)

 	return fh;
 }
-
-/*
- * Returns a #GFile* to a file in HexChat's config dir.
- * Must be g_object_unref()'d when done.
- * @filename must be in utf8 encoding.
- */
-GFile *
-hexchat_open_gfile (const char *filename)
-{
-	GFile *file;
-	gchar *full_path, *full_path_fs;
-
-	if (g_path_is_absolute (filename))
-		full_path = g_strdup (filename);
-	else
-		full_path = g_build_filename (get_xdir(), filename, NULL);
-	full_path_fs = g_filename_from_utf8 (full_path, -1, NULL, NULL, NULL);
-
-	file = g_file_new_for_path (full_path_fs);
-
-	g_free (full_path);
-	g_free (full_path_fs);
-
-	return file;
-}
-
-G_GNUC_PRINTF (2, 3)
-gsize
-stream_writef (GOutputStream *ostream, const char *fmt, ...)
-{
-	char *tmp;
-	va_list args;
-	gint len;
-	gsize ret;
-
-	va_start (args, fmt);
-	len = g_vasprintf (&tmp, fmt, args);
-	va_end (args);
-
-	ret = g_output_stream_write (ostream, tmp, len, NULL, NULL);
-	g_free (tmp);
-	
-	return ret;
-}
-
-GDataInputStream *
-file_get_datainputstream (GFile *file)
-{
-	GInputStream *stream;
-	GDataInputStream *datastream;
-
-	stream = G_INPUT_STREAM(g_file_read (file, NULL, NULL));
-	if (!stream)
-		return NULL;
-
-	datastream = g_data_input_stream_new (stream);
-	/*
-	* This is to avoid any issues moving between windows/unix
-	* but the docs mention an invalid \r without a following \n
-	* can lock up the program
-	*/
-	g_data_input_stream_set_newline_type (datastream, G_DATA_STREAM_NEWLINE_TYPE_ANY);
-	g_object_unref (stream);
-	
-	return datastream;
-}
--- a/src/common/cfgfiles.h
+++ b/src/common/cfgfiles.h
@@ -30,13 +30,12 @@ extern char *xdir;
 extern const char * const languages[LANGUAGES_LENGTH];

 char *cfg_get_str (char *cfg, const char *var, char *dest, int dest_len);
-int cfg_put_str (GOutputStream *ostream, const char *var, const char *value);
 int cfg_get_bool (char *var);
 int cfg_get_int_with_result (char *cfg, char *var, int *result);
 int cfg_get_int (char *cfg, char *var);
-int cfg_put_int (GOutputStream *ostream, int value, char *var);
+int cfg_put_int (int fh, int value, char *var);
 int cfg_get_color (char *cfg, char *var, guint16 *r, guint16 *g, guint16 *b);
-int cfg_put_color (GOutputStream *ostream, guint16 r, guint16 g, guint16 b, char *var);
+int cfg_put_color (int fh, guint16 r, guint16 g, guint16 b, char *var);
 char *get_xdir (void);
 int check_config_dir (void);
 void load_default_config (void);
@@ -45,15 +44,12 @@ int make_dcc_dirs (void);
 int load_config (void);
 int save_config (void);
 void list_free (GSList ** list);
-void list_loadconf (char *filename, GSList ** list, char *defaultconf);
+void list_loadconf (char *file, GSList ** list, char *defaultconf);
 int list_delentry (GSList ** list, char *name);
 void list_addentry (GSList ** list, char *cmd, char *name);
 int cmd_set (session *sess, char *tbuf, char *word[], char *word_eol[]);
 int hexchat_open_file (const char *file, int flags, int mode, int xof_flags);
 FILE *hexchat_fopen_file (const char *file, const char *mode, int xof_flags);
-GFile *hexchat_open_gfile (const char *filename);
-gsize stream_writef (GOutputStream *ostream, const char *fmt, ...) G_GNUC_PRINTF (2, 3);
-GDataInputStream *file_get_datainputstream (GFile *file);

 #define XOF_DOMODE 1
 #define XOF_FULLPATH 2
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>StaticLibrary</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
@@ -36,7 +36,6 @@
    <ClInclude Include="server.h" />
    <ClInclude Include="servlist.h" />
    <ClInclude Include="ssl.h" />
-    <ClInclude Include="sysinfo\sysinfo.h" />
    <ClInclude Include="text.h" />
    <ClInclude Include="$(HexChatLib)textenums.h" />
    <ClInclude Include="$(HexChatLib)textevents.h" />
@@ -69,7 +68,6 @@
    <ClCompile Include="server.c" />
    <ClCompile Include="servlist.c" />
    <ClCompile Include="ssl.c" />
-    <ClCompile Include="sysinfo\win32\backend.c" />
    <ClCompile Include="text.c" />
    <ClCompile Include="tree.c" />
    <ClCompile Include="url.c" />
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -9,12 +9,6 @@
      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
    </Filter>
-    <Filter Include="Source Files\sysinfo">
-      <UniqueIdentifier>{d5a3d281-8400-4663-b60d-036ade5fbff7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\sysinfo\win32">
-      <UniqueIdentifier>{a6d80da7-bc0a-4f1f-a156-c8cdafb7831d}</UniqueIdentifier>
-    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="cfgfiles.h">
@@ -116,9 +110,6 @@
    <ClInclude Include="plugin-identd.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="sysinfo\sysinfo.h">
-      <Filter>Source Files\sysinfo</Filter>
-    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="cfgfiles.c">
@@ -196,9 +187,6 @@
    <ClCompile Include="plugin-identd.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="sysinfo\win32\backend.c">
-      <Filter>Source Files\sysinfo\win32</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\win32\config.h.tt" />
--- a/src/common/dbus/dbus-plugin.c
+++ b/src/common/dbus/dbus-plugin.c
@@ -366,7 +366,6 @@ remote_object_connect (RemoteObject *obj,
 	static guint count = 0;
 	char *sender, *path;
 	RemoteObject *remote_object;
-	gchar count_buffer[15];
 	
 	sender = dbus_g_method_get_sender (context);
 	remote_object = g_hash_table_lookup (clients, sender);
@@ -375,8 +374,7 @@ remote_object_connect (RemoteObject *obj,
 		g_free (sender);
 		return TRUE;
 	}
-	g_snprintf(count_buffer, sizeof(count_buffer), "%u", count++);
-	path = g_build_filename (DBUS_OBJECT_PATH, count_buffer, NULL);
+	path = g_build_filename (DBUS_OBJECT_PATH, count++, NULL);
 	remote_object = g_object_new (REMOTE_TYPE_OBJECT, NULL);
 	remote_object->dbus_path = path;
 	remote_object->filename = g_path_get_basename (filename);
--- a/src/common/dcc.c
+++ b/src/common/dcc.c
@@ -2122,8 +2122,6 @@ update_is_resumable (struct DCC *dcc)
 		dcc->resume_error = 1;
 	}

-	g_free (filename_fs);
-
 	/* Now verify that this DCC is not already in progress from someone else */
 	if (dcc->resumable)
 	{
--- a/src/common/hexchat-plugin.h
+++ b/src/common/hexchat-plugin.h
@@ -39,6 +39,16 @@
 #define HEXCHAT_EAT_PLUGIN	2	/* don't let other plugins see this event */
 #define HEXCHAT_EAT_ALL		(HEXCHAT_EAT_HEXCHAT|HEXCHAT_EAT_PLUGIN)	/* don't let anything see this event */

+/* Taken from glib/gmacros.h */
+#if    __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#define HEXCHAT_DEPRECATED_FOR(f) __attribute__((__deprecated__("Use '" #f "' instead")))
+#elif defined(_MSC_FULL_VER) && (_MSC_FULL_VER > 140050320)
+#define HEXCHAT_DEPRECATED_FOR(f) __declspec(deprecated("is deprecated. Use '" #f "' instead"))
+#else
+#define HEXCHAT_DEPRECATED_FOR(f)
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -193,6 +203,11 @@ struct _hexchat_plugin
 	hexchat_event_attrs *(*hexchat_event_attrs_create) (hexchat_plugin *ph);
 	void (*hexchat_event_attrs_free) (hexchat_plugin *ph,
 									  hexchat_event_attrs *attrs);
+	char *(*hexchat_pluginpref_get_str_ptr) (hexchat_plugin *ph,
+		const char *var);
+	char **(*hexchat_pluginpref_list_keys) (hexchat_plugin *ph);
+	void (*hexchat_free_array) (hexchat_plugin *ph,
+	    char **arr);
 };
 #endif

@@ -380,16 +395,25 @@ void
 hexchat_free (hexchat_plugin *ph,
 	    void *ptr);

+void
+hexchat_free_array (hexchat_plugin *ph,
+	    char **arr);
+
 int
 hexchat_pluginpref_set_str (hexchat_plugin *ph,
 		const char *var,
 		const char *value);

+HEXCHAT_DEPRECATED_FOR(hexchat_pluginpref_get_str_ptr)
 int
 hexchat_pluginpref_get_str (hexchat_plugin *ph,
 		const char *var,
 		char *dest);

+char *
+hexchat_pluginpref_get_str_ptr (hexchat_plugin *ph,
+		const char *var);
+
 int
 hexchat_pluginpref_set_int (hexchat_plugin *ph,
 		const char *var,
@@ -402,10 +426,14 @@ int
 hexchat_pluginpref_delete (hexchat_plugin *ph,
 		const char *var);

+HEXCHAT_DEPRECATED_FOR(hexchat_pluginpref_list_keys)
 int
 hexchat_pluginpref_list (hexchat_plugin *ph,
 		char *dest);

+char **
+hexchat_pluginpref_list_keys (hexchat_plugin *ph);
+
 #if !defined(PLUGIN_C) && defined(WIN32)
 #ifndef HEXCHAT_PLUGIN_HANDLE
 #define HEXCHAT_PLUGIN_HANDLE (ph)
@@ -445,12 +473,15 @@ hexchat_pluginpref_list (hexchat_plugin *ph,
 #define hexchat_send_modes ((HEXCHAT_PLUGIN_HANDLE)->hexchat_send_modes)
 #define hexchat_strip ((HEXCHAT_PLUGIN_HANDLE)->hexchat_strip)
 #define hexchat_free ((HEXCHAT_PLUGIN_HANDLE)->hexchat_free)
+#define hexchat_free_array ((HEXCHAT_PLUGIN_HANDLE)->hexchat_free_array)
 #define hexchat_pluginpref_set_str ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_set_str)
 #define hexchat_pluginpref_get_str ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_get_str)
+#define hexchat_pluginpref_get_str_ptr ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_get_str_ptr)
 #define hexchat_pluginpref_set_int ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_set_int)
 #define hexchat_pluginpref_get_int ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_get_int)
 #define hexchat_pluginpref_delete ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_delete)
 #define hexchat_pluginpref_list ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_list)
+#define hexchat_pluginpref_list_keys ((HEXCHAT_PLUGIN_HANDLE)->hexchat_pluginpref_list_keys)
 #endif

 #ifdef __cplusplus
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@@ -447,6 +447,7 @@ session_new (server *serv, char *from, int type, int focus)

 	sess->server = serv;
 	sess->logfd = -1;
+	sess->scrollfd = -1;
 	sess->type = type;

 	sess->alert_beep = SET_DEFAULT;
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -154,7 +154,7 @@ struct hexchatprefs
 	unsigned int hex_gui_win_save;
 	unsigned int hex_gui_win_swap;
 	unsigned int hex_gui_win_ucount;
-	unsigned int hex_identd_server;
+	unsigned int hex_identd;
 	unsigned int hex_input_balloon_chans;
 	unsigned int hex_input_balloon_hilight;
 	unsigned int hex_input_balloon_priv;
@@ -377,8 +377,7 @@ typedef struct session
 	char channelkey[64];			  /* XXX correct max length? */
 	int limit;						  /* channel user limit */
 	int logfd;
-
-	GFile *scrollfile;							/* scrollback file */
+	int scrollfd;							/* scrollback filedes */
 	int scrollwritten;					/* number of lines written */

 	char lastnick[NICKLEN];			  /* last nick you /msg'ed */
@@ -423,7 +422,9 @@ typedef struct session

 /* SASL Mechanisms */
 #define MECH_PLAIN 0
-#define MECH_EXTERNAL 1
+#define MECH_BLOWFISH 1
+#define MECH_AES 2
+#define MECH_EXTERNAL 3

 typedef struct server
 {
@@ -545,6 +546,7 @@ typedef struct server
 	unsigned int skip_next_whois:1;	/* hide whois output */
 	unsigned int inside_whois:1;
 	unsigned int doing_dns:1;			/* /dns has been done */
+	unsigned int retry_sasl:1;		/* retrying another sasl mech */
 	unsigned int end_of_motd:1;		/* end of motd reached (logged in) */
 	unsigned int sent_quit:1;			/* sent a QUIT already? */
 	unsigned int use_listargs:1;		/* undernet and dalnet need /list >0,<10000 */
@@ -568,8 +570,8 @@ typedef struct server
 	unsigned int have_cert:1;	/* have loaded a cert */
 	unsigned int use_who:1;			/* whether to use WHO command to get dcc_ip */
 	unsigned int sasl_mech;			/* mechanism for sasl auth */
+	unsigned int sent_saslauth:1;	/* have sent AUTHENICATE yet */
 	unsigned int sent_capend:1;	/* have sent CAP END yet */
-	unsigned int waiting_on_cap:1;	/* waiting on another line of CAP LS */
 #ifdef USE_OPENSSL
 	unsigned int use_ssl:1;				  /* is server SSL capable? */
 	unsigned int accept_invalid_cert:1;/* ignore result of server's cert. verify */
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -1633,58 +1633,6 @@ inbound_identified (server *serv)	/* 'MODE +e MYSELF' on freenode */
 	}
 }

-static const char *sasl_mechanisms[] =
-{
-	"PLAIN",
-	"EXTERNAL"
-};
-
-static void
-inbound_toggle_caps (server *serv, const char *extensions_str, gboolean enable)
-{
-	char **extensions;
-	gsize i;
-
-	extensions = g_strsplit (extensions_str, " ", 0);
-
-	for (i = 0; extensions[i]; i++)
-	{
-		const char *extension = extensions[i];
-
-		if (!strcmp (extension, "identify-msg"))
-			serv->have_idmsg = enable;
-		else if (!strcmp (extension, "multi-prefix"))
-			serv->have_namesx = enable;
-		else if (!strcmp (extension, "account-notify"))
-			serv->have_accnotify = enable;
-		else if (!strcmp (extension, "extended-join"))
-			serv->have_extjoin = enable;
-		else if (!strcmp (extension, "userhost-in-names"))
-			serv->have_uhnames = enable;
-		else if (!strcmp (extension, "server-time")
-				|| !strcmp (extension, "znc.in/server-time")
-				|| !strcmp (extension, "znc.in/server-time-iso"))
-			serv->have_server_time = enable;
-		else if (!strcmp (extension, "away-notify"))
-			serv->have_awaynotify = enable;
-		else if (!strcmp (extension, "sasl"))
-		{
-			serv->have_sasl = enable;
-			if (enable)
-			{
-#ifdef USE_OPENSSL
-				if (serv->loginmethod == LOGIN_SASLEXTERNAL)
-					serv->sasl_mech = MECH_EXTERNAL;
-#endif
-				/* Mechanism either defaulted to PLAIN or server gave us list */
-				tcp_sendf (serv, "AUTHENTICATE %s\r\n", sasl_mechanisms[serv->sasl_mech]);
-			}
-		}
-	}
-
-	g_strfreev (extensions);
-}
-
 void
 inbound_cap_ack (server *serv, char *nick, char *extensions,
 					  const message_tags_data *tags_data)
@@ -1692,97 +1640,79 @@ inbound_cap_ack (server *serv, char *nick, char *extensions,
 	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPACK, serv->server_session, nick, extensions,
 								  NULL, NULL, 0, tags_data->timestamp);

-	inbound_toggle_caps (serv, extensions, TRUE);
-}
-
-void
-inbound_cap_del (server *serv, char *nick, char *extensions,
-					 const message_tags_data *tags_data)
-{
-	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPDEL, serv->server_session, nick, extensions,
-								  NULL, NULL, 0, tags_data->timestamp);
-
-	inbound_toggle_caps (serv, extensions, FALSE);
-}
-
-static const char * const supported_caps[] = {
-	"identify-msg",
-
-	/* IRCv3.1 */
-	"multi-prefix",
-	"away-notify",
-	"account-notify",
-	"extended-join",
-	/* "sasl", Handled manually */
-
-	/* IRCv3.2 */
-	"server-time",
-	"userhost-in-names",
-	"cap-notify",
-	"chghost",
-
-	/* ZNC */
-	"znc.in/server-time-iso",
-	"znc.in/server-time",
-
-	/* Twitch */
-	"twitch.tv/membership",
-};
-
-static int
-get_supported_mech (server *serv, const char *list)
-{
-	char **mechs = g_strsplit (list, ",", 0);
-	gsize i;
-	int ret = -1;
-
-	for (i = 0; mechs[i]; ++i)
+	if (strstr (extensions, "identify-msg") != NULL)
 	{
+		serv->have_idmsg = TRUE;
+	}
+
+	if (strstr (extensions, "multi-prefix") != NULL)
+	{
+		serv->have_namesx = TRUE;
+	}
+
+	if (strstr (extensions, "away-notify") != NULL)
+	{
+		serv->have_awaynotify = TRUE;
+	}
+
+	if (strstr (extensions, "account-notify") != NULL)
+	{
+		serv->have_accnotify = TRUE;
+	}
+					
+	if (strstr (extensions, "extended-join") != NULL)
+	{
+		serv->have_extjoin = TRUE;
+	}
+
+	if (strstr (extensions, "userhost-in-names") != NULL)
+	{
+		serv->have_uhnames = TRUE;
+	}
+
+	if (strstr (extensions, "server-time") != NULL)
+	{
+		serv->have_server_time = TRUE;
+	}
+
+	if (strstr (extensions, "sasl") != NULL)
+	{
+		serv->have_sasl = TRUE;
+		serv->sent_saslauth = FALSE;
+
 #ifdef USE_OPENSSL
 		if (serv->loginmethod == LOGIN_SASLEXTERNAL)
 		{
-			if (!strcmp (mechs[i], "EXTERNAL"))
-			{
-				ret = MECH_EXTERNAL;
-				break;
-			}
+			serv->sasl_mech = MECH_EXTERNAL;
+			tcp_send_len (serv, "AUTHENTICATE EXTERNAL\r\n", 23);
 		}
 		else
-#endif
-		if (!strcmp (mechs[i], "PLAIN"))
 		{
-			ret = MECH_PLAIN;
-			break;
+			/* default to most secure, it will fallback if not supported */
+			serv->sasl_mech = MECH_AES;
+			tcp_send_len (serv, "AUTHENTICATE DH-AES\r\n", 21);
 		}
+#else
+		serv->sasl_mech = MECH_PLAIN;
+		tcp_send_len (serv, "AUTHENTICATE PLAIN\r\n", 20);
+#endif
 	}
-
-	g_strfreev (mechs);
-	return ret;
 }

 void
 inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 					 const message_tags_data *tags_data)
 {
-	char buffer[500];	/* buffer for requesting capabilities and emitting the signal */
-	gboolean want_cap = FALSE; /* format the CAP REQ string based on previous capabilities being requested or not */
-	gboolean want_sasl = FALSE; /* CAP END shouldn't be sent when SASL is requested, it needs further responses */
+	char buffer[256];	/* buffer for requesting capabilities and emitting the signal */
+	guint32 want_cap; /* format the CAP REQ string based on previous capabilities being requested or not */
+	guint32 want_sasl; /* CAP END shouldn't be sent when SASL is requested, it needs further responses */
 	char **extensions;
 	int i;

-	if (g_str_has_prefix (extensions_str, "* "))
-	{
-		serv->waiting_on_cap = TRUE;
-		extensions_str += 2;
-		extensions_str += extensions_str[0] == ':' ? 1 : 0;
-	}
-	else
-	{
-		serv->waiting_on_cap = FALSE;
-	}
-
 	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPLIST, serv->server_session, nick,
 								  extensions_str, NULL, NULL, 0, tags_data->timestamp);
+	want_cap = 0;
+	want_sasl = 0;

 	extensions = g_strsplit (extensions_str, " ", 0);

@@ -1790,43 +1720,67 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,

 	for (i=0; extensions[i]; i++)
 	{
-		char *extension = extensions[i];
-		char *value;
-		gsize x;
+		const char *extension = extensions[i];

-		/* CAP 3.2 can provide values */
-		if ((value = strchr (extension, '=')))
+		if (!strcmp (extension, "identify-msg"))
 		{
-			*value = '\0';
-			value++;
+			strcat (buffer, "identify-msg ");
+			want_cap = 1;
+		}
+		if (!strcmp (extension, "multi-prefix"))
+		{
+			strcat (buffer, "multi-prefix ");
+			want_cap = 1;
+		}
+		if (!strcmp (extension, "away-notify"))
+		{
+			strcat (buffer, "away-notify ");
+			want_cap = 1;
+		}
+		if (!strcmp (extension, "account-notify"))
+		{
+			strcat (buffer, "account-notify ");
+			want_cap = 1;
+		}
+		if (!strcmp (extension, "extended-join"))
+		{
+			strcat (buffer, "extended-join ");
+			want_cap = 1;
+		}
+		if (!strcmp (extension, "userhost-in-names"))
+		{
+			strcat (buffer, "userhost-in-names ");
+			want_cap = 1;
+		}
+
+		/* bouncers can prefix a name space to the extension so we should use.
+		 * znc <= 1.0 uses "znc.in/server-time" and newer use "znc.in/server-time-iso".
+		 */
+		if (!strcmp (extension, "znc.in/server-time-iso"))
+		{
+			strcat (buffer, "znc.in/server-time-iso ");
+			want_cap = 1;
+		}
+		if (!strcmp (extension, "znc.in/server-time"))
+		{
+			strcat (buffer, "znc.in/server-time ");
+			want_cap = 1;
+		}
+		if (prefs.hex_irc_cap_server_time
+			 && !strcmp (extension, "server-time"))
+		{
+			strcat (buffer, "server-time ");
+			want_cap = 1;
 		}
 		
 		/* if the SASL password is set AND auth mode is set to SASL, request SASL auth */
-		if (!g_strcmp0 (extension, "sasl") &&
-			((serv->loginmethod == LOGIN_SASL && strlen (serv->password) != 0)
-				|| (serv->loginmethod == LOGIN_SASLEXTERNAL && serv->have_cert)))
+		if (!strcmp (extension, "sasl")
+			&& ((serv->loginmethod == LOGIN_SASL && strlen (serv->password) != 0)
+			|| (serv->loginmethod == LOGIN_SASLEXTERNAL && serv->have_cert)))
 		{
-			if (value)
-			{
-				int sasl_mech = get_supported_mech (serv, value);
-				if (sasl_mech == -1) /* No supported mech */
-					continue;
-				serv->sasl_mech = sasl_mech;
-			}
-			want_cap = TRUE;
-			want_sasl = TRUE;
-			g_strlcat (buffer, "sasl ", sizeof(buffer));
-			continue;
-		}
-
-		for (x = 0; x < G_N_ELEMENTS(supported_caps); ++x)
-		{
-			if (!g_strcmp0 (extension, supported_caps[x]))
-			{
-				g_strlcat (buffer, extension, sizeof(buffer));
-				g_strlcat (buffer, " ", sizeof(buffer));
-				want_cap = TRUE;
-			}
+			strcat (buffer, "sasl ");
+			want_cap = 1;
+			want_sasl = 1;
 		}
 	}

@@ -1840,7 +1794,7 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 									  tags_data->timestamp);
 		tcp_sendf (serv, "%s\r\n", g_strchomp (buffer));
 	}
-	if (!want_sasl && !serv->waiting_on_cap)
+	if (!want_sasl)
 	{
 		/* if we use SASL, CAP END is dealt via raw numerics */
 		serv->sent_capend = TRUE;
@@ -1851,26 +1805,52 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 void
 inbound_cap_nak (server *serv, const message_tags_data *tags_data)
 {
-	if (!serv->waiting_on_cap && !serv->sent_capend)
-	{
-		serv->sent_capend = TRUE;
-		tcp_send_len (serv, "CAP END\r\n", 9);
-	}
+	serv->sent_capend = TRUE;
+	tcp_send_len (serv, "CAP END\r\n", 9);
 }

 void
 inbound_cap_list (server *serv, char *nick, char *extensions,
 						const message_tags_data *tags_data)
 {
-	if (g_str_has_prefix (extensions, "* "))
-	{
-		extensions += 2;
-		extensions += extensions[0] == ':' ? 1 : 0;
-	}
 	EMIT_SIGNAL_TIMESTAMP (XP_TE_CAPACK, serv->server_session, nick, extensions,
 								  NULL, NULL, 0, tags_data->timestamp);
 }

+static const char *sasl_mechanisms[] =
+{
+	"PLAIN",
+	"DH-BLOWFISH",
+	"DH-AES",
+	"EXTERNAL"
+};
+
+void
+inbound_sasl_supportedmechs (server *serv, char *list)
+{
+	int i;
+
+	if (serv->sasl_mech != MECH_EXTERNAL)
+	{
+		/* Use most secure one supported */
+		for (i = MECH_AES; i >= MECH_PLAIN; i--)
+		{
+			if (strstr (list, sasl_mechanisms[i]) != NULL)
+			{
+				serv->sasl_mech = i;
+				serv->retry_sasl = TRUE;
+				tcp_sendf (serv, "AUTHENTICATE %s\r\n", sasl_mechanisms[i]);
+				return;
+			}
+		}
+	}
+
+	/* Abort, none supported */
+	serv->sent_saslauth = TRUE;
+	tcp_sendf (serv, "AUTHENTICATE *\r\n");
+	return;
+}
+
 void
 inbound_sasl_authenticate (server *serv, char *data)
 {
@@ -1878,10 +1858,12 @@ inbound_sasl_authenticate (server *serv, char *data)
 		char *user, *pass = NULL;
 		const char *mech = sasl_mechanisms[serv->sasl_mech];

-		/* Got a list of supported mechanisms from outdated inspircd
-		 * just ignore it as it goes against spec */
+		/* Got a list of supported mechanisms from inspircd */
 		if (strchr (data, ',') != NULL)
+		{
+			inbound_sasl_supportedmechs (serv, data);
 			return;
+		}

 		if (net->user && !(net->flags & FLAG_USE_GLOBAL))
 			user = net->user;
@@ -1894,6 +1876,12 @@ inbound_sasl_authenticate (server *serv, char *data)
 			pass = encode_sasl_pass_plain (user, serv->password);
 			break;
 #ifdef USE_OPENSSL
+		case MECH_BLOWFISH:
+			pass = encode_sasl_pass_blowfish (user, serv->password, data);
+			break;
+		case MECH_AES:
+			pass = encode_sasl_pass_aes (user, serv->password, data);
+			break;
 		case MECH_EXTERNAL:
 			pass = g_strdup ("+");
 			break;
@@ -1903,10 +1891,12 @@ inbound_sasl_authenticate (server *serv, char *data)
 		if (pass == NULL)
 		{
 			/* something went wrong abort */
+			serv->sent_saslauth = TRUE; /* prevent trying PLAIN */
 			tcp_sendf (serv, "AUTHENTICATE *\r\n");
 			return;
 		}

+		serv->sent_saslauth = TRUE;
 		tcp_sendf (serv, "AUTHENTICATE %s\r\n", pass);
 		g_free (pass);

@@ -1915,9 +1905,19 @@ inbound_sasl_authenticate (server *serv, char *data)
 								NULL,	NULL,	0,	0);
 }

-void
+int
 inbound_sasl_error (server *serv)
 {
-	/* Just abort, not much we can do */
-	tcp_sendf (serv, "AUTHENTICATE *\r\n");
+	if (serv->retry_sasl && !serv->sent_saslauth)
+		return 1;
+
+	/* If server sent 904 before we sent password,
+		* mech not support so fallback to next mech */
+	if (!serv->sent_saslauth && serv->sasl_mech != MECH_EXTERNAL && serv->sasl_mech != MECH_PLAIN)
+	{
+		serv->sasl_mech -= 1;
+		tcp_sendf (serv, "AUTHENTICATE %s\r\n", sasl_mechanisms[serv->sasl_mech]);
+		return 1;
+	}
+	return 0;
 }
--- a/src/common/inbound.h
+++ b/src/common/inbound.h
@@ -95,10 +95,9 @@ void inbound_cap_ls (server *serv, char *nick, char *extensions,
 void inbound_cap_nak (server *serv, const message_tags_data *tags_data);
 void inbound_cap_list (server *serv, char *nick, char *extensions,
 							  const message_tags_data *tags_data);
-void inbound_cap_del (server *serv, char *nick, char *extensions,
-							  const message_tags_data *tags_data);
 void inbound_sasl_authenticate (server *serv, char *data);
-void inbound_sasl_error (server *serv);
+int inbound_sasl_error (server *serv);
+void inbound_sasl_supportedmechs (server *serv, char *list);
 void do_dns (session *sess, char *nick, char *host,
 				 const message_tags_data *tags_data);
 gboolean alert_match_word (char *word, char *masks);
--- a/src/common/make-te.vcxproj
+++ b/src/common/make-te.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -78,72 +78,40 @@ notc_msg (struct session *sess)
 static char *
 random_line (char *file_name)
 {
-	GFile *file;
-	char *data, *p, *ret = NULL;
-	int lines = 0, ran;
-	gsize len;
+	FILE *fh;
+	char buf[512];
+	int lines, ran;

 	if (!file_name[0])
-		return g_strdup ("");
+		goto nofile;

-	file = hexchat_open_gfile (file_name);
-
-	if (!g_file_query_exists (file, NULL))
+	fh = hexchat_fopen_file (file_name, "r", 0);
+	if (!fh)
 	{
+	 nofile:
 		/* reason is not a file, an actual reason! */
 		return g_strdup (file_name);
 	}

-	if (!g_file_load_contents (file, NULL, &data, &len, NULL, NULL))
-	{
-		g_object_unref (file);
-		return g_strdup (file_name);
-	}
-	
-	g_object_unref (file);
-
 	/* count number of lines in file */
-	p = data;
-	while (p != data + len)
-	{
-		if (*p == '\n')
-			lines++;
-		p++;
-	}
+	lines = 0;
+	while (fgets (buf, sizeof (buf), fh))
+		lines++;

-	if (!lines)
-	{
-		g_free (data);
-		return g_strdup (file_name);
-	}
+	if (lines < 1)
+		goto nofile;

-	/* create random number */
+	/* go down a random number */
+	rewind (fh);
 	ran = RAND_INT (lines);
-
-	/* get that random line */
-	p = data;
-	while (p != data + len)
+	do
 	{
-		if (*p == '\n')
-		{
-			if (!--ran)
-			{
-				char *end;
-				end = strchr (++p, '\n');
-				*end = '\0';
-				ret = g_strdup (p);
-				break;
-			}
-		}
-		p++;
+		fgets (buf, sizeof (buf), fh);
+		lines--;
 	}
-
-	g_free (data);
-	if (ret)
-		return ret;
-	else
-		return g_strdup (file_name);
-
+	while (lines > ran);
+	fclose (fh);
+	return g_strdup (buf);
 }

 void
@@ -2519,32 +2487,30 @@ cmd_list (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 }

 gboolean
-load_perform_file (session *sess, char *filename)
+load_perform_file (session *sess, char *file)
 {
-	GFile *file;
-	GDataInputStream *istream;
-	gchar *buf;
+	char tbuf[1024 + 4];
+	char *nl;
+	FILE *fp;

-	file = hexchat_open_gfile (filename);
-
-	istream = file_get_datainputstream (file);
-	if (!istream)
-	{
-		g_object_unref (file);
+	fp = hexchat_fopen_file (file, "r", 0);		/* load files from config dir */
+	if (!fp)
 		return FALSE;
-	}

-	while ((buf = g_data_input_stream_read_line_utf8 (istream, NULL, NULL, NULL)))
+	tbuf[1024] = 0;
+	while (fgets (tbuf, 1024, fp))
 	{
-		if (g_str_has_prefix (buf, prefs.hex_input_command_char))
-			handle_command (sess, buf + 1, TRUE);
+		nl = strchr (tbuf, '\n');
+		if (nl == tbuf) /* skip empty commands */
+			continue;
+		if (nl)
+			*nl = 0;
+		if (tbuf[0] == prefs.hex_input_command_char[0])
+			handle_command (sess, tbuf + 1, TRUE);
 		else
-			handle_command (sess, buf, TRUE);
-		g_free (buf);
+			handle_command (sess, tbuf, TRUE);
 	}
-
-	g_object_unref (file);
-	g_object_unref (istream);
+	fclose (fp);
 	return TRUE;
 }

@@ -2713,26 +2679,17 @@ cmd_me (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 static int
 cmd_mode (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 {
-	/* We allow omitting the target, so we have to figure it out:
-	 * - Can only use info from channels or dialogs
-	 * - Empty arg is always sess info
-	 * - Assume + is mode not channel
-	 * - We know valid channels and our nick
-	 * - We cannot easily know if other nick or valid mode (Need to store 004)
-	 */
-	if ((sess->type != SESS_CHANNEL && sess->type != SESS_DIALOG)
-	    || (!(*word[2] == '-' || *word[2] == '+' || *word[2] == '\0')
-	        && (is_channel (sess->server, word[2]) || !rfc_casecmp (sess->server->nick, word[2])))
-	   )
-	{
-		sess->server->p_mode (sess->server, word[2], word_eol[3]);
-	}
-	else
+	/* +channel channels are dying, let those servers whine about modes.
+	 * return info about current channel if available and no info is given */
+	if ((*word[2] == '+') || (*word[2] == 0) || (!is_channel(sess->server, word[2]) &&
+				!(rfc_casecmp(sess->server->nick, word[2]) == 0)))
 	{
 		if(sess->channel[0] == 0)
 			return FALSE;
 		sess->server->p_mode (sess->server, sess->channel, word_eol[2]);
 	}
+	else
+		sess->server->p_mode (sess->server, word[2], word_eol[3]);
 	return TRUE;
 }

@@ -3447,9 +3404,8 @@ cmd_server (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 			safe_strcpy (serv->password, net->pass, sizeof (serv->password));
 			serv->loginmethod = net->logintype;
 		}
-		else /* Otherwise ensure no password is sent or SASL started */
+		else /* Otherwise ensure no password is sent */
 		{
-			serv->loginmethod = LOGIN_DEFAULT;
 			serv->password[0] = 0;
 		}
 	}
--- a/src/common/plugin-identd.c
+++ b/src/common/plugin-identd.c
@@ -22,7 +22,6 @@
 #include "hexchat-plugin.h"

 #define _(x) hexchat_gettext(ph,x)
-static void identd_start_server (void);

 static hexchat_plugin *ph;
 static GSocketService *service;
@@ -32,6 +31,7 @@ typedef struct ident_info
 {
 	GSocketConnection *conn;
 	gchar *username;
+	gchar read_buf[16];
 } ident_info;

 static int
@@ -49,20 +49,6 @@ identd_command_cb (char *word[], char *word_eol[], void *userdata)
 {
 	g_return_val_if_fail (responses != NULL, HEXCHAT_EAT_ALL);

-	if (!g_strcmp0 (word[2], "reload"))
-	{
-		if (service)
-		{
-			g_socket_service_stop (service);
-			g_clear_object (&service);
-		}
-
-		identd_start_server ();
-
-		if (service)
-			return HEXCHAT_EAT_ALL;
-	}
-
 	if (service == NULL) /* If we are not running plugins can handle it */
 		return HEXCHAT_EAT_HEXCHAT;

@@ -96,25 +82,21 @@ identd_write_ready (GOutputStream *stream, GAsyncResult *res, ident_info *info)
 }

 static void
-identd_read_ready (GDataInputStream *in_stream, GAsyncResult *res, ident_info *info)
+identd_read_ready (GInputStream *in_stream, GAsyncResult *res, ident_info *info)
 {
 	GSocketAddress *sok_addr;
 	GOutputStream *out_stream;
 	guint64 local, remote;
-	gchar *read_buf, buf[512], *p;
+	gchar buf[512], *p;

-	if ((read_buf = g_data_input_stream_read_line_finish (in_stream, res, NULL, NULL)))
+	if (g_input_stream_read_finish (in_stream, res, NULL))
 	{
-		local = g_ascii_strtoull (read_buf, NULL, 0);
-		p = strchr (read_buf, ',');
+		local = g_ascii_strtoull (info->read_buf, NULL, 0);
+		p = strchr (info->read_buf, ',');
 		if (!p)
-		{
-			g_free (read_buf);
 			goto cleanup;
-		}

 		remote = g_ascii_strtoull (p + 1, NULL, 0);
-		g_free (read_buf);

 		if (!local || !remote || local > G_MAXUINT16 || remote > G_MAXUINT16)
 			goto cleanup;
@@ -156,7 +138,6 @@ static gboolean
 identd_incoming_cb (GSocketService *service, GSocketConnection *conn,
 					GObject *source, gpointer userdata)
 {
-	GDataInputStream *data_stream;
 	GInputStream *stream;
 	ident_info *info;

@@ -166,10 +147,8 @@ identd_incoming_cb (GSocketService *service, GSocketConnection *conn,
 	g_object_ref (conn);

 	stream = g_io_stream_get_input_stream (G_IO_STREAM (conn));
-	data_stream = g_data_input_stream_new (stream);
-	g_data_input_stream_set_newline_type (data_stream, G_DATA_STREAM_NEWLINE_TYPE_CR_LF);
-	g_data_input_stream_read_line_async (data_stream, G_PRIORITY_DEFAULT,
-										NULL, (GAsyncReadyCallback)identd_read_ready, info);
+	g_input_stream_read_async (stream, info->read_buf, sizeof (info->read_buf), G_PRIORITY_DEFAULT,
+							NULL, (GAsyncReadyCallback)identd_read_ready, info);

 	return TRUE;
 }
@@ -180,7 +159,7 @@ identd_start_server (void)
 	GError *error = NULL;
 	int enabled, port = 113;

-	if (hexchat_get_prefs (ph, "identd_server", NULL, &enabled) == 3)
+	if (hexchat_get_prefs (ph, "identd", NULL, &enabled) == 3)
 	{
 		if (!enabled)
 			return;
@@ -197,7 +176,8 @@ identd_start_server (void)
 	{
 		hexchat_printf (ph, _("*\tError starting identd server: %s"), error->message);

-		g_clear_object (&service);
+		g_object_unref (service);
+		service = NULL;
 		return;
 	}
 	/*hexchat_printf (ph, "*\tIdentd listening on port: %d", port); */
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -120,6 +120,7 @@ static GSList *hook_list = NULL;

 extern const struct prefs vars[];	/* cfgfiles.c */

+static void pluginpref_save (hexchat_plugin *pl);

 /* unload a plugin and remove it from our linked list */

@@ -159,6 +160,10 @@ plugin_free (hexchat_plugin *pl, int do_deinit, int allow_refuse)
 #endif

 xit:
+	if (pl->keyfile)
+	{
+		g_key_file_free (pl->keyfile);
+	}
 	if (pl->free_strings)
 	{
 		g_free (pl->name);
@@ -190,6 +195,7 @@ plugin_list_add (hexchat_context *ctx, char *filename, const char *name,
 	pl->context = ctx;
 	pl->name = (char *)name;
 	pl->desc = (char *)desc;
+	pl->keyfile = NULL;
 	pl->version = (char *)version;
 	pl->deinit_callback = deinit_func;
 	pl->fake = fake;
@@ -278,12 +284,19 @@ plugin_add (session *sess, char *filename, void *handle, void *init_func,
 		pl->hexchat_send_modes = hexchat_send_modes;
 		pl->hexchat_strip = hexchat_strip;
 		pl->hexchat_free = hexchat_free;
+		pl->hexchat_free_array = hexchat_free_array;
+
 		pl->hexchat_pluginpref_set_str = hexchat_pluginpref_set_str;
-		pl->hexchat_pluginpref_get_str = hexchat_pluginpref_get_str;
+		pl->hexchat_pluginpref_get_str_ptr = hexchat_pluginpref_get_str_ptr;
 		pl->hexchat_pluginpref_set_int = hexchat_pluginpref_set_int;
 		pl->hexchat_pluginpref_get_int = hexchat_pluginpref_get_int;
 		pl->hexchat_pluginpref_delete = hexchat_pluginpref_delete;
+		pl->hexchat_pluginpref_list_keys = hexchat_pluginpref_list_keys;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+		pl->hexchat_pluginpref_get_str = hexchat_pluginpref_get_str;
 		pl->hexchat_pluginpref_list = hexchat_pluginpref_list;
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 		pl->hexchat_hook_server_attrs = hexchat_hook_server_attrs;
 		pl->hexchat_hook_print_attrs = hexchat_hook_print_attrs;
 		pl->hexchat_emit_print_attrs = hexchat_emit_print_attrs;
@@ -1743,258 +1756,229 @@ hexchat_free (hexchat_plugin *ph, void *ptr)
 	g_free (ptr);
 }

-static int
-hexchat_pluginpref_set_str_real (hexchat_plugin *pl, const char *var, const char *value, int mode) /* mode: 0 = delete, 1 = save */
+void
+hexchat_free_array (hexchat_plugin *ph, char **strv)
 {
-	FILE *fpIn;
-	int fhOut;
-	int prevSetting;
-	char *confname;
-	char *confname_tmp;
-	char *escaped_value;
-	char *buffer;
-	char *buffer_tmp;
-	char line_buffer[512];		/* the same as in cfg_put_str */
-	char *line_bufp = line_buffer;
-	char *canon;
+	g_strfreev (strv);
+}

-	canon = g_strdup (pl->name);
-	canonalize_key (canon);
-	confname = g_strdup_printf ("addon_%s.conf", canon);
-	g_free (canon);
-	confname_tmp = g_strdup_printf ("%s.new", confname);
+#define DEFAULT_GROUP "DEFAULT"
+#define DEFAULT_GROUP_TEXT "[DEFAULT]\n"
+#define DEFAULT_GROUP_TEXT_LEN 10

-	fhOut = hexchat_open_file (confname_tmp, O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE);
-	fpIn = hexchat_fopen_file (confname, "r", 0);
+static char *
+pluginpref_create_filename (hexchat_plugin *pl, const char *extension)
+{
+	char *confname, *tmp, *filename;

-	if (fhOut == -1)		/* unable to save, abort */
+	tmp = g_strdup (pl->name);
+	canonalize_key (tmp);
+	confname = g_strdup_printf ("%s%caddon_%s.%s", get_xdir(), G_DIR_SEPARATOR, tmp, extension);
+	filename = g_filename_from_utf8 (confname, -1, NULL, NULL, NULL);
+	g_free (confname);
+	g_free (tmp);
+
+	return filename;
+}
+
+/* Migration simply means prepending a valid group
+ * to the old format, it is otherwise compatable */
+static gboolean
+pluginpref_migrate_file_real (const char *old_filename, const char *new_filename)
+{
+	char *contents;
+	gsize len, newlen;
+	gboolean ret;
+
+	/* Just read the entire file, ideally it is fairly small */
+	if (!g_file_get_contents (old_filename, &contents, &len, NULL))
+		return FALSE;
+
+	/* Avoid duplicating data and just prepend the new group */
+	newlen = len + DEFAULT_GROUP_TEXT_LEN;
+	contents = g_realloc_n (contents, newlen, sizeof(char));
+	memmove (contents + DEFAULT_GROUP_TEXT_LEN, contents, len);
+	memcpy (contents, DEFAULT_GROUP_TEXT, DEFAULT_GROUP_TEXT_LEN);
+
+	ret = g_file_set_contents (new_filename, contents, (gssize)MIN(newlen, G_MAXSSIZE), NULL);
+	g_free (contents);
+	return ret;
+}
+
+static void
+pluginpref_migrate_file (hexchat_plugin *pl, char *filename)
+{
+	char *old_filename;
+
+	if (g_file_test (filename, G_FILE_TEST_EXISTS))
+		return;
+
+	old_filename = pluginpref_create_filename (pl, "conf");
+	if (g_file_test (old_filename, G_FILE_TEST_EXISTS))
 	{
-		g_free (confname);
-		g_free (confname_tmp);
-		if (fpIn)
-			fclose (fpIn);
-		return 0;
-	}
-	else if (fpIn == NULL)	/* no previous config file, no parsing */
-	{
-		if (mode)
+		if (pluginpref_migrate_file_real (old_filename, filename))
 		{
-			escaped_value = g_strescape (value, NULL);
-			buffer = g_strdup_printf ("%s = %s\n", var, escaped_value);
-			g_free (escaped_value);
-			write (fhOut, buffer, strlen (buffer));
-			g_free (buffer);
-			close (fhOut);
-
-			buffer = g_build_filename (get_xdir (), confname, NULL);
-			g_free (confname);
-			buffer_tmp = g_build_filename (get_xdir (), confname_tmp, NULL);
-			g_free (confname_tmp);
-
-#ifdef WIN32
-			g_unlink (buffer);
-#endif
-
-			if (g_rename (buffer_tmp, buffer) == 0)
-			{
-				g_free (buffer);
-				g_free (buffer_tmp);
-				return 1;
-			}
-			else
-			{
-				g_free (buffer);
-				g_free (buffer_tmp);
-				return 0;
-			}
-		}
-		else
-		{
-			/* mode = 0, we want to delete but the config file and thus the given setting does not exist, we're ready */
-			close (fhOut);
-			g_free (confname);
-			g_free (confname_tmp);
-			return 1;
+			/* Migration worked, move the old one as a backup incase
+			 * keyfile is invalid and data lost but also to avoid confusion */
+			char *backup_filename = pluginpref_create_filename (pl, "bak");
+			g_rename (old_filename, backup_filename);
+			g_free (backup_filename);
 		}
 	}
-	else	/* existing config file, preserve settings and find & replace current var value if any */
+
+	g_free (old_filename);
+}
+
+static GKeyFile *
+pluginpref_load_file (hexchat_plugin *pl)
+{
+	char *filename;
+	GKeyFile *file;
+
+	filename = pluginpref_create_filename (pl, "ini");
+	if (!filename)
+		return NULL;
+
+	file = g_key_file_new ();
+
+	pluginpref_migrate_file (pl, filename);
+
+	/* It failing doesn't matter, a new file will just be created */
+	g_key_file_load_from_file (file, filename, G_KEY_FILE_NONE, NULL);
+
+	g_free (filename);
+	return file;
+}
+
+#define PLUGINPREF_INIT_KEYFILE(pl,ret) G_STMT_START \
+	if (!pl->keyfile) \
+	{ \
+		if (!(pl->keyfile = pluginpref_load_file (pl))) \
+			return ret; \
+	} \
+	G_STMT_END
+
+static void
+pluginpref_save (hexchat_plugin *pl)
+{
+	gchar *data, *filename;
+	gsize length;
+
+	filename = pluginpref_create_filename (pl, "ini");
+	if (!filename)
+		return;
+
+	if (!(data = g_key_file_to_data (pl->keyfile, &length, NULL)))
 	{
-		prevSetting = 0;
-
-		while (fscanf (fpIn, " %511[^\n]", line_bufp) != EOF)	/* read whole lines including whitespaces */
-		{
-			buffer_tmp = g_strdup_printf ("%s ", var);	/* add one space, this way it works against var - var2 checks too */
-
-			if (strncmp (buffer_tmp, line_buffer, strlen (var) + 1) == 0)	/* given setting already exists */
-			{
-				if (mode)									/* overwrite the existing matching setting if we are in save mode */
-				{
-					escaped_value = g_strescape (value, NULL);
-					buffer = g_strdup_printf ("%s = %s\n", var, escaped_value);
-					g_free (escaped_value);
-				}
-				else										/* erase the setting in delete mode */
-				{
-					buffer = g_strdup ("");
-				}
-
-				prevSetting = 1;
-			}
-			else
-			{
-				buffer = g_strdup_printf ("%s\n", line_buffer);	/* preserve the existing different settings */
-			}
-
-			write (fhOut, buffer, strlen (buffer));
-
-			g_free (buffer);
-			g_free (buffer_tmp);
-		}
-
-		fclose (fpIn);
-
-		if (!prevSetting && mode)	/* var doesn't exist currently, append if we're in save mode */
-		{
-			escaped_value = g_strescape (value, NULL);
-			buffer = g_strdup_printf ("%s = %s\n", var, escaped_value);
-			g_free (escaped_value);
-			write (fhOut, buffer, strlen (buffer));
-			g_free (buffer);
-		}
-
-		close (fhOut);
-
-		buffer = g_build_filename (get_xdir (), confname, NULL);
-		g_free (confname);
-		buffer_tmp = g_build_filename (get_xdir (), confname_tmp, NULL);
-		g_free (confname_tmp);
-
-#ifdef WIN32
-		g_unlink (buffer);
-#endif
-
-		if (g_rename (buffer_tmp, buffer) == 0)
-		{
-			g_free (buffer);
-			g_free (buffer_tmp);
-			return 1;
-		}
-		else
-		{
-			g_free (buffer);
-			g_free (buffer_tmp);
-			return 0;
-		}
+		g_free (filename);
+		return;
 	}
+
+	g_file_set_contents (filename, data, length, NULL);
+	g_free (data);
+	g_free (filename);
 }

 int
 hexchat_pluginpref_set_str (hexchat_plugin *pl, const char *var, const char *value)
 {
-	return hexchat_pluginpref_set_str_real (pl, var, value, 1);
+	PLUGINPREF_INIT_KEYFILE (pl, 0);
+
+	g_key_file_set_string (pl->keyfile, DEFAULT_GROUP, var, value);
+	pluginpref_save (pl);
+	return 1;
 }

-static int
-hexchat_pluginpref_get_str_real (hexchat_plugin *pl, const char *var, char *dest, int dest_len)
+char *
+hexchat_pluginpref_get_str_ptr (hexchat_plugin *pl, const char *var)
 {
-	char *confname, *canon, *cfg, *unescaped_value;
-	char buf[512];
+	PLUGINPREF_INIT_KEYFILE (pl, 0);

-	canon = g_strdup (pl->name);
-	canonalize_key (canon);
-	confname = g_strdup_printf ("%s%caddon_%s.conf", get_xdir(), G_DIR_SEPARATOR, canon);
-	g_free (canon);
-
-	if (!g_file_get_contents (confname, &cfg, NULL, NULL))
-	{
-		g_free (confname);
-		return 0;
-	}
-	g_free (confname);
-
-	if (!cfg_get_str (cfg, var, buf, sizeof(buf)))
-	{
-		g_free (cfg);
-		return 0;
-	}
-
-	unescaped_value = g_strcompress (buf);
-	g_strlcpy (dest, unescaped_value, dest_len);
-
-	g_free (unescaped_value);
-	g_free (cfg);
-	return 1;
+	return g_key_file_get_string (pl->keyfile, DEFAULT_GROUP, var, NULL);
 }

 int
 hexchat_pluginpref_get_str (hexchat_plugin *pl, const char *var, char *dest)
 {
+	char *value;
+
+	if (!(value = hexchat_pluginpref_get_str_ptr (pl, var)))
+		return 0;
+
 	/* All users of this must ensure dest is >= 512... */
-	return hexchat_pluginpref_get_str_real (pl, var, dest, 512);
+	safe_strcpy (dest, value, 512);
+	g_free (value);
+
+	return 1;
 }

 int
 hexchat_pluginpref_set_int (hexchat_plugin *pl, const char *var, int value)
 {
-	char buffer[12];
+	PLUGINPREF_INIT_KEYFILE (pl, 0);

-	g_snprintf (buffer, sizeof (buffer), "%d", value);
-	return hexchat_pluginpref_set_str_real (pl, var, buffer, 1);
+	g_key_file_set_integer (pl->keyfile, DEFAULT_GROUP, var, value);
+	pluginpref_save (pl);
+	return 1;
 }

 int
 hexchat_pluginpref_get_int (hexchat_plugin *pl, const char *var)
 {
-	char buffer[12];
+	int value;
+	GError *error = NULL;

-	if (hexchat_pluginpref_get_str_real (pl, var, buffer, sizeof(buffer)))
-	{
-		return atoi (buffer);
-	}
-	else
+	PLUGINPREF_INIT_KEYFILE (pl, -1);
+
+	value = g_key_file_get_integer (pl->keyfile, DEFAULT_GROUP, var, &error);
+	if (error)
 	{
+		if (error->code ==  G_KEY_FILE_ERROR_INVALID_VALUE)
+		{
+			g_error_free (error);
+			return 0; /* This is to duplicate previous behavior of atoi() */
+		}
+		g_error_free (error);
 		return -1;
 	}
+
+	return value;
 }

 int
 hexchat_pluginpref_delete (hexchat_plugin *pl, const char *var)
 {
-	return hexchat_pluginpref_set_str_real (pl, var, 0, 0);
+	gboolean ret;
+
+	PLUGINPREF_INIT_KEYFILE (pl, 0);
+
+	ret = g_key_file_remove_key (pl->keyfile, DEFAULT_GROUP, var, NULL);
+	pluginpref_save (pl);
+	return ret;
 }

+char **
+hexchat_pluginpref_list_keys (hexchat_plugin *pl)
+{
+	PLUGINPREF_INIT_KEYFILE (pl, NULL);
+
+	return g_key_file_get_keys (pl->keyfile, DEFAULT_GROUP, NULL, NULL);
+}
+
+
 int
 hexchat_pluginpref_list (hexchat_plugin *pl, char* dest)
 {
-	FILE *fpIn;
-	char confname[64];
-	char buffer[512];										/* the same as in cfg_put_str */
-	char *bufp = buffer;
-	char *token;
+	char **keys, *keystr;

-	token = g_strdup (pl->name);
-	canonalize_key (token);
-	sprintf (confname, "addon_%s.conf", token);
-	g_free (token);
-
-	fpIn = hexchat_fopen_file (confname, "r", 0);
-
-	if (fpIn == NULL)										/* no existing config file, no parsing */
-	{
+	if (!(keys = hexchat_pluginpref_list_keys (pl)))
 		return 0;
-	}
-	else													/* existing config file, get list of settings */
-	{
-		strcpy (dest, "");									/* clean up garbage */
-		while (fscanf (fpIn, " %[^\n]", bufp) != EOF)	/* read whole lines including whitespaces */
-		{
-			token = strtok (buffer, "=");
-			g_strlcat (dest, g_strchomp (token), 4096); /* Dest must not be smaller than this */
-			g_strlcat (dest, ",", 4096);
-		}

-		fclose (fpIn);
-	}
+	keystr = g_strjoinv (",", keys);
+	safe_strcpy (dest, keystr, 4096);
+	g_strlcat (dest, ",", 4096); /* Must end in , for legacy reasons */

+	g_free (keystr);
+	g_strfreev (keys);
 	return 1;
 }
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -149,6 +149,11 @@ struct _hexchat_plugin
 	hexchat_event_attrs *(*hexchat_event_attrs_create) (hexchat_plugin *ph);
 	void (*hexchat_event_attrs_free) (hexchat_plugin *ph,
 									  hexchat_event_attrs *attrs);
+	char *(*hexchat_pluginpref_get_str_ptr) (hexchat_plugin *ph,
+		const char *var);
+	char **(*hexchat_pluginpref_list_keys) (hexchat_plugin *ph);
+	void (*hexchat_free_array) (hexchat_plugin *ph,
+	    char **arr);

 	/* PRIVATE FIELDS! */
 	void *handle;		/* from dlopen */
@@ -156,6 +161,7 @@ struct _hexchat_plugin
 	char *name;
 	char *desc;
 	char *version;
+	GKeyFile *keyfile; /* pluginpref */
 	session *context;
 	void *deinit_callback;	/* pointer to hexchat_plugin_deinit */
 	unsigned int fake:1;		/* fake plugin. Added by hexchat_plugingui_add() */
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -48,7 +48,7 @@
 static void
 irc_login (server *serv, char *user, char *realname)
 {
-	tcp_sendf (serv, "CAP LS 302\r\n");		/* start with CAP LS as Charybdis sasl.txt suggests */
+	tcp_sendf (serv, "CAP LS\r\n");		/* start with CAP LS as Charybdis sasl.txt suggests */
 	serv->sent_capend = FALSE;	/* track if we have finished */

 	if (serv->password[0] && serv->loginmethod == LOGIN_PASS)
@@ -569,8 +569,7 @@ process_numeric (session * sess, int n,
 		inbound_user_info_start (sess, word[4], tags_data);
 		if (!serv->skip_next_whois)
 			EMIT_SIGNAL_TIMESTAMP (XP_TE_WHOIS1, whois_sess, word[4], word[5],
-										  word[6], (word_eol[8][0] == ':') ? word_eol[8] + 1 : word_eol[8],
-										  0, tags_data->timestamp);
+										  word[6], word_eol[8] + 1, 0, tags_data->timestamp);
 		else
 			inbound_user_info (sess, NULL, word[5], word[6], NULL, word[4],
 									 word_eol[8][0] == ':' ? word_eol[8] + 1 : word_eol[8],
@@ -667,6 +666,7 @@ process_numeric (session * sess, int n,
 			EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANMODES, sess, word[4], word_eol[5],
 										  NULL, NULL, 0, tags_data->timestamp);
 		fe_update_mode_buttons (sess, 'c', '-');
+		fe_update_mode_buttons (sess, 'r', '-');
 		fe_update_mode_buttons (sess, 't', '-');
 		fe_update_mode_buttons (sess, 'n', '-');
 		fe_update_mode_buttons (sess, 'i', '-');
@@ -680,7 +680,7 @@ process_numeric (session * sess, int n,
 		sess = find_channel (serv, word[4]);
 		if (sess)
 		{
-			EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANURL, sess, word[4], (word_eol[5][0] == ':') ? word_eol[5] + 1 : word_eol[5],
+			EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANURL, sess, word[4], word[5] + 1,
 									NULL, NULL, 0, tags_data->timestamp); 
 		}
 		break;
@@ -946,9 +946,10 @@ process_numeric (session * sess, int n,
 									  word_eol[6]+1, word[1], word[2], NULL, 0,
 									  tags_data->timestamp);
 		break;
-	case 904:	/* failed SASL auth */
-		inbound_sasl_error (serv);
 	case 903:	/* successful SASL auth */
+	case 904:	/* failed SASL auth */
+		if (inbound_sasl_error (serv))
+			break; /* might retry */
 	case 905:	/* failed SASL auth */
 	case 906:	/* aborted */
 	case 907:	/* attempting to re-auth after a successful auth */
@@ -962,7 +963,7 @@ process_numeric (session * sess, int n,
 		}
 		break;
 	case 908:	/* Supported SASL Mechs */
-		/* ignored for now, SASL 3.2 is a better solution and we only do PLAIN atm */
+		inbound_sasl_supportedmechs (serv, word[4]);
 		break;

 	default:
@@ -1104,10 +1105,6 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 			}
 			return;

-		case WORDL('P', 'I', 'N', 'G'):
-			tcp_sendf (sess->server, "PONG %s\r\n", word_eol[3]);
-			return;
-
 		case WORDL('P','O','N','G'):
 			inbound_ping_reply (serv->server_session,
 									  (word[4][0] == ':') ? word[4] + 1 : word[4],
@@ -1143,15 +1140,6 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 			inbound_account (serv, nick, word[3], tags_data);
 			return;
 			
-		case WORDL('A', 'U', 'T', 'H'):
-			inbound_sasl_authenticate (sess->server, word_eol[3]);
-			return;
-
-		case WORDL('C', 'H', 'G', 'H'):
-			inbound_user_info (sess, NULL, word[3], word[4], NULL, nick, NULL,
-							   NULL, 0xff, tags_data);
-			return;
-
 		case WORDL('I','N','V','I'):
 			if (ignore_check (word[1], IG_INVI))
 				return;
@@ -1293,7 +1281,7 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 										  word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
 										  tags_data);
 				}
-				else if (strncasecmp (word[4], "LS", 2) == 0 || strncasecmp (word[4], "NEW", 3) == 0)
+				else if (strncasecmp (word[4], "LS", 2) == 0)
 				{
 					inbound_cap_ls (serv, word[1], 
 										 word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
@@ -1309,12 +1297,6 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 											word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
 											tags_data);
 				}
-				else if (strncasecmp (word[4], "DEL", 3) == 0)
-				{
-					inbound_cap_del (serv, word[1],
-											word[5][0] == ':' ? word_eol[5] + 1 : word_eol[5],
-											tags_data);
-				}

 				return;
 		}
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -487,10 +487,6 @@ ssl_do_connect (server * serv)
 	char buf[128];

 	g_sess = serv->server_session;
-
-	/* Set SNI hostname before connect */
-	SSL_set_tlsext_host_name(serv->ssl, serv->hostname);
-
 	if (SSL_connect (serv->ssl) <= 0)
 	{
 		char err_buf[128];
@@ -1727,13 +1723,11 @@ server_set_defaults (server *serv)
 	serv->chanmodes = g_strdup ("beI,k,l");
 	serv->nick_prefixes = g_strdup ("@%+");
 	serv->nick_modes = g_strdup ("ohv");
-	serv->sasl_mech = MECH_PLAIN;

 	server_set_encoding (serv, "UTF-8");

 	serv->nickcount = 1;
 	serv->end_of_motd = FALSE;
-	serv->sent_capend = FALSE;
 	serv->is_away = FALSE;
 	serv->supports_watch = FALSE;
 	serv->supports_monitor = FALSE;
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -280,6 +280,9 @@ static const struct defaultserver def[] =
 	{"SeilEn.de",	0},
 	{0,			"irc.seilen.de"},

+	{"SeionIRC", 0, 0, 0, LOGIN_SASL, 0, TRUE},
+	{0,			"irc.seion.us"},
+
 	{"Serenity-IRC",	0},
 	{0,			"irc.serenity-irc.net"},

@@ -998,9 +1001,9 @@ servlist_load_defaults (void)
 static int
 servlist_load (void)
 {
-	GFile *file;
-	GDataInputStream *istream;
-	gchar *buf;
+	FILE *fp;
+	char buf[2048];
+	int len;
 	ircnet *net = NULL;

 	/* simple migration we will keep for a short while */
@@ -1015,16 +1018,15 @@ servlist_load (void)
 	g_free (oldfile);
 	g_free (newfile);

-
-	file = hexchat_open_gfile ("servlist.conf");
-
-	istream = file_get_datainputstream (file);
-	if (!istream)
+	fp = hexchat_fopen_file ("servlist.conf", "r", 0);
+	if (!fp)
 		return FALSE;

-
-	while ((buf = g_data_input_stream_read_line_utf8 (istream, NULL, NULL, NULL)))
+	while (fgets (buf, sizeof (buf) - 2, fp))
 	{
+		len = strlen (buf);
+		buf[len] = 0;
+		buf[len-1] = 0;	/* remove the trailing \n */
 		if (net)
 		{
 			switch (buf[0])
@@ -1097,12 +1099,8 @@ servlist_load (void)
 		}
 		if (buf[0] == 'N')
 			net = servlist_net_add (buf + 2, /* comment */ NULL, FALSE);
-
-		g_free (buf);
 	}
-
-	g_object_unref (file);
-	g_object_unref (istream);
+	fclose (fp);

 	return TRUE;
 }
@@ -1143,9 +1141,8 @@ servlist_check_encoding (char *charset)
 int
 servlist_save (void)
 {
-	GFile *file;
-	GOutputStream *ostream;
-	gchar *buf;
+	FILE *fp;
+	char *buf;
 	ircnet *net;
 	ircserver *serv;
 	commandentry *cmd;
@@ -1154,37 +1151,52 @@ servlist_save (void)
 	GSList *netlist;
 	GSList *cmdlist;
 	GSList *favlist;
+#ifndef WIN32
+	int first = FALSE;

-	file = hexchat_open_gfile ("servlist.conf");
+	buf = g_build_filename (get_xdir (), "servlist.conf", NULL);
+	if (g_access (buf, F_OK) != 0)
+		first = TRUE;
+#endif

-	ostream = G_OUTPUT_STREAM(g_file_replace (file, NULL, TRUE, 
-							G_FILE_CREATE_PRIVATE, NULL, NULL));
-	if (!ostream)
+	fp = hexchat_fopen_file ("servlist.conf", "w", 0);
+	if (!fp)
+	{
+#ifndef WIN32
+		g_free (buf);
+#endif
 		return FALSE;
+	}

-	stream_writef (ostream, "v=%s\n\n", PACKAGE_VERSION);
+#ifndef WIN32
+	if (first)
+		g_chmod (buf, 0600);
+
+	g_free (buf);
+#endif
+	fprintf (fp, "v=" PACKAGE_VERSION "\n\n");

 	list = network_list;
 	while (list)
 	{
 		net = list->data;

-		stream_writef (ostream, "N=%s\n", net->name);
+		fprintf (fp, "N=%s\n", net->name);
 		if (net->nick)
-			stream_writef (ostream, "I=%s\n", net->nick);
+			fprintf (fp, "I=%s\n", net->nick);
 		if (net->nick2)
-			stream_writef (ostream, "i=%s\n", net->nick2);
+			fprintf (fp, "i=%s\n", net->nick2);
 		if (net->user)
-			stream_writef (ostream, "U=%s\n", net->user);
+			fprintf (fp, "U=%s\n", net->user);
 		if (net->real)
-			stream_writef (ostream, "R=%s\n", net->real);
+			fprintf (fp, "R=%s\n", net->real);
 		if (net->pass)
-			stream_writef (ostream, "P=%s\n", net->pass);
+			fprintf (fp, "P=%s\n", net->pass);
 		if (net->logintype)
-			stream_writef (ostream, "L=%d\n", net->logintype);
+			fprintf (fp, "L=%d\n", net->logintype);
 		if (net->encoding)
 		{
-			stream_writef (ostream, "E=%s\n", net->encoding);
+			fprintf (fp, "E=%s\n", net->encoding);
 			if (!servlist_check_encoding (net->encoding))
 			{
 				buf = g_strdup_printf (_("Warning: \"%s\" character set is unknown. No conversion will be applied for network %s."),
@@ -1194,13 +1206,13 @@ servlist_save (void)
 			}
 		}

-		stream_writef (ostream, "F=%d\nD=%d\n", net->flags, net->selected);
+		fprintf (fp, "F=%d\nD=%d\n", net->flags, net->selected);

 		netlist = net->servlist;
 		while (netlist)
 		{
 			serv = netlist->data;
-			stream_writef (ostream, "S=%s\n", serv->hostname);
+			fprintf (fp, "S=%s\n", serv->hostname);
 			netlist = netlist->next;
 		}

@@ -1208,7 +1220,7 @@ servlist_save (void)
 		while (cmdlist)
 		{
 			cmd = cmdlist->data;
-			stream_writef (ostream, "C=%s\n", cmd->command);
+			fprintf (fp, "C=%s\n", cmd->command);
 			cmdlist = cmdlist->next;
 		}

@@ -1219,24 +1231,26 @@ servlist_save (void)

 			if (favchan->key)
 			{
-				stream_writef (ostream, "J=%s,%s\n", favchan->name, favchan->key);
+				fprintf (fp, "J=%s,%s\n", favchan->name, favchan->key);
 			}
 			else
 			{
-				stream_writef (ostream, "J=%s\n", favchan->name);
+				fprintf (fp, "J=%s\n", favchan->name);
 			}

 			favlist = favlist->next;
 		}

-		if (!stream_writef (ostream, "\n"))
+		if (fprintf (fp, "\n") < 1)
+		{
+			fclose (fp);
 			return FALSE;
+		}

 		list = list->next;
 	}

-	g_object_unref (file);
-	g_object_unref (ostream);
+	fclose (fp);
 	return TRUE;
 }

--- a/src/common/sysinfo/sysinfo.h
+++ b/src/common/sysinfo/sysinfo.h
@@ -1,13 +0,0 @@
-#ifndef HEXCHAT_SYSINFO_H
-#define HEXCHAT_SYSINFO_H
-
-#include <glib.h>
-
-int sysinfo_get_cpu_arch (void);
-int sysinfo_get_build_arch (void);
-char *sysinfo_get_cpu (void);
-char *sysinfo_get_os (void);
-void sysinfo_get_hdd_info (guint64 *hdd_capacity_out, guint64 *hdd_free_space_out);
-char *sysinfo_get_gpu (void);
-
-#endif
--- a/src/common/sysinfo/win32/backend.c
+++ b/src/common/sysinfo/win32/backend.c
@@ -1,478 +0,0 @@
-/* HexChat
- * Copyright (c) 2011-2012 Berke Viktor.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <windows.h>
-#include <wbemidl.h>
-
-#include "../sysinfo.h"
-
-/* Cache */
-static int cpu_arch = 0;
-static int build_arch = 0;
-static char *os_name = NULL;
-static char *cpu_info = NULL;
-static char *vga_name = NULL;
-
-typedef enum
-{
-	QUERY_WMI_OS,
-	QUERY_WMI_CPU,
-	QUERY_WMI_VGA,
-	QUERY_WMI_HDD,
-} QueryWmiType;
-
-char *query_wmi (QueryWmiType mode);
-char *read_os_name (IWbemClassObject *object);
-char *read_cpu_info (IWbemClassObject *object);
-char *read_vga_name (IWbemClassObject *object);
-
-guint64 hdd_capacity;
-guint64 hdd_free_space;
-char *read_hdd_info (IWbemClassObject *object);
-
-char *bstr_to_utf8 (BSTR bstr);
-guint64 variant_to_uint64 (VARIANT *variant);
-
-char *
-sysinfo_get_cpu (void)
-{
-	if (cpu_info == NULL)
-		cpu_info = query_wmi (QUERY_WMI_CPU);
-
-	return g_strdup (cpu_info);
-}
-
-char *
-sysinfo_get_os (void)
-{
-	if (os_name == NULL)
-		os_name = query_wmi (QUERY_WMI_OS);
-
-	return g_strdup_printf ("%s (x%d)", os_name, sysinfo_get_cpu_arch ());
-}
-
-int
-sysinfo_get_cpu_arch (void)
-{
-	SYSTEM_INFO si;
-
-	if (cpu_arch != 0)
-	{
-		return cpu_arch;
-	}
-
-	GetNativeSystemInfo (&si);
-
-	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
-	{
-		return cpu_arch = 64;
-	}
-	else
-	{
-		return cpu_arch = 86;
-	}
-}
-
-int
-sysinfo_get_build_arch (void)
-{
-	SYSTEM_INFO si;
-
-	if (build_arch != 0)
-	{
-		return build_arch;
-	}
-
-	GetSystemInfo (&si);
-
-	if (si.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
-	{
-		return build_arch = 64;
-	}
-	else
-	{
-		return build_arch = 86;
-	}
-}
-
-char *
-sysinfo_get_gpu (void)
-{
-	if (vga_name == NULL)
-		vga_name = query_wmi (QUERY_WMI_VGA);
-
-	return g_strdup (vga_name);
-}
-
-void
-sysinfo_get_hdd_info (guint64 *hdd_capacity_out, guint64 *hdd_free_space_out)
-{
-	char *hdd_info;
-
-	/* HDD information is always loaded dynamically since it includes the current amount of free space */
-	*hdd_capacity_out = hdd_capacity = 0;
-	*hdd_free_space_out = hdd_free_space = 0;
-
-	hdd_info = query_wmi (QUERY_WMI_HDD);
-	if (hdd_info == NULL)
-	{
-		return;
-	}
-
-	*hdd_capacity_out = hdd_capacity;
-	*hdd_free_space_out = hdd_free_space;
-}
-
-/* https://msdn.microsoft.com/en-us/library/aa390423 */
-static char *query_wmi (QueryWmiType type)
-{
-	GString *result = NULL;
-	HRESULT hr;
-
-	IWbemLocator *locator = NULL;
-	BSTR namespaceName = NULL;
-	BSTR queryLanguageName = NULL;
-	BSTR query = NULL;
-	IWbemServices *namespace = NULL;
-	IUnknown *namespaceUnknown = NULL;
-	IEnumWbemClassObject *enumerator = NULL;
-	int i;
-	gboolean atleast_one_appended = FALSE;
-
-	hr = CoCreateInstance (&CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (LPVOID *) &locator);
-	if (FAILED (hr))
-	{
-		goto exit;
-	}
-
-	namespaceName = SysAllocString (L"root\\CIMV2");
-
-	hr = locator->lpVtbl->ConnectServer (locator, namespaceName, NULL, NULL, NULL, 0, NULL, NULL, &namespace);
-	if (FAILED (hr))
-	{
-		goto release_locator;
-	}
-
-	hr = namespace->lpVtbl->QueryInterface (namespace, &IID_IUnknown, &namespaceUnknown);
-	if (FAILED (hr))
-	{
-		goto release_namespace;
-	}
-
-	hr = CoSetProxyBlanket (namespaceUnknown, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE);
-	if (FAILED (hr))
-	{
-		goto release_namespaceUnknown;
-	}
-
-	queryLanguageName = SysAllocString (L"WQL");
-
-	switch (type)
-	{
-	case QUERY_WMI_OS:
-		query = SysAllocString (L"SELECT Caption FROM Win32_OperatingSystem");
-		break;
-	case QUERY_WMI_CPU:
-		query = SysAllocString (L"SELECT Name, MaxClockSpeed FROM Win32_Processor");
-		break;
-	case QUERY_WMI_VGA:
-		query = SysAllocString (L"SELECT Name FROM Win32_VideoController");
-		break;
-	case QUERY_WMI_HDD:
-		query = SysAllocString (L"SELECT Name, Capacity, FreeSpace FROM Win32_Volume");
-		break;
-	default:
-		goto release_queryLanguageName;
-	}
-
-	hr = namespace->lpVtbl->ExecQuery (namespace, queryLanguageName, query, WBEM_FLAG_FORWARD_ONLY, NULL, &enumerator);
-	if (FAILED (hr))
-	{
-		goto release_query;
-	}
-
-	result = g_string_new ("");
-
-	for (i = 0;; i++)
-	{
-		ULONG numReturned = 0;
-		IWbemClassObject *object;
-		char *line;
-
-		hr = enumerator->lpVtbl->Next (enumerator, WBEM_INFINITE, 1, &object, &numReturned);
-		if (FAILED (hr) || numReturned == 0)
-		{
-			break;
-		}
-
-		switch (type)
-		{
-			case QUERY_WMI_OS:
-				line = read_os_name (object);
-				break;
-
-			case QUERY_WMI_CPU:
-				line = read_cpu_info (object);
-				break;
-
-			case QUERY_WMI_VGA:
-				line = read_vga_name (object);
-				break;
-
-			case QUERY_WMI_HDD:
-				line = read_hdd_info (object);
-				break;
-
-			default:
-				break;
-		}
-
-		object->lpVtbl->Release (object);
-
-		if (line != NULL)
-		{
-			if (atleast_one_appended)
-			{
-				g_string_append (result, ", ");
-			}
-
-			g_string_append (result, line);
-
-			g_free (line);
-
-			atleast_one_appended = TRUE;
-		}
-	}
-
-	enumerator->lpVtbl->Release (enumerator);
-
-release_query:
-	SysFreeString (query);
-
-release_queryLanguageName:
-	SysFreeString (queryLanguageName);
-
-release_namespaceUnknown:
-	namespaceUnknown->lpVtbl->Release (namespaceUnknown);
-
-release_namespace:
-	namespace->lpVtbl->Release (namespace);
-
-release_locator:
-	locator->lpVtbl->Release (locator);
-	SysFreeString (namespaceName);
-
-exit:
-	if (result == NULL)
-	{
-		return NULL;
-	}
-
-	return g_string_free (result, FALSE);
-}
-
-static char *read_os_name (IWbemClassObject *object)
-{
-	HRESULT hr;
-	VARIANT caption_variant;
-	char *caption_utf8;
-
-	hr = object->lpVtbl->Get (object, L"Caption", 0, &caption_variant, NULL, NULL);
-	if (FAILED (hr))
-	{
-		return NULL;
-	}
-
-	caption_utf8 = bstr_to_utf8 (caption_variant.bstrVal);
-
-	VariantClear(&caption_variant);
-
-	if (caption_utf8 == NULL)
-	{
-		return NULL;
-	}
-
-	g_strchomp (caption_utf8);
-
-	return caption_utf8;
-}
-
-static char *read_cpu_info (IWbemClassObject *object)
-{
-	HRESULT hr;
-	VARIANT name_variant;
-	char *name_utf8;
-	VARIANT max_clock_speed_variant;
-	guint cpu_freq_mhz;
-	char *result;
-
-	hr = object->lpVtbl->Get (object, L"Name", 0, &name_variant, NULL, NULL);
-	if (FAILED (hr))
-	{
-		return NULL;
-	}
-
-	name_utf8 = bstr_to_utf8 (name_variant.bstrVal);
-
-	VariantClear (&name_variant);
-
-	if (name_utf8 == NULL)
-	{
-		return NULL;
-	}
-
-	hr = object->lpVtbl->Get (object, L"MaxClockSpeed", 0, &max_clock_speed_variant, NULL, NULL);
-	if (FAILED (hr))
-	{
-		g_free (name_utf8);
-
-		return NULL;
-	}
-
-	cpu_freq_mhz = max_clock_speed_variant.uintVal;
-
-	VariantClear (&max_clock_speed_variant);
-
-	if (cpu_freq_mhz > 1000)
-	{
-		result = g_strdup_printf ("%s (%.2fGHz)", name_utf8, cpu_freq_mhz / 1000.f);
-	}
-	else
-	{
-		result = g_strdup_printf ("%s (%" G_GUINT32_FORMAT "MHz)", name_utf8, cpu_freq_mhz);
-	}
-
-	g_free (name_utf8);
-
-	return result;
-}
-
-static char *read_vga_name (IWbemClassObject *object)
-{
-	HRESULT hr;
-	VARIANT name_variant;
-	char *name_utf8;
-
-	hr = object->lpVtbl->Get (object, L"Name", 0, &name_variant, NULL, NULL);
-	if (FAILED (hr))
-	{
-		return NULL;
-	}
-
-	name_utf8 = bstr_to_utf8 (name_variant.bstrVal);
-
-	VariantClear (&name_variant);
-
-	if (name_utf8 == NULL)
-	{
-		return NULL;
-	}
-
-	return g_strchomp (name_utf8);
-}
-
-static char *read_hdd_info (IWbemClassObject *object)
-{
-	HRESULT hr;
-	VARIANT name_variant;
-	BSTR name_bstr;
-	gsize name_len;
-	VARIANT capacity_variant;
-	guint64 capacity;
-	VARIANT free_space_variant;
-	guint64 free_space;
-
-	hr = object->lpVtbl->Get (object, L"Name", 0, &name_variant, NULL, NULL);
-	if (FAILED (hr))
-	{
-		return NULL;
-	}
-
-	name_bstr = name_variant.bstrVal;
-	name_len = SysStringLen (name_variant.bstrVal);
-
-	if (name_len >= 4 && name_bstr[0] == L'\\' && name_bstr[1] == L'\\' && name_bstr[2] == L'?' && name_bstr[3] == L'\\')
-	{
-		// This is not a named volume. Skip it.
-		VariantClear (&name_variant);
-
-		return NULL;
-	}
-
-	VariantClear (&name_variant);
-
-	hr = object->lpVtbl->Get (object, L"Capacity", 0, &capacity_variant, NULL, NULL);
-	if (FAILED (hr))
-	{
-		return NULL;
-	}
-
-	capacity = variant_to_uint64 (&capacity_variant);
-
-	VariantClear (&capacity_variant);
-
-	if (capacity == 0)
-	{
-		return NULL;
-	}
-
-	hr = object->lpVtbl->Get (object, L"FreeSpace", 0, &free_space_variant, NULL, NULL);
-	if (FAILED (hr))
-	{
-		return NULL;
-	}
-
-	free_space = variant_to_uint64 (&free_space_variant);
-
-	VariantClear (&free_space_variant);
-
-	if (free_space == 0)
-	{
-		return NULL;
-	}
-
-	hdd_capacity += capacity;
-	hdd_free_space += free_space;
-
-	return NULL;
-}
-
-static char *bstr_to_utf8 (BSTR bstr)
-{
-	return g_utf16_to_utf8 (bstr, SysStringLen (bstr), NULL, NULL, NULL);
-}
-
-static guint64 variant_to_uint64 (VARIANT *variant)
-{
-	switch (V_VT (variant))
-	{
-	case VT_UI8:
-		return variant->ullVal;
-
-	case VT_BSTR:
-		return wcstoull (variant->bstrVal, NULL, 10);
-
-	default:
-		return 0;
-	}
-}
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -65,15 +65,13 @@ struct pevt_stage1
 static ca_context *ca_con;
 #endif

-#define SCROLLBACK_MAX 32000
-
 static void mkdir_p (char *filename);
 static char *log_create_filename (char *channame);

 static char *
 scrollback_get_filename (session *sess)
 {
-	char *net, *chan, *buf, *ret = NULL;
+	char *net, *chan, *buf;

 	net = server_get_network (sess->server, FALSE);
 	if (!net)
@@ -90,19 +88,54 @@ scrollback_get_filename (session *sess)
 		buf = NULL;
 	g_free (chan);

-	if (buf)
-	{
-		ret = g_filename_from_utf8 (buf, -1, NULL, NULL, NULL);
-		g_free (buf);
-	}
-
-	return ret;
+	return buf;
 }

+#if 0
+
+static void
+scrollback_unlock (session *sess)
+{
+	char buf[1024];
+
+	if (scrollback_get_filename (sess, buf, sizeof (buf) - 6) == NULL)
+		return;
+
+	strcat (buf, ".lock");
+	unlink (buf);
+}
+
+static gboolean
+scrollback_lock (session *sess)
+{
+	char buf[1024];
+	int fh;
+
+	if (scrollback_get_filename (sess, buf, sizeof (buf) - 6) == NULL)
+		return FALSE;
+
+	strcat (buf, ".lock");
+
+	if (access (buf, F_OK) == 0)
+		return FALSE;	/* can't get lock */
+
+	fh = open (buf, O_CREAT | O_TRUNC | O_APPEND | O_WRONLY, 0644);
+	if (fh == -1)
+		return FALSE;
+
+	return TRUE;
+}
+
+#endif
+
 void
 scrollback_close (session *sess)
 {
-	g_clear_object (&sess->scrollfile);
+	if (sess->scrollfd != -1)
+	{
+		close (sess->scrollfd);
+		sess->scrollfd = -1;
+	}
 }

 /* shrink the file to roughly prefs.hex_text_max_lines */
@@ -110,13 +143,29 @@ scrollback_close (session *sess)
 static void
 scrollback_shrink (session *sess)
 {
-	char *buf, *p;
+	char *file;
+	char *buf;
+	int fh;
+	int lines;
+	int line;
 	gsize len;
-	gint offset, lines = 0;
-	const gint max_lines = MIN(prefs.hex_text_max_lines, SCROLLBACK_MAX);
+	char *p;

-	if (!g_file_load_contents (sess->scrollfile, NULL, &buf, &len, NULL, NULL))
+	scrollback_close (sess);
+	sess->scrollwritten = 0;
+	lines = 0;
+
+	if ((file = scrollback_get_filename (sess)) == NULL)
+	{
+		g_free (file);
 		return;
+	}
+
+	if (!g_file_get_contents (file, &buf, &len, NULL))
+	{
+		g_free (file);
+		return;
+	}

 	/* count all lines */
 	p = buf;
@@ -127,37 +176,41 @@ scrollback_shrink (session *sess)
 		p++;
 	}

-	offset = lines - max_lines;
+	fh = g_open (file, O_CREAT | O_TRUNC | O_APPEND | O_WRONLY | OFLAGS, 0644);
+	g_free (file);
+	if (fh == -1)
+	{
+		g_free (buf);
+		return;
+	}

-	/* now just go back to where we want to start the file */
+	line = 0;
 	p = buf;
-	lines = 0;
 	while (p != buf + len)
 	{
 		if (*p == '\n')
 		{
-			lines++;
-			if (lines == offset)
+			line++;
+			if (line >= lines - prefs.hex_text_max_lines &&
+				 p + 1 != buf + len)
 			{
 				p++;
+				write (fh, p, len - (p - buf));
 				break;
 			}
 		}
 		p++;
 	}

-	if (g_file_replace_contents (sess->scrollfile, p, strlen(p), NULL, FALSE,
-							G_FILE_CREATE_PRIVATE, NULL, NULL, NULL))
-		sess->scrollwritten = lines;
-
+	close (fh);
 	g_free (buf);
 }

 static void
 scrollback_save (session *sess, char *text, time_t stamp)
 {
-	GOutputStream *ostream;
 	char *buf;
+	int len;

 	if (sess->type == SESS_SERVER && prefs.hex_gui_tab_server == 1)
 		return;
@@ -173,25 +226,16 @@ scrollback_save (session *sess, char *text, time_t stamp)
 			return;
 	}

-	if (!sess->scrollfile)
+	if (sess->scrollfd == -1)
 	{
 		if ((buf = scrollback_get_filename (sess)) == NULL)
 			return;

-		sess->scrollfile = g_file_new_for_path (buf);
+		sess->scrollfd = g_open (buf, O_CREAT | O_APPEND | O_WRONLY | OFLAGS, 0644);
 		g_free (buf);
+		if (sess->scrollfd == -1)
+			return;
 	}
-	else
-	{
-		/* Users can delete the folder after it's created... */
-		GFile *parent = g_file_get_parent (sess->scrollfile);
-		g_file_make_directory_with_parents (parent, NULL, NULL);
-		g_object_unref (parent);
-	}
-
-	ostream = G_OUTPUT_STREAM(g_file_append_to (sess->scrollfile, G_FILE_CREATE_PRIVATE, NULL, NULL));
-	if (!ostream)
-		return;

 	if (!stamp)
 		stamp = time(0);
@@ -199,29 +243,31 @@ scrollback_save (session *sess, char *text, time_t stamp)
 		buf = g_strdup_printf ("T %d ", (int) stamp);
 	else
 		buf = g_strdup_printf ("T %" G_GINT64_FORMAT " ", (gint64)stamp);
-
-	g_output_stream_write (ostream, buf, strlen (buf), NULL, NULL);
-	g_output_stream_write (ostream, text, strlen (text), NULL, NULL);
-	if (!g_str_has_suffix (text, "\n"))
-		g_output_stream_write (ostream, "\n", 1, NULL, NULL);
-
+	write (sess->scrollfd, buf, strlen (buf));
 	g_free (buf);
-	g_object_unref (ostream);
+
+	len = strlen (text);
+	write (sess->scrollfd, text, len);
+	if (len && text[len - 1] != '\n')
+		write (sess->scrollfd, "\n", 1);

 	sess->scrollwritten++;

-	if ((sess->scrollwritten > prefs.hex_text_max_lines && prefs.hex_text_max_lines > 0) ||
-       sess->scrollwritten > SCROLLBACK_MAX)
+	if ((sess->scrollwritten * 2 > prefs.hex_text_max_lines && prefs.hex_text_max_lines > 0) ||
+       sess->scrollwritten > 32000)
 		scrollback_shrink (sess);
 }

 void
 scrollback_load (session *sess)
 {
-	GDataInputStream *istream;
-	gchar *buf, *text;
-	gint lines = 0;
+	char *buf;
+	char *text;
 	time_t stamp;
+	int lines;
+	GIOChannel *io;
+	GError *file_error = NULL;
+	GError *io_err = NULL;

 	if (sess->text_scrollback == SET_DEFAULT)
 	{
@@ -234,28 +280,32 @@ scrollback_load (session *sess)
 			return;
 	}

-	if (!sess->scrollfile)
-	{
-		if ((buf = scrollback_get_filename (sess)) == NULL)
-			return;
-
-		sess->scrollfile = g_file_new_for_path (buf);
-		g_free (buf);
-	}
-
-	istream = file_get_datainputstream (sess->scrollfile);
-	if (!istream)
+	if ((buf = scrollback_get_filename (sess)) == NULL)
 		return;

+	io = g_io_channel_new_file (buf, "r", &file_error);
+	g_free (buf);
+	if (!io)
+		return;
+
+	lines = 0;
+
 	while (1)
 	{
-		GError *err = NULL;
 		gsize n_bytes;
+		GIOStatus io_status;

-		buf = g_data_input_stream_read_line_utf8 (istream, &n_bytes, NULL, &err);
+		io_status = g_io_channel_read_line (io, &buf, &n_bytes, NULL, &io_err);
 		
-		if (!err && buf)
+		if (io_status == G_IO_STATUS_NORMAL)
 		{
+			char *buf_tmp;
+
+			n_bytes--;
+			buf_tmp = buf;
+			buf = g_strndup (buf_tmp, n_bytes);
+			g_free (buf_tmp);
+
 			/*
 			 * Some scrollback lines have three blanks after the timestamp and a newline
 			 * Some have only one blank and a newline
@@ -299,27 +349,12 @@ scrollback_load (session *sess)

 			g_free (buf);
 		}
-		else if (err)
-		{
-			/* If its only an encoding error it may be specific to the line */
-			if (g_error_matches (err, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE))
-			{
-				g_warning ("Invalid utf8 in scrollback file\n");
-				g_clear_error (&err);
-				continue;
-			}

-			/* For general errors just give up */
-			g_clear_error (&err);
+		else
 			break;
-		}
-		else /* No new line */
-		{
-			break;
-		}
 	}

-	g_object_unref (istream);
+	g_io_channel_unref (io);

 	sess->scrollwritten = lines;

@@ -351,30 +386,14 @@ log_close (session *sess)
 	}
 }

-/*
- * filename should be in utf8 encoding and will be
- * converted to filesystem encoding automatically.
- */
 static void
 mkdir_p (char *filename)
 {
-	char *dirname, *dirname_fs;
-	GError *err = NULL;
+	char *dirname = g_path_get_dirname (filename);

-	dirname = g_path_get_dirname (filename);
-	dirname_fs = g_filename_from_utf8 (dirname, -1, NULL, NULL, &err);
-	if (!dirname_fs)
-	{
-		g_warning ("%s", err->message);
-		g_error_free (err);
-		g_free (dirname);
-		return;
-	}
-
-	g_mkdir_with_parents (dirname_fs, 0700);
+	g_mkdir_with_parents (dirname, 0700);

 	g_free (dirname);
-	g_free (dirname_fs);
 }

 static char *
@@ -508,12 +527,9 @@ log_create_pathname (char *servname, char *channame, char *netname)
 		channame = log_create_filename (channame);
 	}

-	servname = log_create_filename (servname);
-
 	log_insert_vars (fname, sizeof (fname), prefs.hex_irc_logmask, channame, netname, servname);
 	g_free (channame);
 	g_free (netname);
-	g_free (servname);

 	/* insert time/date */
 	now = time (NULL);
@@ -960,11 +976,6 @@ static char * const pevt_capack_help[] = {
 	N_("Acknowledged Capabilities")
 };

-static char * const pevt_capdel_help[] = {
-	N_("Server Name"),
-	N_("Removed Capabilities")
-};
-
 static char * const pevt_caplist_help[] = {
 	N_("Server Name"),
 	N_("Server Capabilities")
@@ -2123,7 +2134,7 @@ char *sound_files[NUM_XP];
 void
 sound_beep (session *sess)
 {
-	if (!prefs.hex_gui_focus_omitalerts || fe_gui_info (sess, 0) != 1)
+	if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1)
 	{
 		if (sound_files[XP_TE_BEEP] && sound_files[XP_TE_BEEP][0])
 			/* user defined beep _file_ */
--- a/src/common/textevents.in
+++ b/src/common/textevents.in
@@ -28,12 +28,6 @@ pevt_capack_help
 %C29*%O$tCapabilities acknowledged: %C29$2%O
 2

-Capability Deleted
-XP_TE_CAPDEL
-pevt_capdel_help
-%C29*%O$tCapabilities removed: %C29$2%O
-2
-
 Capability List
 XP_TE_CAPLIST
 pevt_caplist_help
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -68,47 +68,42 @@ url_clear (void)
 }

 static int
-url_save_cb (char *url, GOutputStream *ostream)
+url_save_cb (char *url, FILE *fd)
 {
-	stream_writef (ostream, "%s\n", url);
+	fprintf (fd, "%s\n", url);
 	return TRUE;
 }

 void
-url_save_tree (const char *fname)
+url_save_tree (const char *fname, const char *mode, gboolean fullpath)
 {
-	GFile *file;
-	GOutputStream *ostream;
+	FILE *fd;

-	file = hexchat_open_gfile (fname);
+	if (fullpath)
+		fd = hexchat_fopen_file (fname, mode, XOF_FULLPATH);
+	else
+		fd = hexchat_fopen_file (fname, mode, 0);
+	if (fd == NULL)
+		return;

-	ostream = G_OUTPUT_STREAM(g_file_append_to (file, G_FILE_CREATE_NONE, NULL, NULL));
-	if (ostream)
-	{
-		tree_foreach (url_tree, (tree_traverse_func *)url_save_cb, ostream);
-		g_object_unref (ostream);
-	}
-	
-	g_object_unref (file);
+	tree_foreach (url_tree, (tree_traverse_func *)url_save_cb, fd);
+	fclose (fd);
 }

 static void
 url_save_node (char* url)
 {
-	GFile *file;
-	GOutputStream *ostream;
+	FILE *fd;

 	/* open <config>/url.log in append mode */
-	file = hexchat_open_gfile ("url.log");
-
-	ostream = G_OUTPUT_STREAM(g_file_append_to (file, G_FILE_CREATE_NONE, NULL, NULL));
-	if (ostream)
+	fd = hexchat_fopen_file ("url.log", "a", 0);
+	if (fd == NULL)
 	{
-		stream_writef (ostream, "%s\n", url);
-		g_object_unref (ostream);
+		return;
 	}

-	g_object_unref (file);
+	fprintf (fd, "%s\n", url);
+	fclose (fd);	
 }

 static int
--- a/src/common/url.h
+++ b/src/common/url.h
@@ -33,7 +33,7 @@ extern void *url_tree;
 #define WORD_PATH    -2

 void url_clear (void);
-void url_save_tree (const char *fname);
+void url_save_tree (const char *fname, const char *mode, gboolean fullpath);
 int url_last (int *, int *);
 int url_check_word (const char *word);
 void url_check_line (char *buf);
--- a/src/common/userlist.c
+++ b/src/common/userlist.c
@@ -123,11 +123,10 @@ userlist_add_hostname (struct session *sess, char *nick, char *hostname,
 	user = userlist_find (sess, nick);
 	if (user)
 	{
-		if (hostname && (!user->hostname || strcmp(user->hostname, hostname)))
+		if (!user->hostname && hostname)
 		{
 			if (prefs.hex_gui_ulist_show_hosts)
 				do_rehash = TRUE;
-			g_free (user->hostname);
 			user->hostname = g_strdup (hostname);
 		}
 		if (!user->realname && realname && *realname)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -32,7 +32,7 @@
 #ifdef WIN32
 #include <sys/timeb.h>
 #include <io.h>
-#include "./sysinfo/sysinfo.h"
+#include <VersionHelpers.h>
 #else
 #include <unistd.h>
 #include <pwd.h>
@@ -56,6 +56,8 @@
 #ifdef USE_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/rand.h>
+#include <openssl/blowfish.h>
+#include <openssl/aes.h>
 #ifndef WIN32
 #include <netinet/in.h>
 #endif
@@ -456,38 +458,158 @@ get_cpu_info (double *mhz, int *cpus)

 #ifdef WIN32

+static int
+get_mhz (void)
+{
+	HKEY hKey;
+	int result, data, dataSize;
+
+	if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, "Hardware\\Description\\System\\"
+		"CentralProcessor\\0", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+	{
+		dataSize = sizeof (data);
+		result = RegQueryValueEx (hKey, "~MHz", 0, 0, (LPBYTE)&data, &dataSize);
+		RegCloseKey (hKey);
+		if (result == ERROR_SUCCESS)
+			return data;
+	}
+	return 0;	/* fails on Win9x */
+}
+
 int
 get_cpu_arch (void)
 {
-	return sysinfo_get_build_arch ();
+	SYSTEM_INFO si;
+
+	GetSystemInfo (&si);
+
+	if (si.wProcessorArchitecture == 9)
+	{
+		return 64;
+	}
+	else
+	{
+		return 86;
+	}
 }

 char *
 get_sys_str (int with_cpu)
 {
-	static char *without_cpu_buffer = NULL;
-	static char *with_cpu_buffer = NULL;
+	static char verbuf[64];
+	static char winver[20];
+	double mhz;

-	if (with_cpu == 0)
+	/* Broken since major bumped to 10, should start to work eventually.
+	 * No, IsWindowsVersionOrGreater (10, 0, 0) doesn't work either.
+	 * TODO: replace with IsWindows10OrGreater() once added to the SDK.
+	 */
+	if (IsWindowsVersionOrGreater (6, 4, 0))
 	{
-		if (without_cpu_buffer == NULL)
+		if (IsWindowsServer ())
 		{
-			without_cpu_buffer = sysinfo_get_os ();
+			strcpy (winver, "Server 10");
+		}
+		else
+		{
+			strcpy (winver, "10");
 		}
-
-		return without_cpu_buffer;
 	}
-
-	if (with_cpu_buffer == NULL)
+	else if (IsWindows8Point1OrGreater ())
 	{
-		char *os = sysinfo_get_os ();
-		char *cpu = sysinfo_get_cpu ();
-		with_cpu_buffer = g_strconcat (os, " [", cpu, "]", NULL);
-		g_free (cpu);
-		g_free (os);
+		if (IsWindowsServer ())
+		{
+			strcpy (winver, "Server 2012 R2");
+		}
+		else
+		{
+			strcpy (winver, "8.1");
+		}
+	}
+	else if (IsWindows8OrGreater ())
+	{
+		if (IsWindowsServer ())
+		{
+			strcpy (winver, "Server 2012");
+		}
+		else
+		{
+			strcpy (winver, "8");
+		}
+	}
+	else if (IsWindows7SP1OrGreater ())
+	{
+		if (IsWindowsServer ())
+		{
+			strcpy (winver, "Server 2008 R2 SP1");
+		}
+		else
+		{
+			strcpy (winver, "7 SP1");
+		}
+	}
+	else if (IsWindows7OrGreater ())
+	{
+		if (IsWindowsServer ())
+		{
+			strcpy (winver, "Server 2008 R2");
+		}
+		else
+		{
+			strcpy (winver, "7");
+		}
+	}
+	else if (IsWindowsVistaSP2OrGreater ())
+	{
+		if (IsWindowsServer ())
+		{
+			strcpy (winver, "Server 2008 SP2");
+		}
+		else
+		{
+			strcpy (winver, "Vista SP2");
+		}
+	}
+	else if (IsWindowsVistaSP1OrGreater ())
+	{
+		if (IsWindowsServer ())
+		{
+			strcpy (winver, "Server 2008 SP1");
+		}
+		else
+		{
+			strcpy (winver, "Vista SP1");
+		}
+	}
+	else if (IsWindowsVistaOrGreater ())
+	{
+		if (IsWindowsServer ())
+		{
+			strcpy (winver, "Server 2008");
+		}
+		else
+		{
+			strcpy (winver, "Vista");
+		}
+	}
+	else
+	{
+		strcpy (winver, "Unknown");
 	}

-	return with_cpu_buffer;
+	mhz = get_mhz ();
+	if (mhz && with_cpu)
+	{
+		double cpuspeed = ( mhz > 1000 ) ? mhz / 1000 : mhz;
+		const char *cpuspeedstr = ( mhz > 1000 ) ? "GHz" : "MHz";
+		sprintf (verbuf, "Windows %s [%.2f%s]",	winver, cpuspeed, cpuspeedstr);
+	}
+	else
+	{
+		sprintf (verbuf, "Windows %s", winver);
+	}
+	
+	return verbuf;
 }

 #else
@@ -530,7 +652,7 @@ get_sys_str (int with_cpu)
 #endif

 int
-buf_get_line (char *ibuf, char **buf, int *position, gsize len)
+buf_get_line (char *ibuf, char **buf, int *position, int len)
 {
 	int pos = *position, spos = pos;

@@ -1340,24 +1462,14 @@ int
 portable_mode (void)
 {
 #ifdef WIN32
-	static int is_portable = -1;
-
-	if (G_UNLIKELY(is_portable == -1))
+	if ((_access( "portable-mode", 0 )) != -1)
 	{
-		char *path = g_win32_get_package_installation_directory_of_module (NULL);
-		char *filename;
-
-		if (path == NULL)
-			path = g_strdup (".");
-
-		filename = g_build_filename (path, "portable-mode", NULL);
-		is_portable = g_file_test (filename, G_FILE_TEST_EXISTS);
-
-		g_free (path);
-		g_free (filename);
+		return 1;
+	}
+	else
+	{
+		return 0;
 	}
-
-	return is_portable;
 #else
 	return 0;
 #endif
@@ -1391,6 +1503,227 @@ encode_sasl_pass_plain (char *user, char *pass)
 	return encoded;
 }

+#ifdef USE_OPENSSL
+/* Adapted from ZNC's SASL module */
+
+static int
+parse_dh (char *str, DH **dh_out, unsigned char **secret_out, int *keysize_out)
+{
+	DH *dh;
+	guchar *data, *decoded_data;
+	guchar *secret = NULL;
+	gsize data_len;
+	guint size;
+	guint16 size16;
+	BIGNUM *pubkey;
+	gint key_size;
+
+	dh = DH_new();
+	data = decoded_data = g_base64_decode (str, &data_len);
+	if (data_len < 2)
+		goto fail;
+
+	/* prime number */
+	memcpy (&size16, data, sizeof(size16));
+	size = ntohs (size16);
+	data += 2;
+	data_len -= 2;
+
+	if (size > data_len)
+		goto fail;
+
+	dh->p = BN_bin2bn (data, size, NULL);
+	data += size;
+
+	/* Generator */
+	if (data_len < 2)
+		goto fail;
+
+	memcpy (&size16, data, sizeof(size16));
+	size = ntohs (size16);
+	data += 2;
+	data_len -= 2;
+	
+	if (size > data_len)
+		goto fail;
+
+	dh->g = BN_bin2bn (data, size, NULL);
+	data += size;
+
+	/* pub key */
+	if (data_len < 2)
+		goto fail;
+
+	memcpy (&size16, data, sizeof(size16));
+	size = ntohs(size16);
+	data += 2;
+	data_len -= 2;
+
+	pubkey = BN_bin2bn (data, size, NULL);
+	if (!(DH_generate_key (dh)))
+		goto fail;
+
+	secret = g_malloc (DH_size (dh));
+	key_size = DH_compute_key (secret, pubkey, dh);
+	if (key_size == -1)
+		goto fail;
+
+	g_free (decoded_data);
+
+	*dh_out = dh;
+	*secret_out = secret;
+	*keysize_out = key_size;
+	return 1;
+
+fail:
+	g_free (secret);
+	g_free (decoded_data);
+
+	return 0;
+}
+
+char *
+encode_sasl_pass_blowfish (char *user, char *pass, char *data)
+{
+	DH *dh;
+	char *response, *ret = NULL;
+	unsigned char *secret;
+	unsigned char *encrypted_pass;
+	char *plain_pass;
+	BF_KEY key;
+	int key_size, length;
+	int pass_len = strlen (pass) + (8 - (strlen (pass) % 8));
+	int user_len = strlen (user);
+	guint16 size16;
+	char *in_ptr, *out_ptr;
+
+	if (!parse_dh (data, &dh, &secret, &key_size))
+		return NULL;
+	BF_set_key (&key, key_size, secret);
+
+	encrypted_pass = g_malloc0 (pass_len);
+	plain_pass = g_malloc0 (pass_len);
+	memcpy (plain_pass, pass, strlen(pass));
+	out_ptr = (char*)encrypted_pass;
+	in_ptr = (char*)plain_pass;
+
+	for (length = pass_len; length; length -= 8, in_ptr += 8, out_ptr += 8)
+		BF_ecb_encrypt ((unsigned char*)in_ptr, (unsigned char*)out_ptr, &key, BF_ENCRYPT);
+
+	/* Create response */
+	length = 2 + BN_num_bytes (dh->pub_key) + pass_len + user_len + 1;
+	response = g_malloc0 (length);
+	out_ptr = response;
+
+	/* our key */
+	size16 = htons ((guint16)BN_num_bytes (dh->pub_key));
+	memcpy (out_ptr, &size16, sizeof(size16));
+	out_ptr += 2;
+	BN_bn2bin (dh->pub_key, (guchar*)out_ptr);
+	out_ptr += BN_num_bytes (dh->pub_key);
+
+	/* username */
+	memcpy (out_ptr, user, user_len + 1);
+	out_ptr += user_len + 1;
+
+	/* pass */
+	memcpy (out_ptr, encrypted_pass, pass_len);
+	
+	ret = g_base64_encode ((const guchar*)response, length);
+
+	g_free (response);
+
+	DH_free(dh);
+	g_free (plain_pass);
+	g_free (encrypted_pass);
+	g_free (secret);
+
+	return ret;
+}
+
+char *
+encode_sasl_pass_aes (char *user, char *pass, char *data)
+{
+	DH *dh;
+	AES_KEY key;
+	char *response = NULL;
+	char *out_ptr, *ret = NULL;
+	unsigned char *secret, *ptr;
+	unsigned char *encrypted_userpass, *plain_userpass;
+	int key_size, length;
+	guint16 size16;
+	unsigned char iv[16], iv_copy[16];
+	int user_len = strlen (user) + 1;
+	int pass_len = strlen (pass) + 1;
+	int len = user_len + pass_len;
+	int padlen = 16 - (len % 16);
+	int userpass_len = len + padlen;
+
+	if (!parse_dh (data, &dh, &secret, &key_size))
+		return NULL;
+
+	encrypted_userpass = g_malloc0 (userpass_len);
+	plain_userpass = g_malloc0 (userpass_len);
+
+	/* create message */
+	/* format of: <username>\0<password>\0<padding> */
+	ptr = plain_userpass;
+	memcpy (ptr, user, user_len);
+	ptr += user_len;
+	memcpy (ptr, pass, pass_len);
+	ptr += pass_len;
+	if (padlen)
+	{
+		/* Padding */
+		unsigned char randbytes[16];
+		if (!RAND_bytes (randbytes, padlen))
+			goto end;
+
+		memcpy (ptr, randbytes, padlen);
+	}
+
+	if (!RAND_bytes (iv, sizeof (iv)))
+		goto end;
+
+	memcpy (iv_copy, iv, sizeof(iv));
+
+	/* Encrypt */
+	AES_set_encrypt_key (secret, key_size * 8, &key);
+	AES_cbc_encrypt(plain_userpass, encrypted_userpass, userpass_len, &key, iv_copy, AES_ENCRYPT);
+
+	/* Create response */
+	/* format of:  <size pubkey><pubkey><iv (always 16 bytes)><ciphertext> */
+	length = 2 + key_size + sizeof(iv) + userpass_len;
+	response = g_malloc (length);
+	out_ptr = response;
+
+	/* our key */
+	size16 = htons ((guint16)key_size);
+	memcpy (out_ptr, &size16, sizeof(size16));
+	out_ptr += 2;
+	BN_bn2bin (dh->pub_key, (guchar*)out_ptr);
+	out_ptr += key_size;
+
+	/* iv */
+	memcpy (out_ptr, iv, sizeof(iv));
+	out_ptr += sizeof(iv);
+
+	/* userpass */
+	memcpy (out_ptr, encrypted_userpass, userpass_len);
+	
+	ret = g_base64_encode ((const guchar*)response, length);
+
+end:
+	DH_free (dh);
+	g_free (plain_userpass);
+	g_free (encrypted_userpass);
+	g_free (secret);
+	g_free (response);
+
+	return ret;
+}
+#endif
+
 #ifdef USE_OPENSSL
 static char *
 str_sha256hash (char *string)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -44,7 +44,7 @@ char *file_part (char *file);
 void for_files (char *dirname, char *mask, void callback (char *file));
 int rfc_casecmp (const char *, const char *);
 int rfc_ncasecmp (char *, char *, int);
-int buf_get_line (char *, char **, int *, gsize len);
+int buf_get_line (char *, char **, int *, int len);
 char *nocasestrstr (const char *text, const char *tofind);
 char *country (char *);
 void country_search (char *pattern, void *ud, void (*print)(void *, char *, ...));
@@ -76,6 +76,8 @@ void canonalize_key (char *key);
 int portable_mode (void);
 int unity_mode (void);
 char *encode_sasl_pass_plain (char *user, char *pass);
+char *encode_sasl_pass_blowfish (char *user, char *pass, char *data);
+char *encode_sasl_pass_aes (char *user, char *pass, char *data);
 char *challengeauth_response (char *username, char *password, char *challenge);
 size_t strftime_validated (char *dest, size_t destsize, const char *format, const struct tm *time);
 gsize strftime_utf8 (char *dest, gsize destsize, const char *format, time_t time);
--- a/src/fe-gtk/Makefile.am
+++ b/src/fe-gtk/Makefile.am
@@ -7,16 +7,17 @@ bin_PROGRAMS = hexchat

 AM_CPPFLAGS = $(GUI_CFLAGS) -DLOCALEDIR=\"$(localedir)\"

-hexchat_LDADD = $(top_builddir)/src/common/libhexchatcommon.a $(GUI_LIBS)
+hexchat_LDADD = ../common/libhexchatcommon.a $(GUI_LIBS)

 EXTRA_DIST = \
 	ascii.h banlist.h chanlist.h chanview.h chanview-tabs.c \
 	chanview-tree.c custom-list.h editlist.h fe-gtk.h fkeys.h gtkutil.h joind.h \
 	maingui.h menu.h notifygui.h  notifications palette.h pixmaps.h plugin-notification.h \
-	plugin-tray.h plugingui.c plugingui.h rawlog.h servlistgui.h setup.h sexy-iso-codes.h \
-	sexy-spell-entry.h textgui.h urlgrab.h userlistgui.h xtext.h
+	plugin-tray.h plugingui.c plugingui.h rawlog.h sexy-iso-codes.h \
+	sexy-spell-entry.h textgui.h urlgrab.h userlistgui.h xtext.h \
+	../../data/hexchat.gresource.xml

-BUILT_SOURCES = resources.h resources.c
+BUILT_SOURCES = resources.c

 CLEANFILES = $(BUILT_SOURCES)

@@ -39,23 +40,15 @@ notify_c = notifications/notification-dummy.c
 endif
 endif

-nodist_hexchat_SOURCES = resources.h resources.c
 hexchat_SOURCES = ascii.c banlist.c chanlist.c chanview.c custom-list.c \
 	dccgui.c editlist.c fe-gtk.c fkeys.c gtkutil.c ignoregui.c joind.c menu.c \
 	maingui.c notifygui.c $(notify_c) palette.c pixmaps.c plugin-tray.c $(plugingui_c) \
-	plugin-notification.c rawlog.c servlistgui.c setup.c $(iso_codes_c) \
+	plugin-notification.c rawlog.c resources.c servlistgui.c setup.c $(iso_codes_c) \
 	sexy-spell-entry.c textgui.c urlgrab.c userlistgui.c xtext.c
 hexchat_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/common

-resources_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/hexchat.gresource.xml)
-
-resources.h: $(top_srcdir)/data/hexchat.gresource.xml $(resources_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-header --manual-register $<
-
-resources.c: $(top_srcdir)/data/hexchat.gresource.xml $(resources_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-source --manual-register $<
-
-EXTRA_DIST += $(resources_files)
+resources.c: $(top_srcdir)/data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir)/data --generate-dependencies $(top_srcdir)/data/hexchat.gresource.xml)
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-source $<

 if DO_STATIC_ANALYSIS
 analyze_plists = $(hexchat_SOURCES:%.c=%.plist)
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -852,7 +852,7 @@ fe_ctrl_gui (session *sess, fe_gui_action action, int arg)
 		mg_detach (sess, arg);	/* arg: 0=toggle 1=detach 2=attach */
 		break;
 	case FE_GUI_APPLY:
-		setup_apply_real (TRUE, TRUE, TRUE, FALSE);
+		setup_apply_real (TRUE, TRUE, TRUE);
 	}
 }

--- a/src/fe-gtk/fe-gtk.h
+++ b/src/fe-gtk/fe-gtk.h
@@ -39,13 +39,14 @@

 #define flag_c flag_wid[0]
 #define flag_n flag_wid[1]
-#define flag_t flag_wid[2]
-#define flag_i flag_wid[3]
-#define flag_m flag_wid[4]
-#define flag_l flag_wid[5]
-#define flag_k flag_wid[6]
-#define flag_b flag_wid[7]
-#define NUM_FLAG_WIDS 8
+#define flag_r flag_wid[2]
+#define flag_t flag_wid[3]
+#define flag_i flag_wid[4]
+#define flag_m flag_wid[5]
+#define flag_l flag_wid[6]
+#define flag_k flag_wid[7]
+#define flag_b flag_wid[8]
+#define NUM_FLAG_WIDS 9

 #ifdef HAVE_GTK_MAC
 extern GtkosxApplication *osx_app;
--- a/src/fe-gtk/fe-gtk.vcxproj
+++ b/src/fe-gtk/fe-gtk.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
@@ -29,25 +29,29 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
+      <!-- WholeProgramOptimization must be turned off for gresource constructors to work, otherwise the .CRT$XCU section is not emitted. -->
+      <WholeProgramOptimization>false</WholeProgramOptimization>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
+      <!-- WholeProgramOptimization must be turned off for gresource constructors to work, otherwise the .CRT$XCU section is not emitted. -->
+      <WholeProgramOptimization>false</WholeProgramOptimization>
      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\common;$(HexChatLib);$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4244;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
    </ClCompile>
    <Link>
      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
    </Link>
  </ItemDefinitionGroup>
@@ -58,8 +62,7 @@ SET SOLUTIONDIR=$(SolutionDir)..\
 powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\src\fe-gtk\hexchat.rc.tt" "$(HexChatLib)hexchat.rc.utf8"
 REM hexchat.rc needs to be in UCS-2 or Resource Compiler will complain
 powershell "Get-Content -Encoding UTF8 '$(HexChatLib)hexchat.rc.utf8' | Out-File '$(HexChatLib)hexchat.rc'; Remove-Item '$(HexChatLib)hexchat.rc.utf8'"
-"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-header --manual-register --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.h" "$(DataDir)hexchat.gresource.xml"
-"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --manual-register --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.c" "$(DataDir)hexchat.gresource.xml"
+"$(DepsRoot)\bin\glib-compile-resources.exe" --generate-source --sourcedir "$(DataDir)" --target "$(HexChatLib)resources.c" "$(DataDir)hexchat.gresource.xml"
      ]]></Command>
      <Message>Build hexchat.rc and gresource file</Message>
    </PreBuildEvent>
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@@ -1409,21 +1409,10 @@ key_action_tab_clean(void)
 	}
 }

-/* For use in sorting the user list for completion
-
-This sorts everyone by the last talked time except your own nick
-which is forced to the bottom of the list to avoid completing your
-own name, which is very unlikely.
-*/
+/* For use in sorting the user list for completion */
 static int
 talked_recent_cmp (struct User *a, struct User *b)
 {
-	if (a->me)
-		return -1;
-
-	if (b->me)
-		return 1;
-
 	if (a->lasttalk < b->lasttalk)
 		return -1;

--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -78,7 +78,7 @@ static void mg_link_irctab (session *sess, int focus);
 static session_gui static_mg_gui;
 static session_gui *mg_gui = NULL;	/* the shared irc tab */
 static int ignore_chanmode = FALSE;
-static const char chan_flags[] = { 'c', 'n', 't', 'i', 'm', 'l', 'k' };
+static const char chan_flags[] = { 'c', 'n', 'r', 't', 'i', 'm', 'l', 'k' };

 static chan *active_tab = NULL;	/* active tab */
 GtkWidget *parent_window = NULL;			/* the master window */
@@ -2003,24 +2003,17 @@ mg_flagbutton_cb (GtkWidget *but, char *flag)
 static GtkWidget *
 mg_create_flagbutton (char *tip, GtkWidget *box, char *face)
 {
-	GtkWidget *btn, *lbl;
-	char label_markup[16];
+	GtkWidget *wid;

-	g_snprintf (label_markup, sizeof(label_markup), "<tt>%s</tt>", face);
-	lbl = gtk_label_new (NULL);
-	gtk_label_set_markup (GTK_LABEL(lbl), label_markup);
-
-	btn = gtk_toggle_button_new ();
-	gtk_widget_set_size_request (btn, -1, 0);
-	gtk_widget_set_tooltip_text (btn, tip);
-	gtk_container_add (GTK_CONTAINER(btn), lbl);
-
-	gtk_box_pack_start (GTK_BOX (box), btn, 0, 0, 0);
-	g_signal_connect (G_OBJECT (btn), "toggled",
+	wid = gtk_toggle_button_new_with_label (face);
+	gtk_widget_set_size_request (wid, 18, 0);
+	gtk_widget_set_tooltip_text (wid, tip);
+	gtk_box_pack_start (GTK_BOX (box), wid, 0, 0, 0);
+	g_signal_connect (G_OBJECT (wid), "toggled",
 							G_CALLBACK (mg_flagbutton_cb), face);
-	show_and_unfocus (btn);
+	show_and_unfocus (wid);

-	return btn;
+	return wid;
 }

 static void
@@ -2075,6 +2068,7 @@ mg_create_chanmodebuttons (session_gui *gui, GtkWidget *box)
 {
 	gui->flag_c = mg_create_flagbutton (_("Filter Colors"), box, "c");
 	gui->flag_n = mg_create_flagbutton (_("No outside messages"), box, "n");
+	gui->flag_r = mg_create_flagbutton (_("Registered Only"), box, "r");
 	gui->flag_t = mg_create_flagbutton (_("Topic Protection"), box, "t");
 	gui->flag_i = mg_create_flagbutton (_("Invite Only"), box, "i");
 	gui->flag_m = mg_create_flagbutton (_("Moderated"), box, "m");
@@ -2948,7 +2942,7 @@ mg_create_search(session *sess, GtkWidget *box)
 	gtk_box_pack_start(GTK_BOX(gui->shbox), next, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(next), "clicked", G_CALLBACK(mg_search_handle_next), sess);

-	highlight = gtk_check_button_new_with_mnemonic (_("_Highlight all"));
+	highlight = gtk_check_button_new_with_mnemonic (_("Highlight _all"));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(highlight), prefs.hex_text_search_highlight_all);
 	gtk_widget_set_can_focus (highlight, FALSE);
 	g_signal_connect (G_OBJECT (highlight), "toggled", G_CALLBACK (search_set_option), &prefs.hex_text_search_highlight_all);
--- a/src/fe-gtk/notifications/notifications-winrt.vcxproj
+++ b/src/fe-gtk/notifications/notifications-winrt.vcxproj
@@ -23,7 +23,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
--- a/src/fe-gtk/palette.c
+++ b/src/fe-gtk/palette.c
@@ -146,33 +146,26 @@ palette_load (void)
 void
 palette_save (void)
 {
-	GFile *file;
-	GOutputStream *ostream;
-	int i, j;
+	int i, j, fh;
 	char prefname[256];

-	file = hexchat_open_gfile ("colors.conf");
-	
-	ostream = G_OUTPUT_STREAM(g_file_replace (file, NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL));
-	
-	if (ostream)
+	fh = hexchat_open_file ("colors.conf", O_TRUNC | O_WRONLY | O_CREAT, 0600, XOF_DOMODE);
+	if (fh != -1)
 	{
 		/* mIRC colors 0-31 are here */
 		for (i = 0; i < 32; i++)
 		{
 			g_snprintf (prefname, sizeof prefname, "color_%d", i);
-			cfg_put_color (ostream, colors[i].red, colors[i].green, colors[i].blue, prefname);
+			cfg_put_color (fh, colors[i].red, colors[i].green, colors[i].blue, prefname);
 		}

 		/* our special colors are mapped at 256+ */
 		for (i = 256, j = 32; j < MAX_COL+1; i++, j++)
 		{
 			g_snprintf (prefname, sizeof prefname, "color_%d", i);
-			cfg_put_color (ostream, colors[j].red, colors[j].green, colors[j].blue, prefname);
+			cfg_put_color (fh, colors[j].red, colors[j].green, colors[j].blue, prefname);
 		}

-		g_object_unref (ostream);
+		close (fh);
 	}
-	
-	g_object_unref (file);
 }
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -24,7 +24,6 @@
 #include "../common/cfgfiles.h"
 #include "../common/hexchat.h"
 #include "../common/fe.h"
-#include "resources.h"

 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -109,8 +108,6 @@ load_pixmap (const char *filename)
 void
 pixmaps_init (void)
 {
-	hexchat_register_resource();
-
 	pix_ulist_voice = load_pixmap ("ulist_voice");
 	pix_ulist_halfop = load_pixmap ("ulist_halfop");
 	pix_ulist_op = load_pixmap ("ulist_op");
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -29,7 +29,6 @@
 #include "../common/userlist.h"
 #include "../common/util.h"
 #include "../common/hexchatc.h"
-#include "../common/outbound.h"
 #include "fe-gtk.h"
 #include "gtkutil.h"
 #include "maingui.h"
@@ -658,16 +657,6 @@ static const setting network_settings[] =
 	{ST_END, 0, 0, 0, 0, 0}
 };

-static const setting identd_settings[] =
-{
-	{ST_HEADER, N_("Identd Server"), 0, 0, 0, 0},
-	{ST_TOGGLE, N_("Enabled"), P_OFFINTNL(hex_identd_server), N_("Server will respond with the networks username"), 0, 1},
-	{ST_NUMBER,	N_("Port:"), P_OFFINTNL(hex_identd_port), N_("You must have permissions to listen on this port. "
-												   "If not 113 (0 defaults to this) then you must configure port-forwarding."), 0, 65535},
-
-	{ST_END, 0, 0, 0, 0, 0}
-};
-
 #define setup_get_str(pr,set) (((char *)pr)+set->offset)
 #define setup_get_int(pr,set) *(((int *)pr)+set->offset)
 #define setup_get_int3(pr,off) *(((int *)pr)+off) 
@@ -1180,8 +1169,8 @@ setup_entry_cb (GtkEntry *entry, setting *set)
 {
 	int size;
 	int pos;
+	int len = gtk_entry_get_text_length (entry);
 	unsigned char *p = (unsigned char*)gtk_entry_get_text (entry);
-	int len = strlen (p);

 	/* need to truncate? */
 	if (len >= set->extra)
@@ -1878,7 +1867,6 @@ static const char *const cata[] =
 	N_("Network"),
 		N_("Network setup"),
 		N_("File transfers"),
-		N_("Identd"),
 		NULL,
 	NULL
 };
@@ -1921,7 +1909,6 @@ setup_create_pages (GtkWidget *box)

 	setup_add_page (cata[15], book, setup_create_page (network_settings));
 	setup_add_page (cata[16], book, setup_create_page (filexfer_settings));
-	setup_add_page (cata[17], book, setup_create_page (identd_settings));

 	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (book), FALSE);
 	gtk_notebook_set_show_border (GTK_NOTEBOOK (book), FALSE);
@@ -2083,7 +2070,7 @@ unslash (char *dir)
 }

 void
-setup_apply_real (int new_pix, int do_ulist, int do_layout, int do_identd)
+setup_apply_real (int new_pix, int do_ulist, int do_layout)
 {
 	GSList *list;
 	session *sess;
@@ -2135,9 +2122,6 @@ setup_apply_real (int new_pix, int do_ulist, int do_layout, int do_identd)

 	if (do_layout)
 		menu_change_layout ();
-
-	if (do_identd)
-		handle_command (current_sess, "IDENTD reload", FALSE);
 }

 static void
@@ -2152,7 +2136,6 @@ setup_apply (struct hexchatprefs *pr)
 	int noapply = FALSE;
 	int do_ulist = FALSE;
 	int do_layout = FALSE;
-	int do_identd = FALSE;

 	if (strcmp (pr->hex_text_background, prefs.hex_text_background) != 0)
 		new_pix = TRUE;
@@ -2201,9 +2184,6 @@ setup_apply (struct hexchatprefs *pr)
 	if (DIFF (hex_gui_tab_layout))
 		do_layout = TRUE;

-	if (DIFF (hex_identd_server) || DIFF (hex_identd_port))
-		do_identd = TRUE;
-
 	if (color_change || (DIFF (hex_gui_ulist_color)) || (DIFF (hex_away_size_max)) || (DIFF (hex_away_track)))
 		do_ulist = TRUE;

@@ -2245,7 +2225,7 @@ setup_apply (struct hexchatprefs *pr)
 		strcpy (prefs.hex_irc_real_name, "realname");
 	}
 	
-	setup_apply_real (new_pix, do_ulist, do_layout, do_identd);
+	setup_apply_real (new_pix, do_ulist, do_layout);

 	if (noapply)
 		fe_message (_("Some settings were changed that require a"
--- a/src/fe-gtk/setup.h
+++ b/src/fe-gtk/setup.h
@@ -20,6 +20,6 @@
 #ifndef HEXCHAT_SETUP_H
 #define HEXCHAT_SETUP_H

-void setup_apply_real (int new_pix, int do_ulist, int do_layout, int do_identd);
+void setup_apply_real (int new_pix, int do_ulist, int do_layout);

 #endif
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -141,8 +141,6 @@ enum
 };
 static guint signals[LAST_SIGNAL] = {0};

-static PangoAttrList *empty_attrs_list = NULL;
-
 static gboolean
 spell_accumulator(GSignalInvocationHint *hint, GValue *return_accu, const GValue *handler_return, gpointer data)
 {
@@ -250,11 +248,6 @@ sexy_spell_entry_class_init(SexySpellEntryClass *klass)
 					   _hexchat_marshal_BOOLEAN__STRING,
 					   G_TYPE_BOOLEAN,
 					   1, G_TYPE_STRING);
-
-	if (empty_attrs_list == NULL)
-	{
-		empty_attrs_list = pango_attr_list_new ();
-	}
 }

 static void
@@ -1047,7 +1040,7 @@ sexy_spell_entry_recheck_all(SexySpellEntry *entry)
 	{
 		/* Check for attributes */
 		text = gtk_entry_get_text (GTK_ENTRY (entry));
-		text_len = strlen (text);
+		text_len = gtk_entry_get_text_length (GTK_ENTRY (entry));
 		check_attributes (entry, text, text_len);
 	}

@@ -1087,14 +1080,7 @@ sexy_spell_entry_expose(GtkWidget *widget, GdkEventExpose *event)

 	
 	layout = gtk_entry_get_layout(gtk_entry);
-	if (gtk_entry->preedit_length == 0)
-	{
-		pango_layout_set_attributes(layout, entry->priv->attr_list);
-	}
-	else
-	{
-		pango_layout_set_attributes(layout, empty_attrs_list);
-	}
+	pango_layout_set_attributes(layout, entry->priv->attr_list);

 	return GTK_WIDGET_CLASS(parent_class)->expose_event (widget, event);
 }
--- a/src/fe-gtk/urlgrab.c
+++ b/src/fe-gtk/urlgrab.c
@@ -138,7 +138,7 @@ url_save_callback (void *arg1, char *file)
 {
 	if (file)
 	{
-		url_save_tree (file);
+		url_save_tree (file, "w", TRUE);
 	}
 }

--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -113,7 +113,6 @@ char *nocasestrstr (const char *text, const char *tofind);	/* util.c */
 int xtext_get_stamp_str (time_t, char **);
 static void gtk_xtext_render_page (GtkXText * xtext);
 static void gtk_xtext_calc_lines (xtext_buffer *buf, int);
-static gboolean gtk_xtext_is_selecting (GtkXText *xtext);
 static char *gtk_xtext_selection_get_text (GtkXText *xtext, int *len_ret);
 static textentry *gtk_xtext_nth (GtkXText *xtext, int line, int *subline);
 static void gtk_xtext_adjustment_changed (GtkAdjustment * adj,
@@ -839,6 +838,7 @@ find_x (GtkXText *xtext, textentry *ent, int x, int subline, int indent)
 	int off, len, wid, mbl, mbw;

 	/* Skip to the first chunk of stuff for the subline */
+	list = ent->slp;
 	if (subline > 0)
 	{
 		suboff = GPOINTER_TO_INT (g_slist_nth_data (ent->sublines, subline - 1));
@@ -855,8 +855,6 @@ find_x (GtkXText *xtext, textentry *ent, int x, int subline, int indent)
 		list = ent->slp;
 	} 
 	/* Step to the first character of the subline */
-	if (list == NULL)
-		return 0;
 	meta = list->data;
 	off = meta->off;
 	len = meta->len;
@@ -945,12 +943,12 @@ gtk_xtext_find_x (GtkXText * xtext, int x, textentry * ent, int subline,
 }

 static textentry *
-gtk_xtext_find_char (GtkXText * xtext, int x, int y, int *off, int *out_of_bounds)
+gtk_xtext_find_char (GtkXText * xtext, int x, int y, int *off,
+							int *out_of_bounds, int *ret_subline)
 {
 	textentry *ent;
 	int line;
 	int subline;
-	int outofbounds;

 	/* Adjust y value for negative rounding, double to int */
 	if (y < 0)
@@ -962,9 +960,10 @@ gtk_xtext_find_char (GtkXText * xtext, int x, int y, int *off, int *out_of_bound
 		return NULL;

 	if (off)
-		*off = gtk_xtext_find_x (xtext, x, ent, subline, line, &outofbounds);
-	if (out_of_bounds)
-		*out_of_bounds = outofbounds;
+		*off = gtk_xtext_find_x (xtext, x, ent, subline, line, out_of_bounds);
+
+	if (ret_subline)
+		*ret_subline = subline;

 	return ent;
 }
@@ -1059,14 +1058,14 @@ gtk_xtext_paint (GtkWidget *widget, GdkRectangle *area)
 		return;
 	}

-	ent_start = gtk_xtext_find_char (xtext, area->x, area->y, NULL, NULL);
+	ent_start = gtk_xtext_find_char (xtext, area->x, area->y, NULL, NULL, NULL);
 	if (!ent_start)
 	{
 		xtext_draw_bg (xtext, area->x, area->y, area->width, area->height);
 		goto xit;
 	}
 	ent_end = gtk_xtext_find_char (xtext, area->x + area->width,
-											 area->y + area->height, NULL, NULL);
+											 area->y + area->height, NULL, NULL, NULL);
 	if (!ent_end)
 		ent_end = xtext->buffer->text_last;

@@ -1254,14 +1253,13 @@ lamejump:
 		}
 	}
 	/* marking upward? */
-	else if (xtext->buffer->last_ent_start != NULL &&
-				xtext->buffer->last_ent_end == end_ent &&
+	else if (xtext->buffer->last_ent_end == end_ent &&
 				xtext->buffer->last_offset_end == end_offset)
 	{
 		ent = end_ent;
 		while (ent)
 		{
-			if (ent == start_ent && xtext->buffer->last_ent_start)
+			if (ent == start_ent)
 			{
 				gtk_xtext_selection_up (xtext, xtext->buffer->last_ent_start, ent, start_offset);
 				/*gtk_xtext_render_ents (xtext, xtext->buffer->last_ent_start, ent);*/
@@ -1310,104 +1308,99 @@ gtk_xtext_selection_draw (GtkXText * xtext, GdkEventMotion * event, gboolean ren
 	textentry *ent;
 	textentry *ent_end;
 	textentry *ent_start;
-	int offset_start = 0;
-	int offset_end = 0;
-	textentry *low_ent, *high_ent;
-	int low_x, low_y, low_offs;
-	int high_x, high_y, high_offs, high_len;
+	int offset_start;
+	int offset_end;
+	int subline_start;
+	int subline_end;
+	int oob;
+	int marking_up = FALSE;
+	int len_start;
+	int len_end;

-	if (xtext->buffer->text_first == NULL)
+	ent_start = gtk_xtext_find_char (xtext, xtext->select_start_x, xtext->select_start_y, &offset_start, &oob, &subline_start);
+	ent_end = gtk_xtext_find_char (xtext, xtext->select_end_x, xtext->select_end_y, &offset_end, &oob, &subline_end);
+
+	if ((!ent_start || !ent_end) && !xtext->buffer->text_last && xtext->adj->value != xtext->buffer->old_value)
+	{
+		gtk_xtext_render_page (xtext);
 		return;
+	}

-	ent_start = gtk_xtext_find_char (xtext, xtext->select_start_x, xtext->select_start_y, &offset_start, NULL);
-	ent_end = gtk_xtext_find_char (xtext, xtext->select_end_x, xtext->select_end_y, &offset_end, NULL);
-	if (ent_start == NULL && ent_end == NULL)
-		return;
+	if (!ent_start)
+	{
+		ent_start = xtext->buffer->text_last;
+		offset_start = ent_start->str_len;
+	}

-	if	((ent_start != ent_end && xtext->select_start_y > xtext->select_end_y) || /* different entries */
-		(ent_start == ent_end && offset_start > offset_end))	/* same entry, different character offsets */
+	if (!ent_end)
 	{
-		/* marking up */
-		low_ent = ent_end;
-		low_x = xtext->select_end_x;
-		low_y = xtext->select_end_y;
-		low_offs = offset_end;
-		high_ent = ent_start;
-		high_x = xtext->select_start_x;
-		high_y = xtext->select_start_y;
-		high_offs = offset_start;
+		ent_end = xtext->buffer->text_last;
+		offset_end = ent_end->str_len;
 	}
-	else
+
+	if ((ent_start != ent_end && xtext->select_start_y > xtext->select_end_y) || /* different entries */
+		(ent_start == ent_end && subline_start > subline_end) || /* different lines */
+		(ent_start == ent_end && subline_start == subline_end && xtext->select_start_x > xtext->select_end_x)) /* marking to the left */
 	{
-		/* marking down */
-		low_ent = ent_start;
-		low_x = xtext->select_start_x;
-		low_y = xtext->select_start_y;
-		low_offs = offset_start;
-		high_ent = ent_end;
-		high_x = xtext->select_end_x;
-		high_y = xtext->select_end_y;
-		high_offs = offset_end;
-	}
-	if (low_ent == NULL)
-	{
-		low_ent = xtext->buffer->text_first;
-		low_offs = 0;
-	}
-	if (high_ent == NULL)
-	{
-		high_ent = xtext->buffer->text_last;
-		high_offs = high_ent->str_len;
+		marking_up = TRUE;
 	}

 	/* word selection */
 	if (xtext->word_select)
 	{
 		/* a word selection cannot be started if the cursor is out of bounds in gtk_xtext_button_press */
-		gtk_xtext_get_word (xtext, low_x, low_y, NULL, &low_offs, NULL, NULL);
+		gtk_xtext_get_word (xtext, xtext->select_start_x, xtext->select_start_y, NULL, &offset_start, &len_start, NULL);

 		/* in case the cursor is out of bounds we keep offset_end from gtk_xtext_find_char and fix the length */
-		if (gtk_xtext_get_word (xtext, high_x, high_y, NULL, &high_offs, &high_len, NULL) == NULL)
-			high_len = high_offs == high_ent->str_len? 0: -1; /* -1 for the space, 0 if at the end */
-		high_offs += high_len;
-		if (low_y < 0)
-			low_offs = xtext->buffer->last_offset_start;
-		if (high_y > xtext->buffer->window_height)
-			high_offs = xtext->buffer->last_offset_end;
+		if (gtk_xtext_get_word (xtext, xtext->select_end_x, xtext->select_end_y, NULL, &offset_end, &len_end, NULL) == NULL)
+			len_end = offset_end == ent_end->str_len? 0: -1; /* -1 for the space, 0 if at the end */
+
+		if (!marking_up)
+			offset_end += len_end;
+		else
+			offset_start += len_start;
 	}
 	/* line/ent selection */
 	else if (xtext->line_select)
 	{
-		low_offs = 0;
-		high_offs = high_ent->str_len;
+		offset_start = marking_up? ent_start->str_len: 0;
+		offset_end = marking_up? 0: ent_end->str_len;
 	}
-	/* character selection */
-	else
+
+	if (marking_up)
 	{
-		if (low_y < 0)
-			low_offs = xtext->buffer->last_offset_start;
-		if (high_y > xtext->buffer->window_height)
-			high_offs = xtext->buffer->last_offset_end;
+		int temp;
+
+		/* ensure ent_start is above ent_end */
+		if (ent_start != ent_end)
+		{
+			ent = ent_start;
+			ent_start = ent_end;
+			ent_end = ent;
+		}
+
+		/* switch offsets as well */
+		temp = offset_start;
+		offset_start = offset_end;
+		offset_end = temp;
 	}

 	/* set all the old mark_ fields to -1 */
 	gtk_xtext_selection_clear (xtext->buffer);

-	low_ent->mark_start = low_offs;
-	low_ent->mark_end = high_offs;
+	/* set the default values */
+	ent_start->mark_end = ent_start->str_len;
+	ent_end->mark_start = 0;

-	if (low_ent != high_ent)
+	/* set the calculated values (this overwrites the default values if we're on the same ent) */
+	ent_start->mark_start = offset_start;
+	ent_end->mark_end = offset_end;
+
+	/* set all the mark_ fields of the ents within the selection */
+	if (ent_start != ent_end)
 	{
-		low_ent->mark_end = low_ent->str_len;
-		if (high_offs != 0)
-		{
-			high_ent->mark_start = 0;
-			high_ent->mark_end = high_offs;
-		}
-
-		/* set all the mark_ fields of the ents within the selection */
-		ent = low_ent->next;
-		while (ent && ent != high_ent)
+		ent = ent_start->next;
+		while (ent && ent != ent_end)
 		{
 			ent->mark_start = 0;
 			ent->mark_end = ent->str_len;
@@ -1416,7 +1409,7 @@ gtk_xtext_selection_draw (GtkXText * xtext, GdkEventMotion * event, gboolean ren
 	}

 	if (render)
-		gtk_xtext_selection_render (xtext, low_ent, high_ent);
+		gtk_xtext_selection_render (xtext, ent_start, ent_end);
 }

 static int
@@ -1548,7 +1541,7 @@ gtk_xtext_get_word (GtkXText * xtext, int x, int y, textentry ** ret_ent,
 	int out_of_bounds = 0;
 	int len_to_offset = 0;

-	ent = gtk_xtext_find_char (xtext, x, y, &offset, &out_of_bounds);
+	ent = gtk_xtext_find_char (xtext, x, y, &offset, &out_of_bounds, NULL);
 	if (ent == NULL || out_of_bounds || offset < 0 || offset >= ent->str_len)
 		return NULL;

@@ -1773,6 +1766,7 @@ gtk_xtext_motion_notify (GtkWidget * widget, GdkEventMotion * event)
 		xtext->select_end_x = x;
 		xtext->select_end_y = y;
 		gtk_xtext_selection_update (xtext, event, y, !redraw);
+		xtext->hilighting = TRUE;

 		/* user has pressed or released SHIFT, must redraw entire selection */
 		if (redraw)
@@ -1973,10 +1967,13 @@ gtk_xtext_button_release (GtkWidget * widget, GdkEventButton * event)
 			return FALSE;
 		}

-		if (!gtk_xtext_is_selecting (xtext))
+		if (!xtext->hilighting)
 		{
 			word = gtk_xtext_get_word (xtext, event->x, event->y, 0, 0, 0, 0);
 			g_signal_emit (G_OBJECT (xtext), xtext_signals[WORD_CLICK], 0, word ? word : NULL, event);
+		} else
+		{
+			xtext->hilighting = FALSE;
 		}
 	}

@@ -2075,28 +2072,6 @@ gtk_xtext_selection_kill (GtkXText *xtext, GdkEventSelection *event)
 	return TRUE;
 }

-static gboolean
-gtk_xtext_is_selecting (GtkXText *xtext)
-{
-	textentry *ent;
-	xtext_buffer *buf;
-
-	buf = xtext->selection_buffer;
-	if (!buf)
-		return FALSE;
-
-	for (ent = buf->last_ent_start; ent; ent = ent->next)
-	{
-		if (ent->mark_start != -1 && ent->mark_end - ent->mark_start > 0)
-			return TRUE;
-
-		if (ent == buf->last_ent_end)
-			break;
-	}
-
-	return FALSE;
-}
-
 static char *
 gtk_xtext_selection_get_text (GtkXText *xtext, int *len_ret)
 {
@@ -4227,6 +4202,7 @@ gtk_xtext_search_textentry (xtext_buffer *buf, textentry *ent)

 		hay = match? g_strdup (str): g_utf8_casefold (str, lstr);
 		lhay = strlen (hay);
+		off = 0;

 		for (pos = hay, len = lhay; len;
 			  off += buf->search_lnee, pos = hay + off, len = lhay - off)
@@ -4668,8 +4644,8 @@ gtk_xtext_append_indent (xtext_buffer *buf,
 	if (right_len == -1)
 		right_len = strlen (right_text);

-	if (left_len + right_len + 2 >= sizeof (buf->xtext->scratch_buffer))
-		right_len = sizeof (buf->xtext->scratch_buffer) - left_len - 2;
+	if (right_len >= sizeof (buf->xtext->scratch_buffer))
+		right_len = sizeof (buf->xtext->scratch_buffer) - 1;

 	if (right_text[right_len-1] == '\n')
 		right_len--;
@@ -4689,18 +4665,13 @@ gtk_xtext_append_indent (xtext_buffer *buf,
 	ent->str_len = left_len + 1 + right_len;
 	ent->indent = (buf->indent - left_width) - buf->xtext->space_width;

-	/* This is copied into the scratch buffer later, double check math */
-	g_assert (ent->str_len < sizeof (buf->xtext->scratch_buffer));
-
 	if (buf->time_stamp)
 		space = buf->xtext->stamp_width;
 	else
 		space = 0;

 	/* do we need to auto adjust the separator position? */
-	if (buf->xtext->auto_indent &&
-		 buf->indent < buf->xtext->max_auto_indent &&
-		 ent->indent < MARGIN + space)
+	if (buf->xtext->auto_indent && ent->indent < MARGIN + space)
 	{
 		tempindent = MARGIN + space + buf->xtext->space_width + left_width;

@@ -4781,11 +4752,8 @@ gtk_xtext_lastlog (xtext_buffer *out, xtext_buffer *search_area)
 				gtk_xtext_append (out, ent->str, ent->str_len, 0);
 			}

-			if (out->text_last)
-			{
-				out->text_last->stamp = ent->stamp;
-				gtk_xtext_search_textentry_add (out, out->text_last, gl, TRUE);
-			}
+			out->text_last->stamp = ent->stamp;
+			gtk_xtext_search_textentry_add (out, out->text_last, gl, TRUE);
 		}
 		ent = ent->next;
 	}
@@ -4979,7 +4947,6 @@ gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render)
 		if (buf->window_width != w)
 		{
 			buf->window_width = w;
-			buf->window_height = h;
 			gtk_xtext_calc_lines (buf, FALSE);
 			if (buf->scrollbar_down)
 				gtk_adjustment_set_value (xtext->adj, xtext->adj->upper -
--- a/src/fe-gtk/xtext.h
+++ b/src/fe-gtk/xtext.h
@@ -219,6 +219,7 @@ struct _GtkXText
 	unsigned int word_select:1;
 	unsigned int line_select:1;
 	unsigned int button_down:1;
+	unsigned int hilighting:1;
 	unsigned int dont_render:1;
 	unsigned int dont_render2:1;
 	unsigned int cursor_hand:1;
--- a/src/fe-text/Makefile.am
+++ b/src/fe-text/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = hexchat-text

 AM_CPPFLAGS = $(COMMON_CFLAGS) -DLOCALEDIR=\"$(localedir)\"

-hexchat_text_LDADD = $(top_builddir)/src/common/libhexchatcommon.a $(COMMON_LIBS)
+hexchat_text_LDADD = ../common/libhexchatcommon.a $(COMMON_LIBS)
 hexchat_text_SOURCES = fe-text.c fe-text.h

--- a/src/fe-text/fe-text.vcxproj
+++ b/src/fe-text/fe-text.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
@@ -37,7 +37,7 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
@@ -51,7 +51,7 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;wbemuuid.lib;comsupp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(DepLibs);$(HexChatLib)common.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
--- a/src/htm/Properties/Resources.Designer.cs
+++ b/src/htm/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17626
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
--- a/src/htm/Properties/Settings.Designer.cs
+++ b/src/htm/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.17626
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -12,7 +12,7 @@ namespace thememan.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
--- a/src/htm/app.config
+++ b/src/htm/app.config
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
--- a/src/htm/htm.csproj
+++ b/src/htm/htm.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -12,9 +12,8 @@
    <AssemblyName>thememan</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -41,7 +40,6 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>
-    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <PropertyGroup>
    <ApplicationIcon>Resources\htm.ico</ApplicationIcon>
@@ -70,7 +68,6 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <CodeAnalysisIgnoreGeneratedCode>false</CodeAnalysisIgnoreGeneratedCode>
-    <Prefer32Bit>false</Prefer32Bit>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
--- a/src/libenchant_win8/libenchant_win8.vcxproj
+++ b/src/libenchant_win8/libenchant_win8.vcxproj
@@ -19,7 +19,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <Import Project="..\..\win32\hexchat.props" />
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/win32/hexchat.exe.manifest
+++ b/win32/hexchat.exe.manifest
@@ -27,8 +27,6 @@
      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
      <!--This Id value indicates the application supports Windows 8.1 functionality-->
      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-      <!--This Id value indicates the application supports Windows 10 functionality-->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
    </application>
  </compatibility>
 </assembly>
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -74,7 +74,7 @@
 			<ImportLibrary>$(HexChatLib)$(TargetName).lib</ImportLibrary>
 			<ProgramDatabaseFile>$(HexChatPdb)$(TargetName).pdb</ProgramDatabaseFile>
 			<SubSystem>Windows</SubSystem>
-			<GenerateDebugInformation>Debug</GenerateDebugInformation>
+			<GenerateDebugInformation>true</GenerateDebugInformation>
 			<EnableCOMDATFolding>true</EnableCOMDATFolding>
 			<OptimizeReferences>true</OptimizeReferences>
 			<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
--- a/win32/installer/hexchat.iss.tt
+++ b/win32/installer/hexchat.iss.tt
@@ -225,7 +225,7 @@ end;
 /////////////////////////////////////////////////////////////////////
 function CheckVCInstall(): Boolean;
 begin
-	Result := FileExists(GetSysDir() + 'vcruntime140.dll');;
+	Result := FileExists(GetSysDir() + 'msvcr120.dll');;
 end;

 /////////////////////////////////////////////////////////////////////
@@ -268,12 +268,12 @@ begin
 	begin

 #if APPARCH == "x64"
-		REDIST := 'https://dl.hexchat.net/misc/vcredist_2015_x64.exe';
+		REDIST := 'https://dl.hexchat.net/misc/vcredist_2013_x64.exe';
 		PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x64.msi';
 		PY2 := 'http://python.org/ftp/python/2.7.8/python-2.7.8.amd64.msi';
 		PY3 := 'http://python.org/ftp/python/3.4.1/python-3.4.1.amd64.msi';
 #else
-		REDIST := 'https://dl.hexchat.net/misc/vcredist_2015_x86.exe';
+		REDIST := 'https://dl.hexchat.net/misc/vcredist_2013_x86.exe';
 		PERL := 'https://dl.hexchat.net/misc/perl/Perl%205.20.0%20x86.msi';
 		PY2 := 'http://python.org/ftp/python/2.7.8/python-2.7.8.msi';
 		PY3 := 'http://python.org/ftp/python/3.4.1/python-3.4.1.msi';
--- a/win32/installer/installer.vcxproj
+++ b/win32/installer/installer.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
--- a/win32/nls/nls.vcxproj
+++ b/win32/nls/nls.vcxproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
Author	SHA1	Message	Date
TingPing	8ff5b53525	Fixup	2015-04-08 06:27:07 -04:00
TingPing	77141cb080	Fixup	2015-04-07 20:08:42 -04:00
TingPing	cff0b31fb9	Fixup	2015-04-07 10:46:43 -04:00
TingPing	d1bddc468e	plugin: Migrate pluginpref to GKeyFile This removes the fixed length on all settings and cleans up a lot of code. The fixed buffer functions have been deprecated but still function.	2015-04-07 10:20:46 -04:00