Add support for rfc3454 casemapping

Obviously this has less than ideal performance but it should at least be correct
2016-02-25 15:44:42 -05:00
235 changed files with 64187 additions and 67095 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,19 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-[*.{c,cpp,h,hpp,m}]
-indent_style = tab
-indent_size = 4
-end_of_line = lf
-
-[*.cs]
-indent_style = space
-indent_size = 4
-end_of_line = lf
-
-[{meson.build,meson_options.txt}]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,79 @@
-/build
+# git ignore file
+# Unix generated files
+.deps/
+.libs/
+.dirstamp
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+ar-lib
+confdefs.h
+conftest
+conftest.c
+conftest.err
+config.guess
+config.h.in
+config.h.in~
+config.h
+config.log
+config.status
+config.sub
+config-win32.h
+configure
+configure.tmp
+depcomp
 doxygen*.tmp
 html/
+install-sh
+intl/
+libtool
+ltmain.sh
+m4/
+missing
+plugins/perl/irc.pm.h
+plugins/perl/xchat.pm.h
+plugins/perl/hexchat.pm.h
+po/Makefile.in.in
+po/POTFILES
+po/remove-potcdate.sed
+po/stamp-*
+osx/Info.plist
+data/man/hexchat.1
+data/pkgconfig/hexchat-plugin.pc
+data/misc/hexchat.appdata.xml
+data/misc/hexchat.desktop
+data/misc/htm.desktop
+src/common/dbus/example
+src/common/dbus/org.hexchat.service.service
+src/common/dbus/remote-object-glue.h
+src/common/make-te
+src/common/marshal.*
+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
+src/htm/thememan.exe.config
+src/htm/thememan.exe.mdb
+src/htm/thememan
+stamp-h1
+*.a
+*.o
+*.la
+*.lo
+*.gmo
+*.mo
+*.po~
+*.pot
 *.patch
 tags
+src/**/*.plist
 # Win32 generated files
 plugins/wmpa/wmpa_h.h
 plugins/wmpa/wmpa_i.c
@@ -19,10 +90,9 @@ resource.h
 *.suo
 *.user
 *.exe
-# OSX
+#OSX
 osx/HexChat.app
 osx/.HexChat.app
+po/.intltool-merge-cache
 *.zip
 *.dmg
-*.VC.db
-*.VC.opendb
--- a/.mailmap
+++ b/.mailmap
@@ -1,10 +0,0 @@
-Berke Viktor <github.bviktor@outlook.com> <berkeviktor@aol.com>
-Berke Viktor <github.bviktor@outlook.com> <bviktor@hexchat.org>
-Berke Viktor <github.bviktor@outlook.com> <bviktor@outlook.com>
-Berke Viktor <github.bviktor@outlook.com> berkeviktor@aol.com
-Patrick Griffis <tingping@tingping.se> TingPing <tingping@fedoraproject.org>
-Patrick Griffis <tingping@tingping.se> TingPing <tingping@tingping.se>
-Patrick Griffis <tingping@tingping.se> TingPing <tngpng@gmail.com>
-Patrick Griffis <tingping@tingping.se> TingPing <TingPing@users.noreply.github.com>
-Arnav Singh <arnavion@gmail.com> Arnavion
-Eustachy Kapusta <Eustachy.kapusta@gmail.com> tomek
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,10 @@
-sudo: required
-services: docker
-before_install:
-    - docker pull ubuntu:16.04
-    - docker run --privileged --cidfile=/tmp/cid ubuntu:16.04 /bin/sh -c 'apt-get update && apt-get install -y meson/xenial-backports libcanberra-dev libdbus-glib-1-dev libglib2.0-dev libgtk2.0-dev libluajit-5.1-dev libnotify-dev libpci-dev libperl-dev libproxy-dev libssl-dev python3-dev mono-devel desktop-file-utils'
-    - docker commit `cat /tmp/cid` hexchat/ubuntu-ci
-    - rm -f /tmp/cid
-install:
-    - docker run -d --privileged --cidfile=/tmp/cid --volume=${PWD}:/opt/hexchat hexchat/ubuntu-ci /bin/systemd --system
+sudo: false
+language: c
+cache: apt
+compiler: clang
 script:
-    - docker exec `cat /tmp/cid` /bin/sh -c 'meson /opt/hexchat /opt/hexchat-build -Dwith-text=true -Dwith-theme-manager=true && ninja -C /opt/hexchat-build install'
-after_script:
-    - docker kill `cat /tmp/cid`
+    - ./autogen.sh --enable-textfe --with-theme-manager --enable-static-analysis
+    - make V=1 -j$(nproc)
 notifications:
    irc:
        channels: "chat.freenode.net#hexchat-devel"
@@ -18,3 +12,23 @@ 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
@@ -0,0 +1,7 @@
+## Process this file with automake to produce Makefile.in
+
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = po src plugins data
+
+EXTRA_DIST = autogen.sh Doxyfile readme.md
--- a/autogen.sh
+++ b/autogen.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+(test -f $srcdir/src/common/hexchat.c) || {
+	echo -n "**Error**: Directory "\`$srcdir\'" does not look like the top-level 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
+
+if [ "$NOCONFIGURE" = "" ]; then
+        $srcdir/configure "$@" || exit 1
+
+        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
@@ -0,0 +1,749 @@
+dnl Process this file with autoconf to produce a configure script.
+
+AC_INIT([HexChat],[2.11.0])
+
+AC_PREREQ([2.64])
+AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
+
+AC_CONFIG_HEADERS([config.h])
+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_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])
+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])
+AC_PATH_PROG(MDTOOL, mdtool, no)
+PKG_PROG_PKG_CONFIG
+
+dnl -----------------------------------------------------------
+dnl Language Support
+dnl -----------------------------------------------------------
+GETTEXT_PACKAGE=hexchat
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
+IT_PROG_INTLTOOL([0.40.0])
+AM_GLIB_GNU_GETTEXT
+
+dnl displaced from acconfig.h
+AH_VERBATIM([OLD_PERL],[#undef OLD_PERL])
+AH_VERBATIM([PREFIX],[#undef PREFIX])
+AH_VERBATIM([HEXCHATLIBDIR],[#undef HEXCHATLIBDIR])
+AH_VERBATIM([HEXCHATSHAREDIR],[#undef HEXCHATSHAREDIR])
+AH_VERBATIM([USE_LIBPROXY],[#undef USE_LIBPROXY])
+AH_VERBATIM([HAVE_LIBPCI],[#undef HAVE_LIBPCI])
+AH_VERBATIM([HAVE_ISO_CODES],[#undef HAVE_ISO_CODES])
+AH_VERBATIM([HAVE_GTK_MAC],[#undef HAVE_GTK_MAC])
+AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY])
+AH_VERBATIM([USE_LIBCANBERRA],[#undef USE_LIBCANBERRA])
+AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL])
+AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN])
+AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION])
+AH_VERBATIM([USING_FREEBSD],[#undef USING_FREEBSD])
+AH_VERBATIM([USING_LINUX],[#undef USING_LINUX])
+AH_VERBATIM([socklen_t],[#undef socklen_t])
+AH_VERBATIM([USE_DBUS],[#undef USE_DBUS])
+
+AC_PATH_PROG(sedpath, sed)
+AS_IF([test "_$sedpath" = _], [
+	AC_MSG_ERROR(Cannot find sed: I need it!)
+])
+
+AC_PATH_PROG(unamepath, uname)
+AS_IF([test "_$unamepath" = _], [
+	system="unknown"
+], [
+	AC_MSG_CHECKING(system type)
+	system=`$unamepath -s`
+	AC_MSG_RESULT($system)
+	AS_IF([test "$system" = "Linux"], [
+		AC_DEFINE(USING_LINUX)
+	], [test "$system" = "FreeBSD"], [
+		AC_DEFINE(USING_FREEBSD)
+	])
+])
+
+platform_win32=no
+platform_osx=no
+AS_CASE([$host_os],
+	[*mingw*|*cygwin*|*msys*], [
+		platform_win32=yes
+	],
+	[darwin*], [
+		platform_osx=yes
+	]
+)
+
+dnl *********************************************************************
+dnl ** configure switches ***********************************************
+dnl *********************************************************************
+
+AC_ARG_ENABLE(openssl,
+	[AS_HELP_STRING([--enable-openssl[=PATH]],[enable use of openSSL])],
+        openssl=$enableval, openssl=yes)
+
+AC_ARG_ENABLE(gtkfe,
+	[AS_HELP_STRING([--disable-gtkfe],[disable building gtk frontend])],
+        gtkfe=$enableval, gtkfe=yes)
+
+AC_ARG_ENABLE(textfe,
+	[AS_HELP_STRING([--enable-textfe],[build the text frontend (default: no)])],
+        textfe=$enableval, textfe=no)
+
+AC_ARG_ENABLE(python,
+	[AS_HELP_STRING([--enable-python=pythonversion],[build the python plugin; possible values: "python2", "python3" or specific such as "python3.3" (default on, python2)])],
+        python=$enableval, python=python2)
+AS_IF([test "x$python" = "xyes"], [python=python2])
+
+AC_ARG_ENABLE(perl,
+	[AS_HELP_STRING([--disable-perl],[don\'t build the perl plugin])],
+        perl=$enableval, perl=yes)
+
+AC_ARG_ENABLE(perl_old,
+	[AS_HELP_STRING([--disable-perl_old],[no backwards compatibility for perl plugin])],
+        perl_old=$enableval, perl_old=yes)
+
+AC_ARG_ENABLE(plugin,
+	[AS_HELP_STRING([--disable-plugin],[disable plugin support])],
+        plugin=$enableval, plugin=yes)
+
+AC_ARG_ENABLE(checksum,
+	[AS_HELP_STRING([--disable-checksum],[disable the Checksum plugin])],
+        checksum=$enableval, checksum=yes)
+
+AC_ARG_ENABLE(doat,
+	[AS_HELP_STRING([--disable-doat],[disable the Do At plugin])],
+        doat=$enableval, doat=yes)
+
+AC_ARG_ENABLE(fishlim,
+	[AS_HELP_STRING([--disable-fishlim],[disable the FiSHLiM plugin])],
+        fishlim=$enableval, fishlim=yes)
+
+AC_ARG_ENABLE(sysinfo,
+	[AS_HELP_STRING([--disable-sysinfo],[disable the SysInfo plugin])],
+        sysinfo=$enableval, sysinfo=yes)
+
+AC_ARG_ENABLE(dbus,
+	[AS_HELP_STRING([--disable-dbus],[disable DBUS support])],
+        dbus=$enableval, dbus=yes)
+
+AC_ARG_ENABLE(libnotify,
+	[AS_HELP_STRING([--disable-libnotify],[disable libnotify support])],
+        libnotify=$enableval, libnotify=yes)
+
+AC_ARG_ENABLE(libcanberra,
+	[AS_HELP_STRING([--disable-libcanberra],[disable libcanberra support])],
+		libcanberra=$enableval, libcanberra=yes)
+
+AC_ARG_ENABLE(libproxy,
+	[AS_HELP_STRING([--disable-libproxy],[disable libproxy support (default: auto)])],
+        libproxy=$enableval, libproxy=auto)
+
+AC_ARG_ENABLE(isocodes,
+	[AS_HELP_STRING([--disable-isocodes],[disable iso-codes with spell-check])],
+        isocodes=$enableval, isocodes=yes)
+
+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)
+
+AC_ARG_WITH(theme-manager,
+	[AS_HELP_STRING([--with-theme-manager],[compile theme manager (needs monodevelop, default: off)])],
+		theme_manager=$withval, theme_manager=no)
+
+
+
+dnl *********************************************************************
+dnl ** THEME-MANAGER ****************************************************
+dnl *********************************************************************
+AS_IF([test "x$theme_manager" != "xno"], [
+	AS_IF([test "x$MDTOOL" = "xno"], [
+		AC_MSG_ERROR([No "mdtool" found, you need to install monodevelop!])
+	])
+])
+
+
+dnl *********************************************************************
+dnl ** GLIB *************************************************************
+dnl *********************************************************************
+
+AM_PATH_GLIB_2_0([2.32.0], [], [AC_MSG_ERROR([Glib not found!])], [gmodule gobject gio])
+COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+COMMON_LIBS="$GLIB_LIBS"
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32], [Dont warn using older APIs])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32], [Prevents using newer APIs])
+
+dnl *********************************************************************
+dnl ** GTK **************************************************************
+dnl *********************************************************************
+
+AS_IF([test "$gtkfe" = yes], [
+	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
+	])
+])
+
+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)
+	])
+])
+
+dnl *********************************************************************
+dnl ** PERL *************************************************************
+dnl *********************************************************************
+
+AS_IF([test "$perl" = yes], [
+	AC_MSG_CHECKING(for plugin interface used by Perl)
+	AS_IF([test "$plugin" = yes], [
+		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])
+			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])
+			])
+		])
+	], [
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Perl])
+		perl=no
+	])
+])
+
+dnl *********************************************************************
+dnl ** PYTHON ***********************************************************
+dnl *********************************************************************
+
+AS_IF([test "x$python" != xno], [
+	AC_MSG_CHECKING(for plugin interface used by Python)
+	AS_IF([test "$plugin" = yes], [
+		AC_MSG_RESULT([yes])
+		AS_CASE([$python],
+			dnl set python2 default here
+			[python2], [
+				PYTHON_VERSION=2
+				AX_PYTHON_DEVEL([>= '2.7'])
+			],
+			dnl set python3 default here
+			[python3], [
+				PYTHON_VERSION=3
+				AX_PYTHON_DEVEL([>= '3.3'])
+			],
+			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()
+			],[
+				AC_MSG_WARN(Unsupported Python ${python}!)
+			]
+		)
+		AC_MSG_CHECKING(Python version)
+
+		AS_IF([test "$ac_python_version" != ""], [
+			AC_MSG_RESULT($ac_python_version)
+			python="python-${ac_python_version}"
+		], [
+			AC_MSG_RESULT(Not found)
+			python=no
+		])
+	], [
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Python])
+		python=no
+	])
+])
+
+dnl *********************************************************************
+dnl ** IPv6 *************************************************************
+dnl *********************************************************************
+
+dnl purely for Solaris
+AC_CHECK_FUNC(select, ,
+	AC_CHECK_LIB(socket, select, ,
+		AC_CHECK_LIB(nsl, select, ,
+			AC_CHECK_LIB(inet, select, ,
+				AC_CHECK_LIB(cposix, select, ,
+					AC_CHECK_LIB(net, select, ,
+						AC_MSG_WARN(i can not find select.  you might need to help me)))))))
+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], [
+	AC_MSG_RESULT(yes)
+], [
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR(ipv6 support not found!)
+])
+
+dnl *********************************************************************
+dnl ** OPENSSL **********************************************************
+dnl *********************************************************************
+
+
+AS_IF([test "$openssl" != no], [
+	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
+	])
+])
+
+dnl *********************************************************************
+dnl ** LIBPROXY *********************************************************
+dnl *********************************************************************
+
+AS_IF([test "x$libproxy" = "xyes" -o "x$libproxy" = "xauto"], [
+	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"], [
+			AC_MSG_ERROR(Cannot find libproxy!)
+		])
+		libproxy=no
+	])
+], [
+	libproxy=no
+])
+
+dnl *********************************************************************
+dnl ** PLUGIN ***********************************************************
+dnl *********************************************************************
+
+AS_IF([test "$plugin" = yes], [
+	AC_DEFINE(USE_PLUGIN)
+	PLUGIN_LDFLAGS="-avoid-version"
+	AS_IF([test "$platform_win32" = yes], [
+		PLUGIN_LDFLAGS="$PLUGIN_LDFLAGS -no-undefined"
+	])
+])
+
+dnl *********************************************************************
+dnl ** Checksum *********************************************************
+dnl *********************************************************************
+
+AS_IF([test "$checksum" != "no"], [
+	checksum=no
+	AC_MSG_CHECKING(for plugin interface used by Checksum)
+	AS_IF([test "$plugin" = yes], [
+		checksum=yes
+		AC_MSG_RESULT([yes])
+	], [
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option])
+	])
+])
+
+dnl *********************************************************************
+dnl ** DO AT ************************************************************
+dnl *********************************************************************
+
+AS_IF([test "$doat" != "no"], [
+	AC_MSG_CHECKING(for plugin interface used by Do At)
+	doat=no
+	AS_IF([test "$plugin" = yes], [
+		doat=yes
+		AC_MSG_RESULT([yes])
+	], [
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Do At])
+	])
+])
+
+dnl *********************************************************************
+dnl ** FiSHLiM **********************************************************
+dnl *********************************************************************
+
+AS_IF([test "$fishlim" != "no"], [
+	fishlim=no
+	AC_MSG_CHECKING(for plugin interface used by FiSHLiM)
+	AS_IF([test "$plugin" = yes], [
+		AC_MSG_RESULT([yes])
+		AC_MSG_CHECKING(for OpenSSL used by FiSHLiM)
+		AS_IF([test "$openssl" = yes], [
+			fishlim=yes
+			AC_MSG_RESULT([yes])
+		], [
+			AC_MSG_RESULT([OpenSSL cannot be found, use the --enable-openssl option])
+		])
+	], [
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option])
+	])
+])
+
+dnl *********************************************************************
+dnl ** SYSINFO **********************************************************
+dnl *********************************************************************
+
+AS_IF([test "$sysinfo" != "no"], [
+	AC_MSG_CHECKING(for plugin interface used by SysInfo)
+	AS_IF([test "$plugin" = yes], [
+		AC_MSG_RESULT([yes])
+		AS_IF([test "$platform_osx" = yes], [
+			sysinfo=yes
+		], [
+			PKG_CHECK_MODULES(LIBPCI, libpci >= 3.0.0, [
+				sysinfo=yes
+				AC_DEFINE(HAVE_LIBPCI)
+			], [sysinfo=no])
+		])
+	], [
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SysInfo])
+		sysinfo=no
+	])
+])
+
+dnl #######################################################################
+dnl # Check for DBUS libraries
+dnl #######################################################################
+
+AS_IF([test "x$dbus" = "xyes"], [
+	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"], [
+		dbus="no"
+	], [
+		COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS"
+		COMMON_CFLAGS="$COMMON_CFLAGS $DBUS_CFLAGS"
+		AC_DEFINE(USE_DBUS)
+
+		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])
+	])
+])
+
+dnl *********************************************************************
+dnl ** LIBNOTIFY ********************************************************
+dnl *********************************************************************
+
+AS_IF([test "x$libnotify" = "xyes"], [
+	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.4, [], [
+		libnotify=no
+	])
+	AS_IF([test "$libnotify" != "no"], [
+		GUI_LIBS="$GUI_LIBS $LIBNOTIFY_LIBS"
+		GUI_CFLAGS="$GUI_CFLAGS $LIBNOTIFY_CFLAGS"
+		AC_DEFINE(USE_LIBNOTIFY)
+	])
+])
+
+dnl *********************************************************************
+dnl ** LIBCANBERRA ******************************************************
+dnl *********************************************************************
+
+AS_IF([test "x$libcanberra" = "xyes"], [
+	PKG_CHECK_MODULES(LIBCANBERRA, libcanberra >= 0.22, [], [
+		libcanberra=no
+	])
+	AS_IF([test "$libcanberra" != "no"], [
+		COMMON_LIBS="$COMMON_LIBS $LIBCANBERRA_LIBS"
+		COMMON_CFLAGS="$COMMON_CFLAGS $LIBCANBERRA_CFLAGS"
+		AC_DEFINE(USE_LIBCANBERRA)
+	])
+])
+
+dnl *********************************************************************
+dnl ** SPELL ************************************************************
+dnl *********************************************************************
+
+AS_IF([test "x$isocodes" = "xyes"], [
+	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])
+    	AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX], ["$iso_codes_prefix"], [ISO codes prefix])
+    	AC_DEFINE_UNQUOTED([ISO_CODES_LOCALEDIR], ["$iso_codes_prefix/share/locale"], [ISO codes locale dir])
+    	AC_DEFINE([HAVE_ISO_CODES], [1], [iso-codes available])
+    	], [
+    	isocodes=no
+    	AC_MSG_WARN(iso-codes not found!)
+    ])
+])
+
+dnl *********************************************************************
+dnl ** Static Analysis **************************************************
+dnl *********************************************************************
+
+AS_IF([test "x$analyze" = "xyes"], [
+	AS_IF([test "$CC" != "clang"], [
+		AC_MSG_WARN(CC is not clang for static analysis)
+		analyze=no
+	])
+])
+
+dnl *********************************************************************
+dnl ** CONDITIONALS *****************************************************
+dnl *********************************************************************
+
+AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
+AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
+AM_CONDITIONAL(USE_LIBCANBERRA, test "x$libcanberra" = "xyes")
+AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
+AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
+AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
+AM_CONDITIONAL(DO_PYTHON, test "x$python" != "xno")
+AM_CONDITIONAL(DO_PLUGIN, test "x$plugin" = "xyes")
+AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")
+AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes")
+AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes")
+AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
+AM_CONDITIONAL(DO_STATIC_ANALYSIS, test "x$analyze" = "xyes")
+AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
+AM_CONDITIONAL(HAVE_ISO_CODES, test "x$isocodes" = "xyes")
+AM_CONDITIONAL(HAVE_GTK_MAC, test "x$_gdk_tgt" = xquartz)
+AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno")
+AM_CONDITIONAL(PLATFORM_OSX, test "x$platform_osx" == "xyes")
+
+dnl *********************************************************************
+dnl ** CFLAGS ***********************************************************
+dnl *********************************************************************
+
+CC_CHECK_FLAGS_APPEND([CFLAGS], [CFLAGS], [ \
+	-pipe \
+	-funsigned-char \
+	-Wall \
+	-Wextra \
+	-Wstrict-prototypes \
+	-Wno-unused-parameter \
+	-Wno-sign-compare \
+	-Wno-pointer-sign \
+	-Wno-missing-field-initializers \
+	-Wno-unused-result \
+	-Werror=format-security \
+	-Werror=init-self \
+	-Werror=declaration-after-statement \
+	-Werror=missing-include-dirs \
+	-Werror=date-time \
+	-Werror=implicit-function-declaration \
+	-Werror=pointer-arith \
+])
+
+dnl *********************************************************************
+dnl ** FUNCTIONS/LIBS/CFLAGS ********************************************
+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;
+	 siginfo_t *si;
+	 act.sa_sigaction = 0;]])],[
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(USE_SIGACTION) 
+	],[AC_MSG_RESULT(no)])
+
+AC_CHECK_FUNCS(memrchr)
+
+AC_CHECK_FUNC(gethostbyname, ,
+	AC_CHECK_LIB(resolv, gethostbyname, ,
+		AC_CHECK_LIB(nsl, gethostbyname)))
+
+AC_CHECK_FUNC(gethostname, , AC_CHECK_LIB(nsl, gethostname))
+
+dnl necessary for IRIX
+AC_CHECK_HEADERS(strings.h)
+
+dnl Check for type in sys/socket.h - from Squid source (GPL)
+AC_CACHE_CHECK(for socklen_t, ac_cv_type_socklen_t, [
+AC_EGREP_CPP([socklen_t[^a-zA-Z_0-9]], [#include <sys/types.h>
+#include <sys/socket.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif],
+ac_cv_type_socklen_t=yes,
+ac_cv_type_socklen_t=no)
+])
+AS_IF([test $ac_cv_type_socklen_t = no], [
+	AC_DEFINE(socklen_t, int)
+])
+
+dnl Mac OS X and Darwin use lookupd, which caches DNS queries by default
+AC_EGREP_CPP(lookupd, dnl
+[#if (defined(__APPLE__) && defined(__MACH__))
+	lookupd
+#endif], AC_DEFINE([LOOKUPD],1,[Define to 1 if the system uses lookupd]))
+
+dnl freebsd needs this
+LIBS="$LIBS $INTLLIBS"
+
+GUI_LIBS="$GUI_LIBS $COMMON_LIBS"
+
+dnl make these visible to all Makefiles
+AC_SUBST(GUI_LIBS)
+AC_SUBST(GUI_CFLAGS)
+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(DBUS_CFLAGS)
+AC_SUBST(DBUS_LIBS)
+AC_SUBST(OPENSSL_LIBS)
+AC_SUBST(OPENSSL_CFLAGS)
+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"
+])
+
+AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
+
+AS_AC_EXPAND(HEXCHATLIBDIR, "${libdir}/hexchat/plugins")
+AC_DEFINE_UNQUOTED(HEXCHATLIBDIR, "$HEXCHATLIBDIR")
+
+AS_AC_EXPAND(HEXCHATSHAREDIR, "$datadir")
+AC_DEFINE_UNQUOTED(HEXCHATSHAREDIR, "$HEXCHATSHAREDIR")
+
+dnl for plugins/xxx/Makefile.am
+hexchatlibdir=${libdir}/hexchat/plugins
+AC_SUBST(hexchatlibdir)
+
+AC_CONFIG_FILES([
+Makefile
+data/Makefile
+data/icons/Makefile
+data/misc/Makefile
+data/man/Makefile
+data/man/hexchat.1
+data/pkgconfig/Makefile
+data/pkgconfig/hexchat-plugin.pc
+src/Makefile
+src/common/Makefile
+src/common/dbus/Makefile
+src/fe-text/Makefile
+src/fe-gtk/Makefile
+src/htm/Makefile
+src/htm/thememan
+osx/Info.plist
+plugins/Makefile
+plugins/python/Makefile
+plugins/perl/Makefile
+plugins/checksum/Makefile
+plugins/doat/Makefile
+plugins/fishlim/Makefile
+plugins/sysinfo/Makefile
+po/Makefile.in
+])
+
+AC_OUTPUT
+
+echo
+echo HexChat $VERSION
+echo
+echo GTK+ interface ........ : $gtkfe
+echo Text interface ........ : $textfe
+echo Theme manager ......... : $theme_manager
+echo
+echo OpenSSL support ....... : $openssl
+echo D-Bus support ......... : $dbus
+echo libnotify support ..... : $libnotify
+echo libcanberra support ... : $libcanberra
+echo Plugin interface ...... : $plugin
+echo libproxy support ...... : $libproxy
+echo
+echo Perl .................. : $perl
+echo Python ................ : $python
+echo
+echo Checksum .............. : $checksum
+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
+
+if test "$gtkfe" = no; then
+	echo Warning: The GTK \(GUI\) frontend will not be built.
+	echo
+fi
+
+echo configure complete, now type \'make\' and pray.
+echo
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -0,0 +1,8 @@
+SUBDIRS = pkgconfig man
+
+if DO_GTK
+SUBDIRS += icons misc
+endif
+
+EXTRA_DIST = \
+	hexchat.gresource.xml
--- a/data/hexchat.gresource.xml
+++ b/data/hexchat.gresource.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
 	<gresource prefix="/icons">
-		<file alias="hexchat.png" preprocess="to-pixdata">icons/hexchat.png</file>
-		<file alias="book.png" preprocess="to-pixdata">icons/book.png</file>
+		<file alias="hexchat.png" preprocess="to-pixdata" compressed="true">icons/hexchat.png</file>
+		<file alias="book.png" preprocess="to-pixdata" compressed="true">icons/book.png</file>

-		<file alias="ulist_voice.png" preprocess="to-pixdata">icons/ulist_voice.png</file>
-		<file alias="ulist_halfop.png" preprocess="to-pixdata">icons/ulist_halfop.png</file>
-		<file alias="ulist_op.png" preprocess="to-pixdata">icons/ulist_op.png</file>
-		<file alias="ulist_owner.png" preprocess="to-pixdata">icons/ulist_owner.png</file>
-		<file alias="ulist_founder.png" preprocess="to-pixdata">icons/ulist_founder.png</file>
-		<file alias="ulist_netop.png" preprocess="to-pixdata">icons/ulist_netop.png</file>
+		<file alias="ulist_voice.png" preprocess="to-pixdata" compressed="true">icons/ulist_voice.png</file>
+		<file alias="ulist_halfop.png" preprocess="to-pixdata" compressed="true">icons/ulist_halfop.png</file>
+		<file alias="ulist_op.png" preprocess="to-pixdata" compressed="true">icons/ulist_op.png</file>
+		<file alias="ulist_owner.png" preprocess="to-pixdata" compressed="true">icons/ulist_owner.png</file>
+		<file alias="ulist_founder.png" preprocess="to-pixdata" compressed="true">icons/ulist_founder.png</file>
+		<file alias="ulist_netop.png" preprocess="to-pixdata" compressed="true">icons/ulist_netop.png</file>

-		<file alias="tray_fileoffer.png" preprocess="to-pixdata">icons/tray_fileoffer.png</file>
-		<file alias="tray_highlight.png" preprocess="to-pixdata">icons/tray_highlight.png</file>
-		<file alias="tray_message.png" preprocess="to-pixdata">icons/tray_message.png</file>
+		<file alias="tray_fileoffer.png" preprocess="to-pixdata" compressed="true">icons/tray_fileoffer.png</file>
+		<file alias="tray_highlight.png" preprocess="to-pixdata" compressed="true">icons/tray_highlight.png</file>
+		<file alias="tray_message.png" preprocess="to-pixdata" compressed="true">icons/tray_message.png</file>

 		<file alias="tree_channel.png" preprocess="to-pixdata">icons/tree_channel.png</file>
-		<file alias="tree_dialog.png" preprocess="to-pixdata">icons/tree_dialog.png</file>
-		<file alias="tree_server.png" preprocess="to-pixdata">icons/tree_server.png</file>
-		<file alias="tree_util.png" preprocess="to-pixdata">icons/tree_util.png</file>
+		<file alias="tree_dialog.png" preprocess="to-pixdata" compressed="true">icons/tree_dialog.png</file>
+		<file alias="tree_server.png" preprocess="to-pixdata" compressed="true">icons/tree_server.png</file>
+		<file alias="tree_util.png" preprocess="to-pixdata" compressed="true">icons/tree_util.png</file>
 	</gresource>
 </gresources>
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -0,0 +1,15 @@
+icon_DATA = hexchat.png
+icondir = $(datadir)/icons/hicolor/48x48/apps
+
+hicolor_DATA = hexchat.svg
+hicolordir = $(datadir)/icons/hicolor/scalable/apps
+
+UPDATE_ICON_CACHE = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor || :
+
+install-data-hook:
+	$(UPDATE_ICON_CACHE);
+
+uninstall-hook:
+	$(UPDATE_ICON_CACHE);
+
+EXTRA_DIST = $(icon_DATA) $(hicolor_DATA)
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,9 +0,0 @@
-icondir = join_paths(get_option('datadir'), 'icons/hicolor')
-install_data(
-  'hexchat.png',
-  install_dir: join_paths(icondir, '48x48/apps')
-)
-install_data(
-  'hexchat.svg',
-  install_dir: join_paths(icondir, 'scalable/apps')
-)
--- a/data/man/Makefile.am
+++ b/data/man/Makefile.am
@@ -0,0 +1,3 @@
+man_MANS = hexchat.1
+
+EXTRA_DIST = hexchat.1.in
--- a/data/man/meson.build
+++ b/data/man/meson.build
@@ -1,10 +0,0 @@
-man_conf = configuration_data()
-man_conf.set('VERSION', meson.project_version())
-
-configure_file(
-  input: 'hexchat.1.in',
-  output: 'hexchat.1',
-  configuration: man_conf,
-  install: true,
-  install_dir: join_paths(get_option('mandir'), 'man1')
-)
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,11 +0,0 @@
-if get_option('with-plugin')
-  subdir('pkgconfig')
-endif
-
-if get_option('with-gtk')
-  subdir('icons')
-  subdir('misc')
-  subdir('man')
-elif get_option('with-theme-manager')
-  subdir('misc')
-endif
--- a/data/misc/Makefile.am
+++ b/data/misc/Makefile.am
@@ -0,0 +1,31 @@
+appdata_in_files = hexchat.appdata.xml.in
+appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+appdatadir = $(datadir)/appdata
+@INTLTOOL_XML_RULE@
+
+data_desktopdir = $(datadir)/applications
+data_desktop_in_files = hexchat.desktop.in
+
+if WITH_TM
+data_desktop_in_files += htm.desktop.in
+mime_DATA = htm-mime.xml
+mimedir = $(datadir)/mime/packages
+endif
+
+data_desktop_DATA = $(data_desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
+
+UPDATE_MIME_DATABASE = update-mime-database "$(datadir)/mime" || :
+UPDATE_DESKTOP_DATABASE = update-desktop-database -q "$(datadir)/applications" || :
+
+install-data-hook:
+	$(UPDATE_MIME_DATABASE);
+	$(UPDATE_DESKTOP_DATABASE);
+
+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/data/misc/hexchat.appdata.xml.in
+++ b/data/misc/hexchat.appdata.xml.in
@@ -1,56 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop">
-  <id>hexchat.desktop</id>
-  <name>HexChat</name>
-  <developer_name>HexChat</developer_name>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0+</project_license>
-  <translation type="gettext">hexchat</translation>
-  <summary>IRC Client</summary>
-  <description>
-    <p>HexChat is an easy to use yet extensible IRC Client. It allows you to securely join multiple networks and talk to users privately or in channels using a customizable interface. You can even transfer files.</p>
-    <p>HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts.</p>
-  </description>
-  <url type="homepage">http://hexchat.github.io</url>
-  <url type="bugtracker">https://github.com/hexchat/hexchat</url>
-  <url type="translate">https://www.transifex.com/hexchat/hexchat</url>
-  <url type="donation">https://goo.gl/jESZvU</url>
-  <url type="help">https://hexchat.readthedocs.io/en/latest/</url>
-  <screenshots>
-    <screenshot type="default">
-      <image>http://i.imgur.com/tLMguQz.png</image>
-      <caption>Main Chat Window</caption>
-    </screenshot>
-  </screenshots>
-  <releases>
-    <release date="2016-12-10" version="2.12.4">
-      <description>
-        <p>This is another bug fix release:</p>
-        <ul>
-          <li>Fix issue with timers causing ping timeouts</li>
-          <li>Fix building against OpenSSL 1.1</li>
-          <li>Fix /exec output printing invalid utf8</li>
-          <li>Replace doat plugin with an internal command</li>
-          <li>Change how tab colors interact with plugins</li>
-          <li>Enable filtering the beep character by default</li>
-        </ul>
-      </description>
-    </release>
-    <release date="2016-10-22" version="2.12.3">
-      <description>
-        <p>This is a minor bug fix release just cleaning up a few issues:</p>
-        <ul>
-          <li>Fix crash with bad translations</li>
-          <li>Add new mhop command</li>
-          <li>Change ping timeout to 60 by default</li>
-        </ul>
-      </description>
-    </release>
-  </releases>
-  <kudos>
-    <kudo>UserDocs</kudo>
-    <kudo>HiDpiIcon</kudo>
-    <kudo>Notifications</kudo>
-  </kudos>
-  <update_contact>tingping_at_fedoraproject.org</update_contact>
-</component>
+<application>
+	<id type="desktop">hexchat.desktop</id>
+	<licence>CC0</licence>
+	<description>
+		<_p>HexChat is an easy to use yet extensible IRC Client. It allows you to securely join multiple networks and talk to users privately or in channels using a customizable interface. You can even transfer files.</_p>
+		<_p>HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, logging, custom themes, and Python/Perl scripts.</_p>
+	</description>
+	<url type="homepage">http://hexchat.github.io</url>
+	<screenshots>
+		<screenshot type="default">http://i.imgur.com/XBbQKXf.png</screenshot>
+	</screenshots>
+	<updatecontact>tingping_at_fedoraproject.org</updatecontact>
+</application>
+
--- a/data/misc/hexchat.desktop.in.in
+++ b/data/misc/hexchat.desktop.in.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
-Name=HexChat
-GenericName=IRC Client
-Comment=Chat with other people online
-Keywords=IM;Chat;
-Exec=@exec_command@
+_Name=HexChat
+_GenericName=IRC Client
+_Comment=Chat with other people online
+_Keywords=IM;Chat;
+Exec=hexchat %U
 Icon=hexchat
 Terminal=false
 Type=Application
@@ -14,5 +14,5 @@ MimeType=x-scheme-handler/irc;x-scheme-handler/ircs;
 Actions=SafeMode;

 [Desktop Action SafeMode]
-Name=Open Safe Mode
+_Name=Open Safe Mode
 Exec=hexchat --no-auto --no-plugins
--- a/data/misc/htm.desktop.in
+++ b/data/misc/htm.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=HexChat Theme Manager
+_Name=HexChat Theme Manager
 Exec=thememan %f
 Icon=hexchat
 Terminal=false
--- a/data/misc/meson.build
+++ b/data/misc/meson.build
@@ -1,68 +0,0 @@
-appdir = join_paths(get_option('datadir'), 'applications')
-desktop_utils = find_program('desktop-file-validate', required: false)
-
-if get_option('with-gtk')
-  hexchat_appdata = i18n.merge_file(
-    input: 'hexchat.appdata.xml.in',
-    output: 'hexchat.appdata.xml',
-    po_dir: '../../po',
-    install: true,
-    install_dir: join_paths(get_option('datadir'), 'appdata')
-  )
-
-  appstream_util = find_program('appstream-util', required: false)
-  if appstream_util.found()
-    test('Validate hexchat.appdata.xml', appstream_util,
-      args: ['validate', hexchat_appdata]
-    )
-  endif
-
-  desktop_conf = configuration_data()
-  if get_option('with-dbus')
-    desktop_conf.set('exec_command', 'hexchat --existing %U')
-  else
-    desktop_conf.set('exec_command', 'hexchat %U')
-  endif
-
-  desktop_file = configure_file(
-    input: 'hexchat.desktop.in.in',
-    output: 'hexchat.desktop.in',
-    configuration: desktop_conf
-  )
-
-  hexchat_desktop = i18n.merge_file(
-    input: desktop_file,
-    output: 'hexchat.desktop',
-    po_dir: '../../po',
-    type: 'desktop',
-    install: true,
-    install_dir: appdir
-  )
-
-  if desktop_utils.found()
-    test('Validate hexchat.desktop', desktop_utils,
-      args: [hexchat_desktop]
-    )
-  endif
-endif
-
-if get_option('with-theme-manager')
-  htm_desktop = i18n.merge_file(
-    input: 'htm.desktop.in',
-    output: 'htm.desktop',
-    po_dir: '../../po',
-    type: 'desktop',
-    install: true,
-    install_dir: appdir
-  )
-
-  if desktop_utils.found()
-    test('Validate htm.desktop', desktop_utils,
-      args: [htm_desktop]
-    )
-  endif
-
-  install_data('htm-mime.xml',
-    install_dir: join_paths(get_option('datadir'), 'mime/packages')
-  )
-endif
--- a/data/pkgconfig/Makefile.am
+++ b/data/pkgconfig/Makefile.am
@@ -0,0 +1,4 @@
+pkgcfgdir = $(pkgconfigdir)
+pkgcfg_DATA = hexchat-plugin.pc
+
+EXTRA_DIST = hexchat-plugin.pc.in
--- a/data/pkgconfig/meson.build
+++ b/data/pkgconfig/meson.build
@@ -1,14 +0,0 @@
-pkg_conf = configuration_data()
-prefix = get_option('prefix')
-pkg_conf.set('prefix', prefix)
-pkg_conf.set('VERSION', meson.project_version())
-pkg_conf.set('hexchatlibdir', join_paths(prefix, plugindir))
-pkg_conf.set('includedir', join_paths(prefix, get_option('includedir')))
-
-configure_file(
-  input: 'hexchat-plugin.pc.in',
-  output: 'hexchat-plugin.pc',
-  configuration: pkg_conf,
-  install: true,
-  install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
-)
--- a/fedora-mingw64.ini
+++ b/fedora-mingw64.ini
@@ -1,17 +0,0 @@
-; dnf install mingw64-{gtk,openssl}
-
-[binaries]
-c = '/usr/bin/x86_64-w64-mingw32-gcc'
-cpp = '/usr/bin/x86_64-w64-mingw32-g++'
-ar = '/usr/bin/x86_64-w64-mingw32-gcc-ar'
-strip = '/usr/bin/x86_64-w64-mingw32-strip'
-pkgconfig = '/usr/bin/x86_64-w64-mingw32-pkg-config'
-
-[properties]
-c_args = ['-DNTDDI_VERSION=NTDDI_WIN7', '-D_WIN32_WINNT=_WIN32_WINNT_WIN7']
-
-[host_machine]
-system = 'windows'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
--- a/m4/ac-check-cflags.m4
+++ b/m4/ac-check-cflags.m4
@@ -0,0 +1,60 @@
+dnl Macros to check the presence of generic (non-typed) symbols.
+dnl Copyright (c) 2006-2008 Diego Pettenò <flameeyes@gmail.com>
+dnl Copyright (c) 2006-2008 xine project
+dnl Copyright (c) 2012 Lucas De Marchi <lucas.de.marchi@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+dnl 02110-1301, USA.
+dnl
+dnl As a special exception, the copyright owners of the
+dnl macro gives unlimited permission to copy, distribute and modify the
+dnl configure scripts that are the output of Autoconf when processing the
+dnl Macro. You need not follow the terms of the GNU General Public
+dnl License when using or distributing such scripts, even though portions
+dnl of the text of the Macro appear in them. The GNU General Public
+dnl License (GPL) does govern all other use of the material that
+dnl constitutes the Autoconf Macro.
+dnl
+dnl This special exception to the GPL applies to versions of the
+dnl Autoconf Macro released by this project. When you make and
+dnl distribute a modified version of the Autoconf Macro, you may extend
+dnl this special exception to the GPL to apply to your modified version as
+dnl well.
+
+dnl Check if FLAG in ENV-VAR is supported by compiler and append it
+dnl to WHERE-TO-APPEND variable
+dnl CC_CHECK_FLAG_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG])
+
+AC_DEFUN([CC_CHECK_FLAG_APPEND], [
+  AC_CACHE_CHECK([if $CC supports flag $3 in envvar $2],
+                 AS_TR_SH([cc_cv_$2_$3]),
+		 [eval "AS_TR_SH([cc_save_$2])='${$2}'"
+		  eval "AS_TR_SH([$2])='$3'"
+		  AC_COMPILE_IFELSE([AC_LANG_SOURCE([int a = 0; int main(void) { return a; } ])],
+                                    [eval "AS_TR_SH([cc_cv_$2_$3])='yes'"],
+                                    [eval "AS_TR_SH([cc_cv_$2_$3])='no'"])
+		  eval "AS_TR_SH([$2])='$cc_save_$2'"])
+
+  AS_IF([eval test x$]AS_TR_SH([cc_cv_$2_$3])[ = xyes],
+        [eval "$1='${$1} $3'"])
+])
+
+dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2])
+AC_DEFUN([CC_CHECK_FLAGS_APPEND], [
+  for flag in $3; do
+    CC_CHECK_FLAG_APPEND($1, $2, $flag)
+  done
+])
+
--- a/m4/as-ac-expand.m4
+++ b/m4/as-ac-expand.m4
@@ -0,0 +1,40 @@
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+dnl
+dnl example
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix=$ac_default_prefix
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
--- a/m4/ax_check_enable_debug.m4
+++ b/m4/ax_check_enable_debug.m4
@@ -0,0 +1,124 @@
+# ===========================================================================
+#   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
@@ -0,0 +1,69 @@
+# ===========================================================================
+#       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
@@ -0,0 +1,116 @@
+# ===========================================================================
+#     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
@@ -0,0 +1,327 @@
+# ===========================================================================
+#      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
@@ -0,0 +1,37 @@
+# ===========================================================================
+#    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/m4/clang-analyze.am
+++ b/m4/clang-analyze.am
@@ -0,0 +1,8 @@
+analysis_verbose = $(analysis_verbose_$(V))
+analysis_verbose_ = $(analysis_verbose_$(AM_DEFAULT_VERBOSITY))
+analysis_verbose_0 = @echo "  CCSA    " $@; $(COMPILE) --analyze $< -o $@;
+analysis_verbose_1 = $(COMPILE) --analyze $< -o $@;
+
+%.plist: %.c
+	$(analysis_verbose)
+
--- a/meson.build
+++ b/meson.build
@@ -1,138 +0,0 @@
-project('hexchat', 'c',
-  version: '2.12.4',
-  meson_version: '>= 0.37.0',
-  default_options: [
-    'c_std=gnu89',
-    'buildtype=debugoptimized',
-    'warning_level=1',
-  ]
-)
-
-i18n = import('i18n')
-gnome = import('gnome')
-cc = meson.get_compiler('c')
-
-
-libgio_dep = dependency('gio-2.0', version: '>= 2.34.0')
-libgmodule_dep = dependency('gmodule-2.0')
-if cc.get_id() == 'msvc'
-  libssl_dep = cc.find_library('libeay32')
-else
-  libssl_dep = dependency('openssl', version: '>= 0.9.8',
-                          required: get_option('with-ssl'))
-endif
-
-config_h = configuration_data()
-config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
-config_h.set_quoted('PACKAGE_NAME', meson.project_name())
-config_h.set_quoted('GETTEXT_PACKAGE', 'hexchat')
-config_h.set_quoted('LOCALEDIR', join_paths(get_option('prefix'),
-                                 get_option('datadir'), 'locale'))
-config_h.set10('ENABLE_NLS', true)
-
-# Optional features
-config_h.set('USE_OPENSSL', get_option('with-ssl'))
-config_h.set('USE_LIBPROXY', get_option('with-libproxy'))
-config_h.set('USE_LIBCANBERRA', get_option('with-libcanberra'))
-config_h.set('USE_DBUS', get_option('with-dbus'))
-config_h.set('USE_PLUGIN', get_option('with-plugin'))
-
-config_h.set('G_DISABLE_SINGLE_INCLUDES', true)
-config_h.set('GTK_DISABLE_DEPRECATED', true)
-config_h.set('GTK_DISABLE_SINGLE_INCLUDES', true)
-config_h.set('GDK_PIXBUF_DISABLE_SINGLE_INCLUDES', true)
-config_h.set('GLIB_VERSION_MAX_ALLOWED', 'GLIB_VERSION_2_34')
-config_h.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_34')
-
-# Detected features
-config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr'))
-config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h'))
-
-if libssl_dep.found()
-  config_h.set('HAVE_X509_GET_SIGNATURE_NID',
-    cc.has_function('X509_get_signature_nid', dependencies: libssl_dep)
-  )
-  config_h.set('HAVE_SSL_CTX_GET_SSL_METHOD',
-    cc.has_function('SSL_CTX_get_ssl_method', dependencies: libssl_dep)
-  )
-  config_h.set('HAVE_DH_SET0_PQG',
-    cc.has_function('DH_set0_pqg', dependencies: libssl_dep)
-  )
-  config_h.set('HAVE_DH_GET0_KEY',
-    cc.has_function('DH_get0_key', dependencies: libssl_dep)
-  )
-  config_h.set('HAVE_DH_SET0_KEY',
-    cc.has_function('DH_set0_key', dependencies: libssl_dep)
-  )
-  config_h.set('HAVE_ERR_REMOVE_THREAD_STATE',
-    cc.has_function('ERR_remove_thread_state', dependencies: libssl_dep)
-  )
-  config_h.set('HAVE_ASN1_STRING_GET0_DATA',
-    cc.has_function('ASN1_STRING_get0_data', dependencies: libssl_dep)
-  )
-endif
-
-configure_file(output: 'config.h', configuration: config_h)
-config_h_include = include_directories('.')
-
-global_cflags = []
-test_cflags = [
-  '-pipe',
-  '-funsigned-char',
-  '-Wno-conversion',
-  '-Wno-pointer-sign',
-  '-Wno-padded',
-  '-Wno-unused-parameter',
-  '-Wno-missing-prototypes',
-  '-Winline',
-  '-Wstrict-prototypes',
-  '-Werror=implicit-function-declaration',
-  '-Werror=pointer-arith',
-  '-Werror=init-self',
-  ['-Werror=format-security', '-Werror=format=1'],
-  '-Werror=missing-include-dirs',
-  '-Werror=date-time',
-]
-foreach cflag : test_cflags
-  if cc.has_multi_arguments(cflag)
-    global_cflags += cflag
-  endif
-endforeach
-if get_option('buildtype') != 'plain'
-  if cc.has_argument('-fstack-protector-strong') and cc.links('''
-     int main (void) {
-       char buffer[16];
-       strcpy(buffer, "foo");
-       return 0;
-     }
-     ''', args: '-fstack-protector-all')
-    global_cflags += '-fstack-protector-strong'
-  endif
-endif
-add_project_arguments(global_cflags, language: 'c')
-
-
-global_ldflags = []
-test_ldflags = [
-  '-Wl,-z,relro',
-  '-Wl,-z,now',
-]
-foreach ldflag : test_ldflags
-  if cc.has_argument(ldflag) and cc.links('int main (void) { return 0; }', args: ldflag)
-    global_ldflags += ldflag
-  endif
-endforeach
-add_project_link_arguments(global_ldflags, language: 'c')
-
-subdir('src')
-if get_option('with-plugin')
-  subdir('plugins')
-endif
-if cc.get_id() != 'msvc'
-  subdir('data')
-  subdir('po') # FIXME: build xgettext
-
-  meson.add_install_script('meson_post_install.py',
-    '@0@'.format(get_option('with-theme-manager'))
-  )
-endif
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,56 +0,0 @@
-option('with-gtk', type: 'boolean',
-  description: 'Main graphical interface'
-)
-option('with-text', type: 'boolean', value: false,
-  description: 'Text interface (not generally useful)'
-)
-option('with-ssl', type: 'boolean',
-  description: 'Support for TLS connections, requires openssl'
-)
-option('with-plugin', type: 'boolean',
-  description: 'Support for loadable plugins'
-)
-option('with-dbus', type: 'boolean',
-  description: 'Support used for single-instance and scripting interface, Unix only'
-)
-option('with-libproxy', type: 'boolean',
-  description: 'Support for getting proxy information, Unix only'
-)
-option('with-libnotify', type: 'boolean',
-  description: 'Support for freedesktop notifications, Unix only'
-)
-option('with-libcanberra', type: 'boolean',
-  description: 'Support for sound alerts, Unix only'
-)
-option('with-theme-manager', type: 'boolean', value: false,
-  description: 'Utility to help manage themes, requires mono/.net'
-)
-
-# Plugins
-option('with-checksum', type: 'boolean',
-  description: 'DCC checksum plugin'
-)
-option('with-exec', type: 'boolean',
-  description: '/exec plugin, Windows only'
-)
-option('with-fishlim', type: 'boolean',
-  description: 'Fish encryption plugin, requires openssl'
-)
-option('with-lua', type: 'string', value: 'luajit',
-  description: 'Lua scripting plugin, value is pkg-config name to use or "false"'
-)
-option('with-perl', type: 'boolean',
-  description: 'Perl scripting plugin'
-)
-option('with-python', type: 'string', value: 'python3',
-  description: 'Python scripting plugin. value is pkg-config name to use or "false"'
-)
-option('with-sysinfo', type: 'boolean',
-  description: 'System information plugin, requires libpci on Unix'
-)
-option('with-upd', type: 'boolean',
-  description: 'Update plugin, Windows only'
-)
-option('with-winamp', type: 'boolean',
-  description: 'Winamp plugin, Windows only'
-)
--- a/meson_post_install.py
+++ b/meson_post_install.py
@@ -1,24 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-import subprocess
-
-prefix = os.environ.get('MESON_INSTALL_PREFIX', '/usr/local')
-datadir = os.path.join(prefix, 'share')
-with_thememan = sys.argv[1] == 'true'
-
-# Packaging tools define DESTDIR and this isn't needed for them
-if 'DESTDIR' not in os.environ:
-    print('Updating icon cache...')
-    subprocess.call(['gtk-update-icon-cache', '-qtf',
-                     os.path.join(datadir, 'icons', 'hicolor')])
-
-    print('Updating desktop database...')
-    subprocess.call(['update-desktop-database', '-q',
-                     os.path.join(datadir, 'applications')])
-
-    if with_thememan:
-        print('Updating mime database...')
-        subprocess.call(['update-mime-database',
-                         os.path.join(datadir, 'mime')])
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -0,0 +1,25 @@
+if DO_PYTHON
+pythondir = python
+endif
+
+if DO_PERL
+perldir = perl
+endif
+
+if DO_DOAT
+doatdir = doat
+endif
+
+if DO_FISHLIM
+fishlimdir = fishlim
+endif
+
+if DO_CHECKSUM
+checksumdir = checksum
+endif
+
+if DO_SYSINFO
+sysinfodir = sysinfo
+endif
+
+SUBDIRS = $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir)
--- a/plugins/checksum/Makefile.am
+++ b/plugins/checksum/Makefile.am
@@ -0,0 +1,7 @@
+libdir = $(hexchatlibdir)
+
+lib_LTLIBRARIES = checksum.la
+checksum_la_SOURCES = checksum.c
+checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+checksum_la_LIBADD = $(GLIB_LIBS)
+checksum_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
--- a/plugins/checksum/checksum.vcxproj
+++ b/plugins/checksum/checksum.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/checksum/meson.build
+++ b/plugins/checksum/meson.build
@@ -1,6 +0,0 @@
-shared_module('checksum', 'checksum.c',
-  dependencies: [libgio_dep, hexchat_plugin_dep],
-  install: true,
-  install_dir: plugindir,
-  name_prefix: '',
-)
--- a/plugins/doat/Makefile.am
+++ b/plugins/doat/Makefile.am
@@ -0,0 +1,8 @@
+libdir = $(hexchatlibdir)
+
+lib_LTLIBRARIES = doat.la
+doat_la_SOURCES = doat.c
+doat_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+doat_la_LIBADD = $(GLIB_LIBS)
+doat_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
+
--- a/plugins/doat/doat.c
+++ b/plugins/doat/doat.c
@@ -0,0 +1,92 @@
+/* This program is free software. It comes without any warranty, to
+ * the extent permitted by applicable law. You can redistribute it
+ * and/or modify it under the terms of the Do What The Fuck You Want
+ * To Public License, Version 2, as published by Sam Hocevar. See
+ * http://sam.zoy.org/wtfpl/COPYING or http://lwsitu.com/xchat/COPYING
+ * for more details. */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <glib.h>
+#include "hexchat-plugin.h"
+
+static hexchat_plugin *ph;
+
+static int
+parse_command( char *word[], char *word_eol[], void *userdata ) {
+	char *channel = NULL, *server = NULL, *token = NULL;
+/*	char *save_ptr1 = NULL;*/
+	char *str1 = NULL;
+	char *delimiter = NULL;
+
+	hexchat_context *ctx = NULL;
+
+	if( word[2] != NULL && word[3] != NULL ) {
+		for( str1 = word[2]; ; str1 = NULL ) {
+/*			token = strtok_r( str1, ",", &save_ptr1 );*/
+			token = strtok( str1, "," );
+/*			printf( "token: %s\n", token );*/
+
+			if( token == NULL ) {
+				break;
+			}
+
+			channel = g_strdup( token );
+				
+			delimiter = strchr( channel, '/' );
+
+			server = NULL;
+			if( delimiter != NULL ) {
+				*delimiter = '\0';
+
+				if( strlen( delimiter + 1 ) > 0 ) {
+					server = g_strdup( delimiter + 1 );
+				}
+			}
+
+			/* /Network form */
+			if( strlen( channel ) == 0 ) {
+				g_free( channel );
+				channel = NULL;
+			}
+
+/*			printf( "channel[%s] server[%s]\n", channel, server );*/
+
+			if( (ctx = hexchat_find_context( ph, server, channel ) ) != NULL ) {
+				if( hexchat_set_context( ph, ctx ) ) {
+					hexchat_command( ph, word_eol[3] );
+				}
+			}
+
+			g_free( channel );
+			g_free( server );
+		}
+	}
+	return HEXCHAT_EAT_HEXCHAT;
+}
+
+int
+hexchat_plugin_init( hexchat_plugin * plugin_handle, char **plugin_name,
+	char **plugin_desc, char **plugin_version, char *arg ) {
+
+	ph = plugin_handle;
+	*plugin_name = "Do At";
+	*plugin_version = "1.0001";
+	*plugin_desc = "Perform an arbitrary command on multiple channels";
+
+	hexchat_hook_command( ph, "doat", HEXCHAT_PRI_NORM, parse_command, "DOAT [channel,list,/network] [command], perform a command on multiple contexts", NULL );
+
+	hexchat_print (ph, "Do At plugin loaded\n");
+
+	return 1;
+}
+
+int
+hexchat_plugin_deinit (void)
+{
+	hexchat_print (ph, "Do At plugin unloaded\n");
+	return 1;
+}
--- a/plugins/doat/doat.def
+++ b/plugins/doat/doat.def
@@ -0,0 +1,3 @@
+EXPORTS 
+hexchat_plugin_init 
+hexchat_plugin_deinit 
--- a/plugins/doat/doat.vcxproj
+++ b/plugins/doat/doat.vcxproj
@@ -1,54 +1,59 @@
-<?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>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4C0F3940-2EEE-4646-82F7-6CE75B9A72F4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>lua</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  <Import Project="..\..\win32\hexchat.props" />
-  <PropertyGroup>
-    <TargetName>$(LuaOutput)</TargetName>
-    <OutDir>$(HexChatRel)plugins\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Glib);$(LuaInclude);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Glib);$(LuaInclude);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>"$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="lua.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+<?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>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4980AF24-9D42-427D-A8E6-0DF3B97C455D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>doat</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  <Import Project="..\..\win32\hexchat.props" />
+  <PropertyGroup>
+    <TargetName>hcdoat</TargetName>
+    <OutDir>$(HexChatRel)plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\common;$(HexChatLib);$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>doat.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\src\common;$(HexChatLib);$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>doat.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="doat.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="doat.def" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+</Project>
--- a/plugins/doat/doat.vcxproj.filters
+++ b/plugins/doat/doat.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="doat.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="doat.def">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
+</Project>
--- a/plugins/exec/exec.vcxproj
+++ b/plugins/exec/exec.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -38,7 +38,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/exec/meson.build
+++ b/plugins/exec/meson.build
@@ -1,5 +0,0 @@
-shared_module('exec', 'exec.c',
-  dependencies: hexchat_plugin_dep,
-  install: true,
-  install_dir: plugindir
-)
--- a/plugins/fishlim/INSTALL
+++ b/plugins/fishlim/INSTALL
@@ -0,0 +1,16 @@
+
+Install dependencies (on Debian/Ubuntu):
+
+    sudo apt-get install  build-essential libglib2.0-dev libssl-dev
+
+
+Build the plugin with:
+
+    make
+
+
+Install with:
+
+    sudo make install
+
+
--- a/plugins/fishlim/Makefile.am
+++ b/plugins/fishlim/Makefile.am
@@ -0,0 +1,9 @@
+EXTRA_DIST = INSTALL LICENSE fish.h irc.h keystore.h plugin_hexchat.h
+
+libdir = $(hexchatlibdir)
+
+lib_LTLIBRARIES = fishlim.la
+fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c
+fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/src/common
--- a/plugins/fishlim/dh1080.c
+++ b/plugins/fishlim/dh1080.c
@@ -1,236 +0,0 @@
-/* HexChat
-*
-* 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 2 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, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-*/
-
-/*
- * For Diffie-Hellman key-exchange a 1080bit germain prime is used, the
- * generator g=2 renders a field Fp from 1 to p-1. Therefore breaking it
- * means to solve a discrete logarithm problem with no less than 1080bit.
- *
- * Base64 format is used to send the public keys over IRC.
- *
- * The calculated secret key is hashed with SHA-256, the result is converted
- * to base64 for final use with blowfish.
- */
-
-#include "config.h"
-#include "dh1080.h"
-
-#include <openssl/bn.h>
-#include <openssl/dh.h>
-#include <openssl/sha.h>
-
-#include <string.h>
-#include <glib.h>
-
-#define DH1080_PRIME_BITS 1080
-#define DH1080_PRIME_BYTES 135
-#define SHA256_DIGEST_LENGTH 32
-#define B64ABC "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
-#define MEMZERO(x) memset(x, 0x00, sizeof(x))
-
-/* All clients must use the same prime number to be able to keyx */
-static const guchar prime1080[DH1080_PRIME_BYTES] =
-{
-	0xFB, 0xE1, 0x02, 0x2E, 0x23, 0xD2, 0x13, 0xE8, 0xAC, 0xFA, 0x9A, 0xE8, 0xB9, 0xDF, 0xAD, 0xA3, 0xEA,
-	0x6B, 0x7A, 0xC7, 0xA7, 0xB7, 0xE9, 0x5A, 0xB5, 0xEB, 0x2D, 0xF8, 0x58, 0x92, 0x1F, 0xEA, 0xDE, 0x95,
-	0xE6, 0xAC, 0x7B, 0xE7, 0xDE, 0x6A, 0xDB, 0xAB, 0x8A, 0x78, 0x3E, 0x7A, 0xF7, 0xA7, 0xFA, 0x6A, 0x2B,
-	0x7B, 0xEB, 0x1E, 0x72, 0xEA, 0xE2, 0xB7, 0x2F, 0x9F, 0xA2, 0xBF, 0xB2, 0xA2, 0xEF, 0xBE, 0xFA, 0xC8,
-	0x68, 0xBA, 0xDB, 0x3E, 0x82, 0x8F, 0xA8, 0xBA, 0xDF, 0xAD, 0xA3, 0xE4, 0xCC, 0x1B, 0xE7, 0xE8, 0xAF,
-	0xE8, 0x5E, 0x96, 0x98, 0xA7, 0x83, 0xEB, 0x68, 0xFA, 0x07, 0xA7, 0x7A, 0xB6, 0xAD, 0x7B, 0xEB, 0x61,
-	0x8A, 0xCF, 0x9C, 0xA2, 0x89, 0x7E, 0xB2, 0x8A, 0x61, 0x89, 0xEF, 0xA0, 0x7A, 0xB9, 0x9A, 0x8A, 0x7F,
-	0xA9, 0xAE, 0x29, 0x9E, 0xFA, 0x7B, 0xA6, 0x6D, 0xEA, 0xFE, 0xFB, 0xEF, 0xBF, 0x0B, 0x7D, 0x8B
-};
-
-static DH *g_dh;
-
-int
-dh1080_init (void)
-{
-	g_return_val_if_fail (g_dh == NULL, 0);
-
-	if ((g_dh = DH_new()))
-	{
-		int codes;
-		BIGNUM *p, *g;
-
-		p = BN_bin2bn (prime1080, DH1080_PRIME_BYTES, NULL);
-		g = BN_new ();
-
-		if (p == NULL || g == NULL)
-			return 1;
-
-		BN_set_word (g, 2);
-
-#ifndef HAVE_DH_SET0_PQG
-		g_dh->p = p;
-		g_dh->g = g;
-#else
-		if (!DH_set0_pqg (g_dh, p, NULL, g))
-			return 1;
-#endif
-
-		if (DH_check (g_dh, &codes))
-			return codes == 0;
-	}
-
-	return 0;
-}
-
-void
-dh1080_deinit (void)
-{
-	g_clear_pointer (&g_dh, DH_free);
-}
-
-static inline int
-DH_verifyPubKey (BIGNUM *pk)
-{
-	int codes;
-	return DH_check_pub_key (g_dh, pk, &codes) && codes == 0;
-}
-
-static guchar *
-dh1080_decode_b64 (const char *data, gsize *out_len)
-{
-	GString *str = g_string_new (data);
-	guchar *ret;
-
-	if (str->len % 4 == 1 && str->str[str->len - 1] == 'A')
-		g_string_truncate (str, str->len - 1);
-
-	while (str->len % 4 != 0)
-		g_string_append_c (str, '=');
-
-	ret = g_base64_decode_inplace (str->str, out_len);
-	g_string_free (str, FALSE);
-  	return ret;
-}
-
-static char *
-dh1080_encode_b64 (const guchar *data, gsize data_len)
-{
-	char *ret = g_base64_encode (data, data_len);
-	char *p;
-
-	if (!(p = strchr (ret, '=')))
-	{
-		char *new_ret = g_new(char, strlen(ret) + 2);
-		strcpy (new_ret, ret);
-		strcat (new_ret, "A");
-		g_free (ret);
-		ret = new_ret;
-	}
-	else
-	{
-		*p = '\0';
-	}
-
-  	return ret;
-}
-
-int
-dh1080_generate_key (char **priv_key, char **pub_key)
-{
-	guchar buf[DH1080_PRIME_BYTES];
-	int len;
-	DH *dh;
-	const BIGNUM *dh_priv_key, *dh_pub_key;
-
-  	g_assert (priv_key != NULL);
-	g_assert (pub_key != NULL);
-
-  	dh = DHparams_dup (g_dh);
-	if (!dh)
-		return 0;
-
-	if (!DH_generate_key (dh))
-	{
-		DH_free (dh);
-		return 0;
-	}
-
-#ifndef HAVE_DH_GET0_KEY
-	dh_pub_key = dh->pub_key;
-	dh_priv_key = dh->priv_key;
-#else
-	DH_get0_key (dh, &dh_pub_key, &dh_priv_key);
-#endif
-
-	MEMZERO (buf);
-	len = BN_bn2bin (dh_priv_key, buf);
-	*priv_key = dh1080_encode_b64 (buf, len);
-
-	MEMZERO (buf);
-	len = BN_bn2bin (dh_pub_key, buf);
-	*pub_key = dh1080_encode_b64 (buf, len);
-
-	OPENSSL_cleanse (buf, sizeof (buf));
-	DH_free (dh);
-	return 1;
-}
-
-int
-dh1080_compute_key (const char *priv_key, const char *pub_key, char **secret_key)
-{
-	char *pub_key_data;
-	gsize pub_key_len;
-	BIGNUM *pk;
-	BIGNUM *temp_pub_key = BN_new();
-	DH *dh;
-
-  	g_assert (secret_key != NULL);
-
-	/* Verify base64 strings */
-	if (strspn (priv_key, B64ABC) != strlen (priv_key)
-	    || strspn (pub_key, B64ABC) != strlen (pub_key))
-		return 0;
-
-	dh = DHparams_dup (g_dh);
-
-	pub_key_data = dh1080_decode_b64 (pub_key, &pub_key_len);
-	pk = BN_bin2bn (pub_key_data, pub_key_len, NULL);
-
-	if (DH_verifyPubKey (pk))
-	{
-		guchar shared_key[DH1080_PRIME_BYTES] = { 0 };
-		guchar sha256[SHA256_DIGEST_LENGTH] = { 0 };
-		char *priv_key_data;
-		gsize priv_key_len;
-		int shared_len;
-		BIGNUM *priv_key_num;
-
-	  	priv_key_data = dh1080_decode_b64 (priv_key, &priv_key_len);
-		priv_key_num = BN_bin2bn(priv_key_data, priv_key_len, NULL);
-#ifndef HAVE_DH_SET0_KEY
-		dh->priv_key = priv_key_num;
-#else
-		DH_set0_key (dh, temp_pub_key, priv_key_num);
-#endif
-
-		shared_len = DH_compute_key (shared_key, pk, dh);
-		SHA256(shared_key, shared_len, sha256);
-		*secret_key = dh1080_encode_b64 (sha256, sizeof(sha256));
-
-		OPENSSL_cleanse (priv_key_data, priv_key_len);
-	  	g_free (priv_key_data);
-	}
-
-	BN_free (pk);
-	DH_free (dh);
-	g_free (pub_key_data);
-	return 1;
-}
--- a/plugins/fishlim/dh1080.h
+++ b/plugins/fishlim/dh1080.h
@@ -1,24 +0,0 @@
-/* HexChat
-*
-* 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 2 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, write to the Free Software
-* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-*/
-
-#pragma once
-
-int dh1080_generate_key (char **, char **);
-int dh1080_compute_key (const char *, const char *, char **);
-int dh1080_init (void);
-void dh1080_deinit (void);
-
--- a/plugins/fishlim/fishlim.vcxproj
+++ b/plugins/fishlim/fishlim.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -53,14 +53,13 @@
    <None Include="fishlim.def" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="dh1080.h" />
+    <ClInclude Include="bool.h" />
    <ClInclude Include="fish.h" />
    <ClInclude Include="irc.h" />
    <ClInclude Include="keystore.h" />
    <ClInclude Include="plugin_hexchat.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="dh1080.c" />
    <ClCompile Include="fish.c" />
    <ClCompile Include="irc.c" />
    <ClCompile Include="keystore.c" />
--- a/plugins/fishlim/irc.c
+++ b/plugins/fishlim/irc.c
@@ -50,9 +50,7 @@ gboolean irc_parse_message(const char *words[],
    if (command) *command = words[w];
    w++;
    
-    if (parameters_offset)
-		*parameters_offset = w;
-
+    *parameters_offset = w;
    return TRUE;
 }

--- a/plugins/fishlim/keystore.c
+++ b/plugins/fishlim/keystore.c
@@ -63,22 +63,6 @@ static const char *get_keystore_password(void) {
 }


-static char *escape_nickname(const char *nick) {
-    char *escaped = g_strdup(nick);
-    char *p = escaped;
-
-    while (*p) {
-        if (*p == '[')
-            *p = '~';
-        else if (*p == ']')
-            *p = '!';
-
-        ++p;
-    }
-
-    return escaped;
-}
-
 /**
 * Gets a value for a nick/channel from addon_fishlim.conf. Unlike
 * g_key_file_get_string, this function is case insensitive.
@@ -106,13 +90,9 @@ static gchar *get_nick_value(GKeyFile *keyfile, const char *nick, const char *it
 char *keystore_get_key(const char *nick) {
    /* Get the key */
    GKeyFile *keyfile = getConfigFile();
-    char *escaped_nick = escape_nickname(nick);
-    gchar *value = get_nick_value(keyfile, escaped_nick, "key");
+    gchar *value = get_nick_value(keyfile, nick, "key");
    g_key_file_free(keyfile);
-    g_free(escaped_nick);
-
-    if (!value)
-        return NULL;
+    if (!value) return NULL;
    
    if (strncmp(value, "+OK ", 4) != 0) {
        /* Key is stored in plaintext */
@@ -177,9 +157,7 @@ static gboolean save_keystore(GKeyFile *keyfile) {
 #if !GLIB_CHECK_VERSION(2,40,0)
    ok = keyfile_save_to_file (keyfile, filename);
 #else
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* Hide false positive */
    ok = g_key_file_save_to_file (keyfile, filename, NULL);
-G_GNUC_END_IGNORE_DEPRECATIONS
 #endif
    g_free (filename);

@@ -195,10 +173,9 @@ gboolean keystore_store_key(const char *nick, const char *key) {
    char *wrapped;
    gboolean ok = FALSE;
    GKeyFile *keyfile = getConfigFile();
-    char *escaped_nick = escape_nickname(nick);
-
+    
    /* Remove old key */
-    delete_nick(keyfile, escaped_nick);
+    delete_nick(keyfile, nick);
    
    /* Add new key */
    password = get_keystore_password();
@@ -212,11 +189,11 @@ gboolean keystore_store_key(const char *nick, const char *key) {
        g_free(encrypted);
        
        /* Store encrypted in file */
-        g_key_file_set_string(keyfile, escaped_nick, "key", wrapped);
+        g_key_file_set_string(keyfile, nick, "key", wrapped);
        g_free(wrapped);
    } else {
        /* Store unencrypted in file */
-        g_key_file_set_string(keyfile, escaped_nick, "key", key);
+        g_key_file_set_string(keyfile, nick, "key", key);
    }
    
    /* Save key store file */
@@ -224,7 +201,6 @@ gboolean keystore_store_key(const char *nick, const char *key) {
    
  end:
    g_key_file_free(keyfile);
-    g_free(escaped_nick);
    return ok;
 }

@@ -233,15 +209,13 @@ gboolean keystore_store_key(const char *nick, const char *key) {
 */
 gboolean keystore_delete_nick(const char *nick) {
    GKeyFile *keyfile = getConfigFile();
-    char *escaped_nick = escape_nickname(nick);
    
    /* Delete entry */
-    gboolean ok = delete_nick(keyfile, escaped_nick);
+    gboolean ok = delete_nick(keyfile, nick);
    
    /* Save */
    if (ok) save_keystore(keyfile);
    
    g_key_file_free(keyfile);
-    g_free(escaped_nick);
    return ok;
 }
--- a/plugins/fishlim/meson.build
+++ b/plugins/fishlim/meson.build
@@ -1,18 +0,0 @@
-if not libssl_dep.found()
-  error('fish plugin requires openssl')
-endif
-
-fishlim_sources = [
-  'dh1080.c',
-  'fish.c',
-  'irc.c',
-  'keystore.c',
-  'plugin_hexchat.c'
-]
-
-shared_module('fishlim', fishlim_sources,
-  dependencies: [libgio_dep, hexchat_plugin_dep, libssl_dep],
-  install: true,
-  install_dir: plugindir,
-  name_prefix: '',
-)
--- a/plugins/fishlim/plugin_hexchat.c
+++ b/plugins/fishlim/plugin_hexchat.c
@@ -1,7 +1,6 @@
 /*

  Copyright (c) 2010-2011 Samuel Lidén Borell <samuel@kodafritt.se>
-  Copyright (c) 2015 <the.cypher@gmail.com>

  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
@@ -33,24 +32,17 @@
 #define HEXCHAT_MAX_WORDS 32

 #include "fish.h"
-#include "dh1080.h"
 #include "keystore.h"
 #include "irc.h"

 static const char plugin_name[] = "FiSHLiM";
 static const char plugin_desc[] = "Encryption plugin for the FiSH protocol. Less is More!";
-static const char plugin_version[] = "0.1.0";
+static const char plugin_version[] = "0.0.17";

 static const char usage_setkey[] = "Usage: SETKEY [<nick or #channel>] <password>, sets the key for a channel or nick";
 static const char usage_delkey[] = "Usage: DELKEY <nick or #channel>, deletes the key for a channel or nick";
-static const char usage_keyx[] = "Usage: KEYX [<nick>], performs DH1080 key-exchange with <nick>";
-static const char usage_topic[] = "Usage: TOPIC+ <topic>, sets a new encrypted topic for the current channel";
-static const char usage_notice[] = "Usage: NOTICE+ <nick or #channel> <notice>";
-static const char usage_msg[] = "Usage: MSG+ <nick or #channel> <message>";
-

 static hexchat_plugin *ph;
-static GHashTable *pending_exchanges;


 /**
@@ -66,38 +58,6 @@ gchar *get_config_filename(void) {
    return filename_fs;
 }

-static inline gboolean irc_is_query (const char *name) {
-    const char *chantypes = hexchat_list_str (ph, NULL, "chantypes");
-
-    return strchr (chantypes, name[0]) == NULL;
-}
-
-static hexchat_context *find_context_on_network (const char *name) {
-    hexchat_list *channels;
-    hexchat_context *ret = NULL;
-    int id;
-
-    if (hexchat_get_prefs(ph, "id", NULL, &id) != 2)
-        return NULL;
-
-    channels = hexchat_list_get(ph, "channels");
-    if (!channels)
-        return NULL;
-
-    while (hexchat_list_next(ph, channels)) {
-        int chan_id = hexchat_list_int(ph, channels, "id");
-        const char *chan_name = hexchat_list_str(ph, channels, "channel");
-
-        if (chan_id == id && chan_name && hexchat_nickcmp (ph, chan_name, name) == 0) {
-            ret = (hexchat_context*)hexchat_list_str(ph, channels, "context");
-            break;
-        }
-    };
-
-    hexchat_list_free(ph, channels);
-    return ret;
-}
-
 int irc_nick_cmp(const char *a, const char *b) {
 	return hexchat_nickcmp (ph, a, b);
 }
@@ -203,11 +163,11 @@ static int handle_incoming(char *word[], char *word_eol[], hexchat_event_attrs *
                /* Prefix with colon, which gets stripped out otherwise */
                g_string_append_c (message, ':');
            }
-
+            
            if (prefix_char) {
                g_string_append_c (message, prefix_char);
            }
-
+            
        } else {
            /* Add unencrypted data (for example, a prefix from a bouncer or bot) */
            peice = word[uw];
@@ -216,7 +176,7 @@ static int handle_incoming(char *word[], char *word_eol[], hexchat_event_attrs *
        g_string_append (message, peice);
    }
    g_free(decrypted);
-
+    
    /* Simulate unencrypted message */
    /* hexchat_printf(ph, "simulating: %s\n", message->str); */
    hexchat_command(ph, message->str);
@@ -224,103 +184,26 @@ static int handle_incoming(char *word[], char *word_eol[], hexchat_event_attrs *
    g_string_free (message, TRUE);
    g_free(sender_nick);
    return HEXCHAT_EAT_HEXCHAT;
-
+  
  decrypt_error:
    g_free(decrypted);
    g_free(sender_nick);
    return HEXCHAT_EAT_NONE;
 }

-static int handle_keyx_notice(char *word[], char *word_eol[], void *userdata) {
-    const char *dh_message = word[4];
-    const char *dh_pubkey = word[5];
-    hexchat_context *query_ctx;
-    const char *prefix;
-    gboolean cbc;
-    char *sender, *secret_key, *priv_key = NULL;
-
-    if (!*dh_message || !*dh_pubkey || strlen(dh_pubkey) != 181)
-        return HEXCHAT_EAT_NONE;
-
-    if (!irc_parse_message((const char**)word, &prefix, NULL, NULL) || !prefix)
-        return HEXCHAT_EAT_NONE;
-
-    sender = irc_prefix_get_nick(prefix);
-    query_ctx = find_context_on_network(sender);
-    if (query_ctx)
-        hexchat_set_context(ph, query_ctx);
-
-    dh_message++; /* : prefix */
-    if (*dh_message == '+' || *dh_message == '-')
-        dh_message++; /* identify-msg */
-
-    cbc = g_strcmp0 (word[6], "CBC") == 0;
-
-    if (!strcmp(dh_message, "DH1080_INIT")) {
-        char *pub_key;
-
-        if (cbc) {
-            hexchat_print(ph, "Received key exchange for CBC mode which is not supported.");
-            goto cleanup;
-        }
-
-        hexchat_printf(ph, "Received public key from %s, sending mine...", sender);
-        if (dh1080_generate_key(&priv_key, &pub_key)) {
-            hexchat_commandf(ph, "quote NOTICE %s :DH1080_FINISH %s", sender, pub_key);
-            g_free(pub_key);
-        } else {
-            hexchat_print(ph, "Failed to generate keys");
-            goto cleanup;
-        }
-    } else if (!strcmp (dh_message, "DH1080_FINISH")) {
-        char *sender_lower = g_ascii_strdown(sender, -1);
-        /* FIXME: Properly respect irc casing */
-        priv_key = g_hash_table_lookup(pending_exchanges, sender_lower);
-        g_hash_table_steal(pending_exchanges, sender_lower);
-        g_free(sender_lower);
-
-        if (cbc) {
-            hexchat_print(ph, "Received key exchange for CBC mode which is not supported.");
-            goto cleanup;
-        }
-
-        if (!priv_key) {
-            hexchat_printf(ph, "Received a key exchange response for unknown user: %s", sender);
-            goto cleanup;
-        }
-    } else {
-        /* Regular notice */
-        g_free(sender);
-        return HEXCHAT_EAT_NONE;
-    }
-
-    if (dh1080_compute_key(priv_key, dh_pubkey, &secret_key)) {
-        keystore_store_key(sender, secret_key);
-        hexchat_printf(ph, "Stored new key for %s", sender);
-        g_free(secret_key);
-    } else {
-        hexchat_print(ph, "Failed to create secret key!");
-    }
-
-cleanup:
-    g_free(sender);
-    g_free(priv_key);
-    return HEXCHAT_EAT_ALL;
-}
-
 /**
 * Command handler for /setkey
 */
 static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
    const char *nick;
    const char *key;
-
+    
    /* Check syntax */
    if (*word[2] == '\0') {
        hexchat_printf(ph, "%s\n", usage_setkey);
        return HEXCHAT_EAT_HEXCHAT;
    }
-
+    
    if (*word[3] == '\0') {
        /* /setkey password */
        nick = hexchat_get_info(ph, "channel");
@@ -330,14 +213,14 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
        nick = word[2];
        key = word_eol[3];
    }
-
+    
    /* Set password */
    if (keystore_store_key(nick, key)) {
        hexchat_printf(ph, "Stored key for %s\n", nick);
    } else {
        hexchat_printf(ph, "\00305Failed to store key in addon_fishlim.conf\n");
    }
-
+    
    return HEXCHAT_EAT_HEXCHAT;
 }

@@ -346,174 +229,25 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
 */
 static int handle_delkey(char *word[], char *word_eol[], void *userdata) {
    const char *nick;
-
+    
    /* Check syntax */
    if (*word[2] == '\0' || *word[3] != '\0') {
        hexchat_printf(ph, "%s\n", usage_delkey);
        return HEXCHAT_EAT_HEXCHAT;
    }
-
+    
    nick = g_strstrip (word_eol[2]);
-
+    
    /* Delete the given nick from the key store */
    if (keystore_delete_nick(nick)) {
        hexchat_printf(ph, "Deleted key for %s\n", nick);
    } else {
        hexchat_printf(ph, "\00305Failed to delete key in addon_fishlim.conf!\n");
    }
-
+    
    return HEXCHAT_EAT_HEXCHAT;
 }

-static int handle_keyx(char *word[], char *word_eol[], void *userdata) {
-    const char *target = word[2];
-    hexchat_context *query_ctx = NULL;
-    char *pub_key, *priv_key;
-    int ctx_type;
-
-    if (*target)
-        query_ctx = find_context_on_network(target);
-    else {
-        target = hexchat_get_info(ph, "channel");
-        query_ctx = hexchat_get_context (ph);
-    }
-
-    if (query_ctx) {
-        hexchat_set_context(ph, query_ctx);
-        ctx_type = hexchat_list_int(ph, NULL, "type");
-    }
-
-    if ((query_ctx && ctx_type != 3) || (!query_ctx && !irc_is_query(target))) {
-        hexchat_print(ph, "You can only exchange keys with individuals");
-        return HEXCHAT_EAT_ALL;
-    }
-
-    if (dh1080_generate_key(&priv_key, &pub_key)) {
-        g_hash_table_replace (pending_exchanges, g_ascii_strdown(target, -1), priv_key);
-
-        hexchat_commandf(ph, "quote NOTICE %s :DH1080_INIT %s", target, pub_key);
-        hexchat_printf(ph, "Sent public key to %s, waiting for reply...", target);
-
-        g_free(pub_key);
-    } else {
-        hexchat_print(ph, "Failed to generate keys");
-    }
-
-    return HEXCHAT_EAT_ALL;
-}
-
-/**
- * Command handler for /topic+
- */
-static int handle_crypt_topic(char *word[], char *word_eol[], void *userdata) {
-    const char *target;
-    const char *topic = word_eol[2];
-    char *buf;
-
-    if (!*topic) {
-        hexchat_print(ph, usage_topic);
-        return HEXCHAT_EAT_ALL;
-    }
-
-    if (hexchat_list_int(ph, NULL, "type") != 2) {
-        hexchat_printf(ph, "Please change to the channel window where you want to set the topic!");
-        return HEXCHAT_EAT_ALL;
-    }
-
-    target = hexchat_get_info(ph, "channel");
-    buf = fish_encrypt_for_nick(target, topic);
-    if (buf == NULL) {
-        hexchat_printf(ph, "/topic+ error, no key found for %s", target);
-        return HEXCHAT_EAT_ALL;
-    }
-
-    hexchat_commandf(ph, "TOPIC %s +OK %s", target, buf);
-    g_free(buf);
-    return HEXCHAT_EAT_ALL;
-    }
-
-/**
- * Command handler for /notice+
- */
-static int handle_crypt_notice(char *word[], char *word_eol[], void *userdata)
-{
-    const char *target = word[2];
-    const char *notice = word_eol[3];
-    char *buf;
-
-    if (!*target || !*notice) {
-        hexchat_print(ph, usage_notice);
-        return HEXCHAT_EAT_ALL;
-    }
-
-    buf = fish_encrypt_for_nick(target, notice);
-    if (buf == NULL) {
-        hexchat_printf(ph, "/notice+ error, no key found for %s.", target);
-        return HEXCHAT_EAT_ALL;
-    }
-
-    hexchat_commandf(ph, "quote NOTICE %s :+OK %s", target, buf);
-    hexchat_emit_print(ph, "Notice Sent", target, notice);
-    g_free(buf);
-
-    return HEXCHAT_EAT_ALL;
-}
-
-/**
- * Command handler for /msg+
- */
-static int handle_crypt_msg(char *word[], char *word_eol[], void *userdata)
-{
-    const char *target = word[2];
-    const char *message = word_eol[3];
-    hexchat_context *query_ctx;
-    char *buf;
-
-    if (!*target || !*message) {
-        hexchat_print(ph, usage_msg);
-        return HEXCHAT_EAT_ALL;
-    }
-
-    buf = fish_encrypt_for_nick(target, message);
-    if (buf == NULL) {
-        hexchat_printf(ph, "/msg+ error, no key found for %s", target);
-        return HEXCHAT_EAT_ALL;
-    }
-
-    hexchat_commandf(ph, "PRIVMSG %s :+OK %s", target, buf);
-
-    query_ctx = find_context_on_network(target);
-    if (query_ctx) {
-	    hexchat_set_context(ph, query_ctx);
-
-        /* FIXME: Mode char */
-        hexchat_emit_print(ph, "Your Message", hexchat_get_info(ph, "nick"),
-                           message, "", "");
-    }
-    else {
-        hexchat_emit_print(ph, "Message Send", target, message);
-    }
-
-    g_free(buf);
-    return HEXCHAT_EAT_ALL;
-}
-
-static int handle_crypt_me(char *word[], char *word_eol[], void *userdata) {
-	const char *channel = hexchat_get_info(ph, "channel");
-	char *buf;
-
-    buf = fish_encrypt_for_nick(channel, word_eol[2]);
-	if (!buf)
-        return HEXCHAT_EAT_NONE;
-
-	hexchat_commandf(ph, "PRIVMSG %s :\001ACTION +OK %s \001", channel, buf);
-	hexchat_emit_print(ph, "Your Action", hexchat_get_info(ph, "nick"),
-                       word_eol[2], NULL);
-
-	g_free(buf);
-	return HEXCHAT_EAT_ALL;
-}
-
 /**
 * Returns the plugin name version information.
 */
@@ -533,44 +267,30 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
                      const char **version,
                      char *arg) {
    ph = plugin_handle;
-
+    
    /* Send our info to HexChat */
    *name = plugin_name;
    *desc = plugin_desc;
    *version = plugin_version;
-
+    
    /* Register commands */
    hexchat_hook_command(ph, "SETKEY", HEXCHAT_PRI_NORM, handle_setkey, usage_setkey, NULL);
    hexchat_hook_command(ph, "DELKEY", HEXCHAT_PRI_NORM, handle_delkey, usage_delkey, NULL);
-    hexchat_hook_command(ph, "KEYX", HEXCHAT_PRI_NORM, handle_keyx, usage_keyx, NULL);
-    hexchat_hook_command(ph, "TOPIC+", HEXCHAT_PRI_NORM, handle_crypt_topic, usage_topic, NULL);
-    hexchat_hook_command(ph, "NOTICE+", HEXCHAT_PRI_NORM, handle_crypt_notice, usage_notice, NULL);
-    hexchat_hook_command(ph, "MSG+", HEXCHAT_PRI_NORM, handle_crypt_msg, usage_msg, NULL);
-    hexchat_hook_command(ph, "ME", HEXCHAT_PRI_NORM, handle_crypt_me, NULL, NULL);
-
+    
    /* Add handlers */
    hexchat_hook_command(ph, "", HEXCHAT_PRI_NORM, handle_outgoing, NULL, NULL);
-    hexchat_hook_server(ph, "NOTICE", HEXCHAT_PRI_HIGHEST, handle_keyx_notice, NULL);
    hexchat_hook_server_attrs(ph, "NOTICE", HEXCHAT_PRI_NORM, handle_incoming, NULL);
    hexchat_hook_server_attrs(ph, "PRIVMSG", HEXCHAT_PRI_NORM, handle_incoming, NULL);
    /* hexchat_hook_server(ph, "RAW LINE", HEXCHAT_PRI_NORM, handle_debug, NULL); */
    hexchat_hook_server_attrs(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
    hexchat_hook_server_attrs(ph, "332", HEXCHAT_PRI_NORM, handle_incoming, NULL);
-
-    if (!dh1080_init())
-        return 0;
-
-    pending_exchanges = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-
+    
    hexchat_printf(ph, "%s plugin loaded\n", plugin_name);
    /* Return success */
    return 1;
 }

 int hexchat_plugin_deinit(void) {
-    g_clear_pointer(&pending_exchanges, g_hash_table_destroy);
-    dh1080_deinit();
-
    hexchat_printf(ph, "%s plugin unloaded\n", plugin_name);
    return 1;
 }
--- a/plugins/lua/lua.c
+++ b/plugins/lua/lua.c
--- a/plugins/lua/lua.vcxproj.filters
+++ b/plugins/lua/lua.vcxproj.filters
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{f4eaf231-f095-42d3-8427-b2b6006cacb1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{0166c0f9-7968-4a09-9ef5-a5179c7746eb}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="lua.c" />
-  </ItemGroup>
-</Project>
--- a/plugins/lua/meson.build
+++ b/plugins/lua/meson.build
@@ -1,12 +0,0 @@
-if cc.get_id() == 'msvc'
-  lua_dep = cc.find_library('lua51')
-else
-  lua_dep = dependency(get_option('with-lua'))
-endif
-
-shared_module('lua', 'lua.c',
-  dependencies: [libgio_dep, hexchat_plugin_dep, lua_dep],
-  install: true,
-  install_dir: plugindir,
-  name_prefix: '',
-)
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,39 +0,0 @@
-plugindir = join_paths(get_option('libdir'), 'hexchat/plugins')
-
-if host_machine.system() == 'windows'
-  if get_option('with-exec')
-    subdir('exec')
-  endif
-
-  if get_option('with-upd')
-    subdir('upd')
-  endif
-
-  if get_option('with-winamp')
-    subdir('winamp')
-  endif
-endif
-
-if get_option('with-checksum')
-  subdir('checksum')
-endif
-
-if get_option('with-fishlim')
-  subdir('fishlim')
-endif
-
-if get_option('with-lua') != 'false'
-  subdir('lua')
-endif
-
-if get_option('with-perl')
-  subdir('perl')
-endif
-
-if get_option('with-python') != 'false'
-  subdir('python')
-endif
-
-if get_option('with-sysinfo')
-  subdir('sysinfo')
-endif
--- a/plugins/mpcinfo/mp3Info.c
+++ b/plugins/mpcinfo/mp3Info.c
@@ -122,6 +122,7 @@ struct tagInfo readID3V1(char *file){
 	char *tag;
 	char *id;
 	char *tmp;
+	tag = (char*) malloc(sizeof(char)*129);
 	ret.artist=NULL;
 	f=fopen(file,"rb");
 	if (f==NULL){
@@ -132,21 +133,18 @@ struct tagInfo readID3V1(char *file){
 	//int offset=getSize(file)-128;
 	res=fseek(f,-128,SEEK_END);
 	if (res!=0) {printf("seek failed\n");fclose(f);return ret;}
-	tag = (char*) malloc(sizeof(char)*129);
 	//long int pos=ftell(f);
 	//printf("position= %li\n",pos);
 	for (i=0;i<128;i++) {
 		c=fgetc(f);
-		if (c==EOF) {hexchat_printf(ph,"read ID3V1 failed\n");fclose(f);free(tag);return ret;}
+		if (c==EOF) {hexchat_printf(ph,"read ID3V1 failed\n");fclose(f);return ret;}
 		tag[i]=(char)c;
 	}
 	fclose(f);
 	//printf("tag readed: \n");
 	id=substring(tag,0,3);
 	//printf("header: %s\n",id);
-	res=strcmp(id,"TAG");
-	free(id);
-	if (res!=0){hexchat_printf(ph,"no id3 v1 found\n");free(tag);return ret;}
+	if (strcmp(id,"TAG")!=0){hexchat_printf(ph,"no id3 v1 found\n");return ret;}
 	ret.title=subString(tag,3,30,1);
 	ret.artist=subString(tag,33,30,1);
 	ret.album=subString(tag,63,30,1);
@@ -166,8 +164,6 @@ struct tagInfo readID3V1(char *file){
 	//hexchat_printf(ph, "tmp: \"%s\" -> %i",tmp,tmp[0]);
 	//hexchat_printf(ph,"genre \"%s\"",ret.genre);
 	//if (DEBUG==1) putlog("id3v1 extracted");
-	free(tmp);
-	free(tag);
 	return ret;
 }

--- a/plugins/mpcinfo/mpcinfo.vcxproj
+++ b/plugins/mpcinfo/mpcinfo.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/mpcinfo/oggInfo.c
+++ b/plugins/mpcinfo/oggInfo.c
@@ -48,7 +48,7 @@ struct tagInfo getOggHeader(char *file){
 	char *sub;
 	char *name;
 	char *val;
-	char HEADLOC1[]="_vorbis", HEADLOC3[]="_vorbis", HEADLOC5[]="_vorbis";
+	char *HEADLOC1, *HEADLOC3, *HEADLOC5;
 	FILE *f;
 	struct tagInfo info;

@@ -62,8 +62,11 @@ struct tagInfo getOggHeader(char *file){

 	for (i=0;i<4095;i++) {c=fgetc(f);header[i]=(char)c;}
 	fclose(f);
+	HEADLOC1="_vorbis";
 	HEADLOC1[0]=1;
+	HEADLOC3="_vorbis";
 	HEADLOC3[0]=3;
+	HEADLOC5="_vorbis";
 	HEADLOC5[0]=5;
 	h1pos=inStr(header,4096,HEADLOC1);
 	h3pos=inStr(header,4096,HEADLOC3);
@@ -101,7 +104,6 @@ struct tagInfo getOggHeader(char *file){
 		if (strcmp(name,"GENRE")==0) info.genre=val;
 		if (strcmp(name,"COMMENT")==0) info.comment=val;
 		pos+=4+tagLen;
-		free(name);
 	}
 	if (info.artist==NULL) info.artist="";
 	if (info.album==NULL) info.album ="";
--- a/plugins/mpcinfo/theme.c
+++ b/plugins/mpcinfo/theme.c
@@ -91,15 +91,13 @@ struct theme themeAdd(struct theme data, char *info){
 }

 void loadThemes(){
-    char *hDir, *hFile, *line, *lineCap, *val;
+    char *hDir, *hFile, *line, *val;
 	FILE *f;
 	hexchat_print(ph,"loading themes\n");
    hDir=(char*)calloc(1024,sizeof(char));
    strcpy(hDir,hexchat_get_info(ph,"configdir"));
    hFile=str3cat(hDir,"\\","mpcInfo.theme.txt");
    f = fopen(hFile,"r");
-    free(hDir);
-    free(hFile);
    if(f==NULL)
 	{
 		hexchat_print(ph,"no theme in homedir, checking global theme");
@@ -122,12 +120,10 @@ void loadThemes(){
 			val=split(line,'=');
 			printf("line: %s\n",line);
 			printf("val: %s\n",val);
-			lineCap=toUpper(line);
-			if (strcmp(lineCap,"OFF_LINE")==0) notRunTheme=themeAdd(notRunTheme,val);
-			if (strcmp(lineCap,"TITLE_LINE")==0) titleTheme=themeAdd(titleTheme,val);
-			if (strcmp(lineCap,"MP3_LINE")==0) mp3Theme=themeAdd(mp3Theme,val);
-			if (strcmp(lineCap,"OGG_LINE")==0) mp3Theme=themeAdd(oggTheme,val);
-			free(lineCap);
+			if (strcmp(toUpper(line),"OFF_LINE")==0) notRunTheme=themeAdd(notRunTheme,val);
+			if (strcmp(toUpper(line),"TITLE_LINE")==0) titleTheme=themeAdd(titleTheme,val);
+			if (strcmp(toUpper(line),"MP3_LINE")==0) mp3Theme=themeAdd(mp3Theme,val);
+			if (strcmp(toUpper(line),"OGG_LINE")==0) mp3Theme=themeAdd(oggTheme,val);
 		}
 		fclose(f);
 		hexchat_print(ph, "theme loaded successfull\n");
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@@ -0,0 +1,19 @@
+
+EXTRA_DIST=generate_header lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm lib/HexChat/List/Network.pm \
+	lib/HexChat/List/Network/Entry.pm lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
+
+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_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
+
+BUILT_SOURCES = hexchat.pm.h irc.pm.h
+CLEANFILES = $(BUILT_SOURCES)
+
+hexchat.pm.h irc.pm.h: lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm \
+	lib/HexChat/List/Network.pm lib/HexChat/List/Network/Entry.pm \
+	lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
+	cd $(srcdir); perl generate_header
--- a/plugins/perl/generate_header.py
+++ b/plugins/perl/generate_header.py
@@ -1,29 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-from os.path import basename
-
-out_file = sys.argv[1]
-in_files = sys.argv[2:]
-
-
-def escape_perl(file):
-    ret = ''
-    for line in file:
-        # Escape " and \, strip empty space, shove in C strings.
-        ret += '"' + line.strip().replace('\\', '\\\\').replace('"', '\\"') + '\\n"\n'
-    return ret
-
-
-with open(out_file, 'w') as o:
-    o.write('"BEGIN {\\n"\n')
-    for in_file in in_files:
-        o.write("\"$INC{{'{}'}} = 'Compiled into the plugin.';\\n\"\n".format(basename(in_file)))
-    o.write('"}\\n"\n')
-
-    for in_file in in_files:
-        o.write('"{\\n"\n')
-        o.write('"#line 1 \\"{}\\"\\n"\n'.format(basename(in_file)))
-        with open(in_file) as i:
-            o.write(escape_perl(i))
-        o.write('"}\\n"\n')
--- a/plugins/perl/meson.build
+++ b/plugins/perl/meson.build
@@ -1,83 +0,0 @@
-generate_perl_header = find_program('generate_header.py')
-
-hexchat_perl_module = custom_target('hexchat-perl-header',
-  input: [
-    'lib/HexChat.pm',
-    'lib/Xchat.pm',
-    'lib/HexChat/Embed.pm',
-    'lib/HexChat/List/Network.pm',
-    'lib/HexChat/List/Network/Entry.pm',
-    'lib/HexChat/List/Network/AutoJoin.pm',
-  ],
-  output: 'hexchat.pm.h',
-  command: [generate_perl_header, '@OUTPUT@', '@INPUT@']
-)
-
-irc_perl_module = custom_target('irc-perl-header',
-  input: 'lib/IRC.pm',
-  output: 'irc.pm.h',
-  command: [generate_perl_header, '@OUTPUT@', '@INPUT@']
-)
-
-perl = find_program('perl')
-
-ret = run_command([perl, '-MExtUtils::Embed', '-e', 'ccopts'])
-if ret.returncode() != 0
-  error('perl: Failed to get cflags')
-endif
-perl_cflags = []
-foreach flag : ret.stdout().strip().split(' ')
-  if flag.startswith('-I') or flag.startswith('-D')
-    perl_cflags += flag
-  endif
-endforeach
-
-ret = run_command([perl, '-MExtUtils::Embed', '-e', 'ldopts'])
-if ret.returncode() != 0
-  error('perl: Failed to get ldflags')
-endif
-perl_ldflags = []
-perl_rpath = ''
-foreach flag : ret.stdout().strip().split(' ')
-  if flag.startswith('-L') or flag.startswith('-l')
-    perl_ldflags += flag
-  endif
-  if flag.startswith('-Wl,-rpath,')
-    # Install rpath
-    split = flag.split(',')
-    perl_rpath = split[split.length() - 1]
-
-    # For in tree
-    perl_ldflags += flag
-  endif
-endforeach
-
-perl_cflags += [
-  # Perl has its own 'config.h' that we must override
-  # TODO: Just rename ours to something more unique.
-  '-include', meson.build_root() + '/config.h'
-]
-
-if not cc.links('''
-#define PERL_NO_INLINE_FUNCTIONS
-#include <EXTERN.h>
-#include <perl.h>
-
-int main(void) {
-  PerlInterpreter *my_perl = perl_alloc();
-  return 0;
-}
-''', args: perl_cflags + perl_ldflags)
-  error('found perl not suitable for plugin')
-endif
-
-shared_module('perl',
-  sources: ['perl.c', hexchat_perl_module, irc_perl_module],
-  dependencies: [libgio_dep, hexchat_plugin_dep],
-  c_args: perl_cflags,
-  link_args: perl_ldflags,
-  install: true,
-  install_dir: plugindir,
-  install_rpath: perl_rpath,
-  name_prefix: '',
-)
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@@ -27,9 +27,8 @@
 #ifdef ENABLE_NLS
 #include <locale.h>
 #endif
-#ifdef G_OS_WIN32
+#ifdef WIN32
 #include <windows.h>
-#include <stdbool.h>
 #else
 #include <dirent.h>
 #endif
@@ -44,7 +43,7 @@ static hexchat_plugin *ph;		  /* plugin handle */

 static int perl_load_file (char *script_name);

-#ifdef G_OS_WIN32
+#ifdef WIN32
 /* STRINGIFY is from perl's CORE/config.h */
 #ifndef PERL_REQUIRED_VERSION
 	#define PERL_REQUIRED_VERSION STRINGIFY(PERL_REVISION) "." STRINGIFY(PERL_VERSION)
@@ -75,7 +74,7 @@ thread_mbox (char *str)

 /* leave this before XSUB.h, to avoid readdir() being redefined */

-#ifdef G_OS_WIN32
+#ifdef WIN32
 static void
 perl_auto_load_from_path (const char *path)
 {
@@ -130,7 +129,7 @@ perl_auto_load (void *unused)
 {
 	const char *xdir;
 	char *sub_dir;
-#ifdef G_OS_WIN32
+#ifdef WIN32
 	int copied = 0;
 	char *slash = NULL;
 #endif
@@ -208,6 +207,8 @@ get_filename (char *word[], char *word_eol[])
 	int len;
 	char *file;

+	len = strlen (word[2]);
+
 	/* if called as /load "filename.pl" the only difference between word and
 	 * word_eol will be the two quotes
 	 */
@@ -1019,7 +1020,7 @@ XS (XS_HexChat_hook_fd)
 		package = ST (4);
 		data = NULL;

-#ifdef G_OS_WIN32
+#ifdef WIN32
 		if ((flags & HEXCHAT_FD_NOTSOCKET) == 0) {
 			/* this _get_osfhandle if from win32iop.h in the perl distribution,
 			 *  not the one provided by Windows
@@ -1434,7 +1435,7 @@ perl_init (void)
 static int
 perl_load_file (char *filename)
 {
-#ifdef G_OS_WIN32
+#ifdef WIN32
 	static HMODULE lib = NULL;

 	if (!lib) {
--- a/plugins/perl/perl.vcxproj
+++ b/plugins/perl/perl.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(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>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;HAS_BOOL;$(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
@@ -0,0 +1,9 @@
+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
+
--- a/plugins/python/meson.build
+++ b/plugins/python/meson.build
@@ -1,13 +0,0 @@
-python_opt = get_option('with-python')
-if python_opt.startswith('python3')
-  python_dep = dependency(python_opt, version: '>= 3.3')
-else
-  python_dep = dependency(python_opt, version: '>= 2.7')
-endif
-
-shared_module('python', 'python.c',
-  dependencies: [libgio_dep, hexchat_plugin_dep, python_dep],
-  install: true,
-  install_dir: plugindir,
-  name_prefix: '',
-)
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -59,7 +59,7 @@
 #include <stdlib.h>
 #include <sys/types.h>

-#ifdef G_OS_WIN32
+#ifdef WIN32
 #include <direct.h>
 #else
 #include <unistd.h>
@@ -69,8 +69,6 @@
 #include "hexchat-plugin.h"
 #undef _POSIX_C_SOURCE	/* Avoid warnings from /usr/include/features.h */
 #undef _XOPEN_SOURCE
-#undef HAVE_MEMRCHR /* Avoid redefinition in Python.h */
-#undef HAVE_STRINGS_H
 #include <Python.h>
 #include <structmember.h>
 #include <pythread.h>
@@ -106,7 +104,7 @@
 #define PyUnicode_FromString PyString_FromString
 #define PyUnicode_AsUTF8 PyString_AsString

-#ifdef G_OS_WIN32
+#ifdef WIN32
 #undef WITH_THREAD
 #endif
 #endif
@@ -570,7 +568,7 @@ Callback_Server(char *word[], char *word_eol[], hexchat_event_attrs *attrs, void
 	PyObject *retobj;
 	PyObject *word_list, *word_eol_list;
 	PyObject *attributes;
-	int ret = HEXCHAT_EAT_NONE;
+	int ret = 0;
 	PyObject *plugin;

 	plugin = hook->plugin;
@@ -579,13 +577,13 @@ Callback_Server(char *word[], char *word_eol[], hexchat_event_attrs *attrs, void
 	word_list = Util_BuildList(word);
 	if (word_list == NULL) {
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}
 	word_eol_list = Util_BuildList(word_eol);
 	if (word_eol_list == NULL) {
 		Py_DECREF(word_list);
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}

 	attributes = Attribute_New(attrs);
@@ -621,7 +619,7 @@ Callback_Command(char *word[], char *word_eol[], void *userdata)
 	Hook *hook = (Hook *) userdata;
 	PyObject *retobj;
 	PyObject *word_list, *word_eol_list;
-	int ret = HEXCHAT_EAT_NONE;
+	int ret = 0;
 	PyObject *plugin;

 	plugin = hook->plugin;
@@ -630,13 +628,13 @@ Callback_Command(char *word[], char *word_eol[], void *userdata)
 	word_list = Util_BuildList(word);
 	if (word_list == NULL) {
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}
 	word_eol_list = Util_BuildList(word_eol);
 	if (word_eol_list == NULL) {
 		Py_DECREF(word_list);
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}

 	retobj = PyObject_CallFunction(hook->callback, "(OOO)", word_list,
@@ -667,7 +665,7 @@ Callback_Print_Attrs(char *word[], hexchat_event_attrs *attrs, void *userdata)
 	PyObject *word_list;
 	PyObject *word_eol_list;
 	PyObject *attributes;
-	int ret = HEXCHAT_EAT_NONE;
+	int ret = 0;
 	PyObject *plugin;

 	plugin = hook->plugin;
@@ -676,13 +674,13 @@ Callback_Print_Attrs(char *word[], hexchat_event_attrs *attrs, void *userdata)
 	word_list = Util_BuildList(word);
 	if (word_list == NULL) {
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}
 	word_eol_list = Util_BuildEOLList(word);
 	if (word_eol_list == NULL) {
 		Py_DECREF(word_list);
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}

 	attributes = Attribute_New(attrs);
@@ -716,7 +714,7 @@ Callback_Print(char *word[], void *userdata)
 	PyObject *retobj;
 	PyObject *word_list;
 	PyObject *word_eol_list;
-	int ret = HEXCHAT_EAT_NONE;
+	int ret = 0;
 	PyObject *plugin;

 	plugin = hook->plugin;
@@ -725,13 +723,13 @@ Callback_Print(char *word[], void *userdata)
 	word_list = Util_BuildList(word);
 	if (word_list == NULL) {
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}
 	word_eol_list = Util_BuildEOLList(word);
 	if (word_eol_list == NULL) {
 		Py_DECREF(word_list);
 		END_PLUGIN(plugin);
-		return HEXCHAT_EAT_NONE;
+		return 0;
 	}

 	retobj = PyObject_CallFunction(hook->callback, "(OOO)", word_list,
@@ -790,7 +788,7 @@ static int
 Callback_ThreadTimer(void *userdata)
 {
 	RELEASE_XCHAT_LOCK();
-#ifndef G_OS_WIN32
+#ifndef WIN32
 	usleep(1);
 #endif
 	ACQUIRE_XCHAT_LOCK();
@@ -1530,7 +1528,7 @@ Plugin_New(char *filename, PyObject *xcoobj)
 	PySys_SetObject("stderr", xcoobj);

 	if (filename) {
-#ifdef G_OS_WIN32
+#ifdef WIN32
 		char *file;
 		if (!g_file_get_contents_utf8(filename, &file, NULL, NULL)) {
 			hexchat_printf(ph, "Can't open file %s: %s\n",
@@ -1851,7 +1849,7 @@ Module_hexchat_pluginpref_get(PyObject *self, PyObject *args)
 			BEGIN_XCHAT_CALLS(NONE);
 			retint = hexchat_pluginpref_get_int(prefph, var);
 			END_XCHAT_CALLS();
-			if ((retint == -1) && (strcmp(retstr, "-1") != 0))
+			if ((retint == 0) && (strcmp(retstr, "0") != 0))
 				ret = PyUnicode_FromString(retstr);
 			else
 				ret = PyLong_FromLong(retint);
@@ -2510,9 +2508,9 @@ IInterp_Cmd(char *word[], char *word_eol[], void *userdata)
 	if (channel && channel[0] == '>' && strcmp(channel, ">>python<<") == 0) {
 		hexchat_printf(ph, ">>> %s\n", word_eol[1]);
 		IInterp_Exec(word_eol[1]);
-		return HEXCHAT_EAT_HEXCHAT;
+		return 1;
 	}
-	return HEXCHAT_EAT_NONE;
+	return 0;
 }


--- a/plugins/python/python2.vcxproj
+++ b/plugins/python/python2.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/python/python3.vcxproj
+++ b/plugins/python/python3.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python3Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(Python3Path)\include;..\..\src\common;$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/sysinfo/Makefile.am
+++ b/plugins/sysinfo/Makefile.am
@@ -0,0 +1,17 @@
+libdir = $(hexchatlibdir)
+
+sources = sysinfo.c format.c shared/df.c
+
+if PLATFORM_OSX
+sources += osx/backend.m
+else
+sources += unix/backend.c unix/match.c unix/parse.c unix/pci.c
+endif
+
+EXTRA_DIST = osx unix win32 shared format.h sysinfo.h sysinfo-backend.h
+
+lib_LTLIBRARIES = sysinfo.la
+sysinfo_la_SOURCES = $(sources)
+sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+sysinfo_la_LIBADD = $(LIBPCI_LIBS) $(GLIB_LIBS)
+AM_CPPFLAGS = $(LIBPCI_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common -I$(srcdir)/shared
--- a/plugins/sysinfo/format.c
+++ b/plugins/sysinfo/format.c
@@ -74,7 +74,7 @@ sysinfo_format_disk (guint64 total, guint64 free)
 	char *total_fmt, *free_fmt, *used_fmt, *ret;
 	GFormatSizeFlags format_flags = G_FORMAT_SIZE_DEFAULT;

-#ifdef G_OS_WIN32 /* Windows uses IEC size (with SI format) */
+#ifdef WIN32 /* Windows uses IEC size (with SI format) */
 	format_flags = G_FORMAT_SIZE_IEC_UNITS;
 #endif

--- a/plugins/sysinfo/meson.build
+++ b/plugins/sysinfo/meson.build
@@ -1,53 +0,0 @@
-sysinfo_sources = [
-  'format.c',
-  'sysinfo.c',
-]
-
-sysinfo_deps = [
-  libgio_dep,
-  hexchat_plugin_dep
-]
-
-sysinfo_includes = []
-sysinfo_cargs = []
-
-system = host_machine.system()
-if system == 'linux' or system == 'darwin'
-  sysinfo_includes += 'shared'
-  sysinfo_sources += [
-    'shared/df.c'
-  ]
-
-  if system == 'linux'
-    libpci = dependency('libpci')
-    sysinfo_deps += libpci
-    sysinfo_includes += 'unix'
-    sysinfo_sources += [
-      'unix/backend.c',
-      'unix/match.c',
-      'unix/parse.c',
-      'unix/pci.c',
-    ]
-
-    picidsdir = libpci.get_pkgconfig_variable('idsdir')
-    pciids = join_paths(picidsdir, 'pci.ids')
-    sysinfo_cargs += '-DPCIIDS_FILE="@0@"'.format(pciids)
-  elif system == 'darwin'
-    add_languages('objc')
-    sysinfo_sources += 'osx/backend.m'
-  endif
-
-elif system == 'windows'
-  sysinfo_sources += 'win32/backend.c'
-else
-  error('sysinfo: Unknown system?')
-endif
-
-shared_module('sysinfo', sysinfo_sources,
-  dependencies: sysinfo_deps,
-  include_directories: include_directories(sysinfo_includes),
-  c_args: sysinfo_cargs,
-  install: true,
-  install_dir: plugindir,
-  name_prefix: '',
-)
--- a/plugins/sysinfo/osx/backend.m
+++ b/plugins/sysinfo/osx/backend.m
@@ -78,22 +78,10 @@ get_os (void)
 static char *
 get_os_fallback (void)
 {
-#if !defined (MAC_OS_X_VERSION_10_9) || MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_9
-	SInt32 ver_major = 0,
-	       ver_minor = 0,
-	       ver_patch = 0;
-
-	Gestalt (gestaltSystemVersionMajor, &ver_major);
-	Gestalt (gestaltSystemVersionMinor, &ver_minor);
-	Gestalt (gestaltSystemVersionBugFix, &ver_patch);
-
-	return g_strdup_printf ("OS X %d.%d.%d", ver_major, ver_minor, ver_patch);
-#else
 	NSProcessInfo *info = [NSProcessInfo processInfo];
 	NSOperatingSystemVersion version = [info operatingSystemVersion];

 	return g_strdup_printf ("OS X %ld.%ld.%ld", version.majorVersion, version.minorVersion, version.patchVersion);
-#endif
 }
 char *
 sysinfo_backend_get_os(void)
--- a/plugins/sysinfo/sysinfo.c
+++ b/plugins/sysinfo/sysinfo.c
@@ -133,6 +133,16 @@ print_info (char *info, gboolean announce)
 	hexchat_print (ph, _("Sysinfo: No info by that name\n"));
 }

+/*
+ * Simple wrapper for backend specific options.
+ * Ensure dest >= 512.
+ */
+int
+sysinfo_get_str_pref (const char *pref, char *dest)
+{
+	return hexchat_pluginpref_get_str (ph, pref, dest);
+}
+
 static gboolean
 sysinfo_get_bool_pref (const char *pref, gboolean def)
 {
@@ -174,6 +184,24 @@ sysinfo_set_pref (char *key, char *value)
 		sysinfo_set_pref_real (key, value, DEFAULT_ANNOUNCE);
 		return;
 	}
+#ifdef HAVE_LIBPCI
+	else if (!strcmp (key, "pciids"))
+	{
+		if (value && value[0])
+		{
+			hexchat_pluginpref_set_str (ph, "pciids", value);
+			hexchat_printf (ph, _("Sysinfo: pciids is set to: %s\n"), value);
+		}
+		else
+		{
+			char buf[512];
+			if (hexchat_pluginpref_get_str (ph, "pciids", buf) == 0)
+				strcpy (buf, DEFAULT_PCIIDS);
+			hexchat_printf (ph, _("Sysinfo: pciids is set to: %s\n"), buf);
+		}
+		return;
+	}
+#endif
 	else if (g_str_has_prefix (key, "hide_"))
 	{
 		int i;
--- a/plugins/sysinfo/sysinfo.h
+++ b/plugins/sysinfo/sysinfo.h
@@ -22,5 +22,8 @@
 #define SYSINFO_H

 #define bsize 1024
+#define DEFAULT_PCIIDS "/usr/share/hwdata/pci.ids"
+
+int sysinfo_get_str_pref (const char *name, char *dest);

 #endif
--- a/plugins/sysinfo/sysinfo.vcxproj
+++ b/plugins/sysinfo/sysinfo.vcxproj
@@ -30,7 +30,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(DepsRoot)\include;$(Glib);$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    </ClCompile>
@@ -43,7 +43,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SYSINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(DepsRoot)\include;$(Glib);$(HexChatLib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
    </ClCompile>
--- a/plugins/sysinfo/unix/backend.c
+++ b/plugins/sysinfo/unix/backend.c
@@ -60,7 +60,7 @@ char *sysinfo_backend_get_memory(void)
 	{
 		return NULL;
 	}
-	if (xs_parse_meminfo (&swap_total, &swap_free, 1) != 1 && swap_total != 0)
+	if (xs_parse_meminfo (&swap_total, &swap_free, 1) != 1)
 	{
 		swap_fmt = sysinfo_format_memory (swap_total, swap_free);
 	}
--- a/plugins/sysinfo/unix/parse.c
+++ b/plugins/sysinfo/unix/parse.c
@@ -40,37 +40,32 @@ int xs_parse_cpu(char *model, char *vendor, double *freq)
 #if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__alpha__) || defined(__ia64__) || defined(__parisc__) || defined(__sparc__)
 	char buffer[bsize];
 #endif
-	FILE *fp;
-
-	fp = fopen("/proc/cpuinfo", "r");
+#if defined(__powerpc__)
+	char *pos = NULL;
+#endif
+	FILE *fp = fopen("/proc/cpuinfo", "r");
 	if(fp == NULL)
 		return 1;
-
-#if defined(__i386__) || defined(__x86_64__)
-
+	
+	#if defined(__i386__) || defined(__x86_64__)
 	while(fgets(buffer, bsize, fp) != NULL)
 	{
 		find_match_char(buffer, "model name", model);
 		find_match_char(buffer, "vendor_id", vendor);
 		find_match_double(buffer, "cpu MHz", freq);
 	}
-
-#elif defined(__powerpc__)
+	#endif
+	#ifdef __powerpc__
+	while(fgets(buffer, bsize, fp) != NULL)
 	{
-		char *pos;
-
-		while(fgets(buffer, bsize, fp) != NULL)
-		{
-			find_match_char(buffer, "cpu", model);
-			find_match_char(buffer, "machine", vendor);
-			find_match_double(buffer, "clock", freq);
-		}
-		pos = strstr(model, ",");
-		if (pos != NULL)
-		    *pos = '\0';
+		find_match_char(buffer, "cpu", model);
+		find_match_char(buffer, "machine", vendor);
+		find_match_double(buffer, "clock", freq);
 	}
-#elif defined( __alpha__)
-
+	pos = strstr(model, ",");
+	if (pos != NULL) *pos = '\0';
+	#endif
+	#ifdef __alpha__
 	while(fgets(buffer, bsize, fp) != NULL)
 	{
 		find_match_char(buffer, "cpu model", model);
@@ -78,47 +73,37 @@ int xs_parse_cpu(char *model, char *vendor, double *freq)
 		find_match_double(buffer, "cycle frequency [Hz]", freq);
 	}
 	*freq = *freq / 1000000;
-
-#elif defined(__ia64__)
-
+	#endif
+	#ifdef __ia64__
 	while(fgets(buffer, bsize, fp) != NULL)
 	{
 		find_match_char(buffer, "model", model);
 		find_match_char(buffer, "vendor", vendor);
 		find_match_double(buffer, "cpu MHz", freq);
 	}
-
-#elif defined(__parisc__)
-
+	#endif
+	#ifdef __parisc__
 	while(fgets(buffer, bsize, fp) != NULL)
 	{
 		find_match_char(buffer, "cpu  ", model);
 		find_match_char(buffer, "cpu family", vendor);
 		find_match_double(buffer, "cpu MHz", freq);
 	}
-
-#elif defined(__sparc__)
-    {
-	    DIR *dir;
-	    struct dirent *entry;
-	    FILE *fp2;
-
-	    while(fgets(buffer, bsize, fp) != NULL)
-	    {
-		    find_match_char(buffer, "cpu	", model);
-		    find_match_char(buffer, "type	", vendor);
-		    find_match_double_hex(buffer, "Cpu0ClkTck", freq);
-	    }
-	    *freq = *freq / 1000000;
-    }
-#else
-
-    fclose(fp);
-    return 1; /* Unsupported */
-
-#endif
-
+	#endif
+	#ifdef __sparc__
+	DIR *dir;
+	struct dirent *entry;
+	FILE *fp2;
+	while(fgets(buffer, bsize, fp) != NULL)
+	{
+		find_match_char(buffer, "cpu	", model);
+		find_match_char(buffer, "type	", vendor);
+		find_match_double_hex(buffer, "Cpu0ClkTck", freq);
+	}
+	*freq = *freq / 1000000;
+	#endif
 	fclose(fp);
+	
 	return 0;
 }

@@ -256,7 +241,19 @@ int xs_parse_distro(char *name)
 	FILE *fp = NULL;
 	char buffer[bsize], *pos = NULL;

-	if((fp = fopen("/etc/redhat-release", "r")) != NULL)
+	if((fp = fopen("/etc/portage/make.conf", "r")) != NULL ||
+			(fp = fopen("/etc/make.conf", "r")) != NULL)
+	{
+		char keywords[bsize];
+		while(fgets(buffer, bsize, fp) != NULL)
+			find_match_char(buffer, "ACCEPT_KEYWORDS", keywords);
+		/* cppcheck-suppress uninitvar */
+		if (strstr(keywords, "\"") == NULL)
+			g_snprintf(buffer, bsize, "Gentoo Linux (stable)");
+		else
+			g_snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
+	}
+	else if((fp = fopen("/etc/redhat-release", "r")) != NULL)
 		fgets(buffer, bsize, fp);
 	else if((fp = fopen("/etc/mageia-release", "r")) != NULL)
 		fgets(buffer, bsize, fp);
@@ -290,18 +287,6 @@ int xs_parse_distro(char *name)
 		fgets(release, bsize, fp);
 		g_snprintf(buffer, bsize, "Debian %s", release);
 	}
-	else if((fp = fopen("/etc/portage/make.conf", "r")) != NULL ||
-			(fp = fopen("/etc/make.conf", "r")) != NULL)
-	{
-		char keywords[bsize];
-		while(fgets(buffer, bsize, fp) != NULL)
-			find_match_char(buffer, "ACCEPT_KEYWORDS", keywords);
-		/* cppcheck-suppress uninitvar */
-		if (strstr(keywords, "\"") == NULL)
-			g_snprintf(buffer, bsize, "Gentoo Linux (stable)");
-		else
-			g_snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
-	}
 	else
 		g_snprintf(buffer, bsize, "Unknown Distro");
 	if(fp != NULL)
--- a/plugins/sysinfo/unix/pci.c
+++ b/plugins/sysinfo/unix/pci.c
@@ -122,8 +122,11 @@ void pci_find_fullname(char *fullname, char *vendor, char *device)
 	char *position;
 	int cardfound = 0;
 	FILE *fp;
+	
+	if (!sysinfo_get_str_pref ("pciids", buffer))
+		strcpy (buffer, DEFAULT_PCIIDS);

-	fp = fopen (PCIIDS_FILE, "r");
+	fp = fopen (buffer, "r");
 	if(fp == NULL)
 	{
 		g_snprintf(fullname, bsize, "%s:%s", vendor, device);
--- a/plugins/upd/meson.build
+++ b/plugins/upd/meson.build
@@ -1,8 +0,0 @@
-winsparkle_dep = cc.find_library('WinSparkle')
-
-shared_module('upd', 'upd.c',
-  dependencies: [winsparkle_dep, hexchat_plugin_dep],
-  install: true,
-  install_dir: plugindir,
-  name_prefix: '',
-)
--- a/plugins/upd/upd.vcxproj
+++ b/plugins/upd/upd.vcxproj
@@ -29,7 +29,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(WinSparklePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
@@ -40,7 +40,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..\..\src\common;$(WinSparklePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
--- a/plugins/winamp/meson.build
+++ b/plugins/winamp/meson.build
@@ -1,6 +0,0 @@
-shared_module('winamp', 'winamp.c',
-  dependencies: [libgio_dep, hexchat_plugin_dep],
-  install: true,
-  install_dir: plugindir,
-  name_prefix: '',
-)
--- a/plugins/winamp/winamp.vcxproj
+++ b/plugins/winamp/winamp.vcxproj
@@ -29,12 +29,12 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup>
--- a/po/Makevars
+++ b/po/Makevars
@@ -0,0 +1,7 @@
+DOMAIN = $(PACKAGE)
+subdir = po
+top_builddir = ..
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+COPYRIGHT_HOLDER = 
+MSGID_BUGS_ADDRESS = www.hexchat.org
+EXTRA_LOCALE_CATEGORIES =
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +0,0 @@
-data/misc/hexchat.desktop.in.in
--- a/po/af.po
+++ b/po/af.po
--- a/po/am.po
+++ b/po/am.po
--- a/po/ast.po
+++ b/po/ast.po
--- a/po/az.po
+++ b/po/az.po
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/Show More
+++ b/Show More