Enable updates to 2.9.1

Add info about HexChat changelog
Update XChat to r1521 part 2
2012-07-27 17:06:36 +02:00 · 2012-07-27 17:00:23 +02:00 · 2012-07-27 11:49:11 +02:00 · 2012-07-27 11:47:49 +02:00 · 2012-07-27 11:37:14 +02:00 · 2012-07-27 00:35:40 +02:00
227 changed files with 4114 additions and 2669 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,11 +1,52 @@
-# git ignore file
-plugins/wmpa/wmpa_h.h
-plugins/wmpa/wmpa_i.c
-src/pixmaps/inline_pngs.h
-src/htm/obj/*
-win32/build/*
-win32/ipch/*
-win32/hexchat.opensdf
-win32/hexchat.sdf
-win32/hexchat.suo
-resource.h
+# git ignore file
+# Unix generated files
+.deps/
+.libs/
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+intl/
+libtool
+ltmain.sh
+missing
+plugins/perl/irc.pm.h
+plugins/perl/xchat.pm.h
+po/Makefile.in.in
+po/POTFILES
+po/hexchat.pot
+po/remove-potcdate.sed
+po/stamp-po
+src/common/dbus/example
+src/common/dbus/marshallers.h
+src/common/dbus/org.hexchat.service.service
+src/common/dbus/remote-object-glue.h
+src/fe-gtk/hexchat
+stamp-h1
+*.a
+*.o
+*.la
+*.lo
+*.gmo
+*.po~
+# Win32 generated files
+plugins/wmpa/wmpa_h.h
+plugins/wmpa/wmpa_i.c
+src/pixmaps/inline_pngs.h
+src/htm/obj/*
+win32/build/*
+win32/ipch/*
+win32/hexchat.opensdf
+win32/hexchat.sdf
+win32/hexchat.suo
+resource.h
+*.user
--- a/0
+++ b/0
--- a/2
+++ b/2
@ -1,3 +1,5 @@
+For the HexChat changelog, see http://www.hexchat.org/home/changelog
+
  .----------------------.
 --|   X-Chat ChangeLog   |--------------------------------------------
  `----------------------'
--- a/16
+++ b/16
@ -1,4 +1,4 @@
-Just some tips if you're going to help with xchat code (patches etc):
+Just some tips if you're going to help with HexChat code (patches etc):

 * Use tabs, not spaces, to indent code.

@ -32,20 +32,20 @@ routine (void)

 * Please provide unified format diffs (run diff -u).

-* Call your patch something more meaningfull than xchat.diff (I get a
+* Call your patch something more meaningfull than hexchat.diff (I get a
  million of these files!).

 * To make a really nice and clean patch, do something like this:

 Have two directories, unpacked from the original archive:
-xchat-2.0.0/
-xchat-2.0.0p1/
-Then edit/compile the xchat-2.0.0p1 directory. When you're done, make
+hexchat-2.0.0/
+hexchat-2.0.0p1/
+Then edit/compile the hexchat-2.0.0p1 directory. When you're done, make
 a patch with:

-cd xchat-2.0.0p1
+cd hexchat-2.0.0p1
 make distclean
 cd ..
-diff -urN xchat-2.0.0 xchat-2.0.0p1 > xchat-something.diff
+diff -urN hexchat-2.0.0 hexchat-2.0.0p1 > hexchat-something.diff

-If using nmake (Windows) replace "make distclean" with "nmake -f makefile.msc clean"
+If using nmake (Windows) replace "make distclean" with "nmake -f makefile.msc clean"
--- a/49
+++ b/49
@ -1,49 +0,0 @@
-X-Chat Requirements:
-~~~~~~~~~~~~~~~~~~~~
-
-	- GTK 2.6+  (it comes with your Linux)
-
- Optional:
-
-	- Perl                (http://www.perl.org)
-	- Python              (http://www.python.org)
-	- TCL                 (http://tcl.activestate.com)
-	- OpenSSL             (http://www.openssl.org)
-
-
-
-X-Chat Compiling and Installation:
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Type this:
-
-	./configure
-	make
-
-Become root and type:
-
-	make install
-
-
-Other Options
-~~~~~~~~~~~~~
-
-To get a full list of compile options, type:
-
-	./configure --help
-
-
-If you do not have GNU Gettext installed, instead use:
-
-	./configure --disable-nls
-
-
-If you want to disable Perl you can do:
-
-	./configure --disable-perl
-
-
-If you want to install a smaller stripped binary (without debug) do:
-
-	make install-strip
-
--- a/INSTALL.w32
+++ b/INSTALL.w32
@ -1,117 +0,0 @@
-COMPILING ON WIN32
-~~~~~~~~~~~~~~~~~~
-It is not easy! Be warned! You need either one of these compilers:
-
-	* Mingw (http://www.mingw.org)
-	* MS Visual C
-
-Note: This source code is meant for Linux/Unix like systems. Compiling this for
-Windows will produce a below-par quality product. The official XChat for Windows
-is not built with this unix source code.
-
-
-Getting GTK
-~~~~~~~~~~~
-
-You also need GTK+ 2.10 for win32. Altough the GTK packages from the GIMP
-website are larger and harder to install they work very well.
-
-	1) Get the following packages from: 
-	  http://www.gimp.org/~tml/gimp/win32/downloads.html
-
-	  - gtk+-2.4.3.tar.gz
-	  - gtk+-dev-2.4.3.tar.gz
-	  - dirent.zip
-	  - gettext-runtime-0.13.1.zip
-	  - gettext-tools-0.13.1.zip
-	  - atk-1.6.0.zip
-	  - atk-dev-1.6.0.zip
-	  - pango-1.4.0.zip
-	  - pango-dev-1.4.0.zip
-	  - libpng (http://gnuwin32.sourceforge.net/packages/libpng.htm) Binaries & Developer files.
-	  - GNU libiconv (Not source files)
-	  - glib-2.4.2.zip
-	  - glib-dev-2.4.2.zip
-	  - pkgconfig-0.15.zip
-	  - Zlib121-dll.zip
-
-	2) Extract all files to a suitable place such as c:\devtools
-
-	3) Windows 2000, XP & 2003 users:
-	  - Start->(Settings->)Control Panel->System Applet
-	  - Advanced Tab->Environment Variables
-	  - Under "User variables for <user>" append ";C:\devtools" to the end of the PATH Variable
-	  - Click Ok twice and close the Control Panel
-	
-	  For Windows 9x users your basicly on your own for now.
-
-
-Mingw
-~~~~~
-
-	I havn't tried this yet, but ./configure --disable-xlib would be a start.
-
-
-MS Visual C
-~~~~~~~~~~~
-
-	
-	1) Edit src\makeinc.msc
-
-	  You need to change the variables GLIB, GTK and LIBS to point
-	  the correct paths for your harddrive. Use the program pkg-config
-	  to find this information.
-
-	  a) paste the output of `pkg-config glib-2.0 --msvc-syntax --cflags`
-	     to the GLIB = ... line.
-
-	  b) paste the output of `pkg-config gtk+-2.0 --msvc-syntax --cflags`
-	     to the GTK = ... line.
-
-	  c) paste the output of `pkg-config gtk+-2.0 --msvc-syntax --libs`
-	     to the LIBS = ... line.
-
-	2) In MSVC's includes directory, copy io.h to unistd.h.
-
-	MS VC++ 6
-	~~~~~~~~~
-
-		3) Download Platform SDK from http://www.microsoft.com/msdownload/platformsdk/sdkupdate/
-		  (you only need Core SDK) - ~200 MB Download (Be warned).
-		4) Open the build enviroment.
-		 
-		  a) If your planning on developing modifications to the xchat code go:
-		     Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Debug)
-
-		  b) If your compiling just to use xchat and wish to no recieve debug messages:
-		     Start->Programs->Microsoft Platform SDK...->Open Build Enviroment...->(Choose OS)->... (Retail)
-		5) Change directory into where you have download the xchat source to and type this:
-		  cd src
-		  nmake -f makefile.msc clean
-		  nmake -f makefile.msc
-		6) Copy fe-gtk\xchat.exe to another place.
-	MS VC++ 7 (.NET)
-	~~~~~~~~~~~~~~~~
-
-		3) Open the Visual Studio .NET Command Prompt
-		 
-		4) Change directory into where you have download the xchat source to and type this:
-		  cd src
-		  nmake -f makefile.msc clean
-		  nmake -f makefile.msc
-		5) Copy fe-gtk\xchat.exe to another place.
-	
-
-Common problems:
-~~~~~~~~~~~~~~~~
-
- * gdk-pixbuf-csource must be in PATH.
-   FIX: See step 3 for setting up GTK
-
- * You might need to install dirent.zip manually.
-   FIX: Copy C:\devtools\include\dirent.h to C:\devtools\include\glib-2.0\dirent.h
-
- * Include path to libintl.h should be in GLIB= (makeinc.msc).
-   FIX: Copy C:\devtools\include\libintl.h to C:\devtools\include\glib-2.0\libintl.h
-
-
--- a/76
+++ b/76
@ -1,38 +1,42 @@
-X-Chat README
+HexChat README
 ~~~~~~~~~~~~~
 X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny.
+ HexChat ("hexchat") Copyright (c) 2009-2012 By Berke Viktor.

 This program is released under the GPL v2 with the additional exemption
 that compiling, linking, and/or using OpenSSL is allowed. You may
 provide binary packages linked to the OpenSSL libraries, provided that
- all other requirements of the GPL are met. 
+ all other requirements of the GPL are met.
 See file COPYING for details.

+ For building instructions, see http://www.hexchat.org/developers/building
+

 What is it?
 ~~~~~~~~~~~
- X-Chat is an IRC client for UNIX operating systems. I.R.C. is Internet
+ HexChat is an IRC client for UNIX operating systems. I.R.C. is Internet
 Relay Chat, see http://irchelp.org for more information about IRC in
- general. Xchat runs on most BSD and POSIX compliant operating systems.
+ general. HexChat runs on most BSD and POSIX compliant operating systems.


 Requirements:
 ~~~~~~~~~~~~~
- * GTK+ 2.10 (this is available at http://www.gtk.org).
+ * GTK+ 2.10 (this is available at http://www.gtk.org)
+ * GLib 2.12 (GTK+ 2.10 requires GLib 2.12)

- X-Chat is known to work on, at least:
+ HexChat is known to work on, at least:

-	* Linux
-	* FreeBSD
-	* OpenBSD
-	* NetBSD
-	* Solaris
-	* AIX
-	* IRIX
-	* DEC/Compaq Tru64 UNIX
-	* HP-UX 10.20 and 11
-	* MacOS X
-	* Windows XP/2000/Vista/7
+ * Windows XP/Vista/7/8
+ * Linux
+ * FreeBSD
+ * OpenBSD
+ * NetBSD
+ * Solaris
+ * AIX
+ * IRIX
+ * DEC/Compaq Tru64 UNIX
+ * HP-UX 10.20 and 11
+ * MacOS X


 Notes for packagers:
@ -53,37 +57,45 @@ Python Scripts:

 Perl Scripts:
 ~~~~~~~~~~~~~
+ Perl 5.8 or newer is required.
 Scripts for 1.8.x are compatible with the following exceptions:

-* IRC::command will not interpret %C, %B, %U etc.
+ * IRC::command will not interpret %C, %B, %U etc.

-* user_list and user_list_short:
+ * user_list and user_list_short:
  If a user has both op and voice, only the op flag will be 1.

-* add_user_list/sub_user_list/clear_user_list
+ * add_user_list/sub_user_list/clear_user_list
  These functions do nothing.

-* notify_list
+ * notify_list
  Not implemented. Always returns an empty list.

-* server_list
+ * server_list
  Lists servers that are not connected aswell.

-* Some print events may have new names and some were added.
+ * Some print events may have new names and some were added.

-* Text printed by scripts must now be UTF8.
+ * Text printed by scripts must now be UTF8.

-* Text passed to scripts (via add_message_handler) will be encoded in UTF8.
+ * Text passed to scripts (via add_message_handler) will be encoded in UTF8.


-Autoloading Perl Scripts and Plugins
+Autoloading Scripts and Plugins
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- * X-Chat automatically loads, at startup:
-	~/.xchat2/*.pl Perl scripts
-	~/.xchat2/*.py Python scripts
-	~/.xchat2/*.so Plugins
-	$(libdir)/xchat/plugins/*.so plugins
-	(this usually translates to /usr/lib/xchat/plugins/*.so)
+ The root of your HexChat config is:
+
+ * Windows: %APPDATA%\HexChat
+ * Unix: ~/.config/hexchat
+
+ Referred to as <config> from now. HexChat automatically loads, at startup:
+
+ * <config>/addons/*.lua Lua scripts
+ * <config>/addons/*.pl Perl scripts
+ * <config>/addons/*.py Python scripts
+ * <config>/addons/*.tcl Tcl scripts
+ * <config>/addons/*.dll Plugins (Windows)
+ * <config>/addons/*.so Plugins (Unix)


 Control Codes:
--- a/autogen.sh
+++ b/autogen.sh
@ -102,7 +102,7 @@ if test "$?" != "0"; then
 	exit 6
 fi

-echo if no errors occured, run ./configure --enable-maintainer-mode
+echo if no errors occured, run ./configure
 exit 0

 #autogen.sh generates:
--- a/config.h
+++ b/config.h
@ -7,13 +7,13 @@
 #define USE_IPV6
 #define HAVE_ISO_CODES
 #define PACKAGE_NAME "hexchat"
-#define PACKAGE_VERSION "2.9.0"
-#define XCHAT_REVISION "1515"
+#define PACKAGE_VERSION "2.9.1"
+#define XCHAT_REVISION "1521"
 #define HEXCHATLIBDIR "."
 #define HEXCHATSHAREDIR "."
 #define OLD_PERL
 #define GETTEXT_PACKAGE "hexchat"
-#define PACKAGE_TARNAME "hexchat-2.9.0"
+#define PACKAGE_TARNAME "hexchat-2.9.1"
 #ifndef USE_IPV6
 #define socklen_t int
 #endif
--- a/configure.in
+++ b/configure.in
@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.

-AC_INIT([HexChat],[2.9.0],[http://www.hexchat.org/],[hexchat])
+AC_INIT([HexChat],[2.9.1],[http://www.hexchat.org/],[hexchat])

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

 AC_CONFIG_HEADERS([config.h])
@ -10,6 +10,7 @@ AC_CONFIG_SRCDIR([configure.in])

 AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define])

+AC_USE_SYSTEM_EXTENSIONS
 AM_MAINTAINER_MODE
 AC_PROG_CC
 AM_PROG_CC_C_O
@ -54,7 +55,7 @@ AH_VERBATIM([USING_LINUX],[#undef USING_LINUX])
 AH_VERBATIM([socklen_t],[#undef socklen_t])
 AH_VERBATIM([USE_DBUS],[#undef USE_DBUS])

-AC_DEFINE([XCHAT_REVISION],["1515"],[XChat SVN Revision])
+AC_DEFINE([XCHAT_REVISION],["1521"],[XChat SVN Revision])

 AC_PATH_PROG(sedpath, sed)
 if test "_$sedpath" = _; then
@ -132,6 +133,22 @@ AC_ARG_ENABLE(plugin,
 [  --disable-plugin        disable plugin support],
        plugin=$enableval, plugin=yes)

+AC_ARG_ENABLE(checksum,
+[  --disable-checksum      disable the Checksum plugin],
+        checksum=$enableval, checksum=yes)
+
+AC_ARG_ENABLE(doat,
+[  --disable-doat          disable the Do At plugin],
+        doat=$enableval, doat=yes)
+
+AC_ARG_ENABLE(fishlim,
+[  --disable-fishlim       disable the FiSHLiM plugin],
+        fishlim=$enableval, fishlim=yes)
+
+AC_ARG_ENABLE(sasl,
+[  --disable-sasl          disable the SASL plugin],
+        sasl=$enableval, sasl=yes)
+
 AC_ARG_ENABLE(dbus,
 [  --disable-dbus          disable DBUS support],
        dbus=$enableval, dbus=yes)
@ -160,7 +177,7 @@ dnl *********************************************************************
 dnl ** GLIB *************************************************************
 dnl *********************************************************************

-AM_PATH_GLIB_2_0(2.0.3, glib=yes, glib=no)
+AM_PATH_GLIB_2_0(2.12.0, glib=yes, glib=no)
 if test "$glib" = no; then
 	AC_MSG_ERROR("Cannot find glib")
 fi
@ -448,6 +465,8 @@ PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [libproxy=yes], [
 	libproxy=no
 ])
 if test "x$libproxy" = "xyes" ; then
+	COMMON_LIBS="$COMMON_LIBS $LIBPROXY_LIBS"
+	COMMON_CFLAGS="$COMMON_CFLAGS $LIBPROXY_CFLAGS"
 	AC_DEFINE(USE_LIBPROXY)
 fi

@ -482,6 +501,78 @@ if test "$plugin" = yes; then
 	fi
 fi

+dnl *********************************************************************
+dnl ** Checksum *********************************************************
+dnl *********************************************************************
+
+if test "$checksum" != "no"; then
+	checksum=no
+	AC_MSG_CHECKING(for plugin interface used by Checksum)
+	if test "$plugin" = yes; then
+		AC_MSG_RESULT([yes])
+		AC_MSG_CHECKING(for OpenSSL used by Checksum)
+		if test "$openssl" = yes; then
+			checksum=yes
+			AC_MSG_RESULT([yes])
+		else
+			AC_MSG_RESULT([OpenSSL cannot be found, use the --enable-openssl option])
+		fi
+	else
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option])
+	fi
+fi
+
+dnl *********************************************************************
+dnl ** DO AT ************************************************************
+dnl *********************************************************************
+
+if test "$doat" != "no"; then
+	AC_MSG_CHECKING(for plugin interface used by Do At)
+	doat=no
+	if test "$plugin" = yes; then
+		doat=yes
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for Do At])
+	fi
+fi
+
+dnl *********************************************************************
+dnl ** FiSHLiM **********************************************************
+dnl *********************************************************************
+
+if test "$fishlim" != "no"; then
+	fishlim=no
+	AC_MSG_CHECKING(for plugin interface used by FiSHLiM)
+	if test "$plugin" = yes; then
+		AC_MSG_RESULT([yes])
+		AC_MSG_CHECKING(for OpenSSL used by FiSHLiM)
+		if test "$openssl" = yes; then
+			fishlim=yes
+			AC_MSG_RESULT([yes])
+		else
+			AC_MSG_RESULT([OpenSSL cannot be found, use the --enable-openssl option])
+		fi
+	else
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option])
+	fi
+fi
+
+dnl *********************************************************************
+dnl ** SASL *************************************************************
+dnl *********************************************************************
+
+if test "$sasl" != "no"; then
+	AC_MSG_CHECKING(for plugin interface used by SASL)
+	sasl=no
+	if test "$plugin" = yes; then
+		sasl=yes
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SASL])
+	fi
+fi
+
 dnl #######################################################################
 dnl # Check for DBUS libraries
 dnl #######################################################################
@ -496,7 +587,7 @@ if test "x$dbus" = "xyes" ; then
 	if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$dbus" = "xno" ; then
 		dbus="no"
 	else
-		COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS $LIBPROXY_LIBS"
+		COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS"
 		COMMON_CFLAGS="$COMMON_CFLAGS $DBUS_CFLAGS"
 		AC_DEFINE(USE_DBUS)
 		AS_AC_EXPAND(DATADIR, $datadir)
@ -575,6 +666,10 @@ AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
 AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
 AM_CONDITIONAL(DO_TCL, test "x$tcl" = "xyes")
 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_SASL, test "x$sasl" = "xyes")
 AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
 AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")

@ -836,28 +931,44 @@ plugins/Makefile
 plugins/python/Makefile
 plugins/perl/Makefile
 plugins/tcl/Makefile
+plugins/checksum/Makefile
+plugins/doat/Makefile
+plugins/fishlim/Makefile
+plugins/sasl/Makefile
 intl/Makefile
 po/Makefile.in
 ])

 echo
-echo hexchat $VERSION
+echo HexChat $VERSION
 echo
-echo Building GTK+ Interface .... : $gtkfe
-echo Building TEXT Interface .... : $textfe
+echo GTK+ interface ........ : $gtkfe
+echo Text interface ........ : $textfe
 echo
-echo PLUGINS: Perl: $perl Python: $python TCL: $tcl
-echo
-echo mmx tinting ......... : $mmx\	spelling .............. : $spell
-echo XShm tinting ........ : $shm\	plugin interface ...... : $plugin
+echo MMX tinting ........... : $mmx
+echo XShm tinting .......... : $shm
 if test "$xft" = no; then
-  echo text backend ........ : pango\	nls/gettext ........... : $USE_NLS
+  echo Text backend .......... : Pango
 else
-  echo text backend ........ : xft\	nls/gettext ........... : $USE_NLS
+  echo Text backend .......... : Xft
 fi
-echo openssl support ..... : $openssl\	ipv6 support .......... : $ipv6
-echo dbus support ........ : $dbus\	msproxy ntlm \(ISA\) .... : $have_ntlm
-echo libnotify support ... : $libnotify
+echo OpenSSL support ....... : $openssl
+echo D-Bus support ......... : $dbus
+echo libnotify support ..... : $libnotify
+echo Spelling .............. : $spell
+echo Plugin interface ...... : $plugin
+echo NLS/gettext ........... : $USE_NLS
+echo IPv6 support .......... : $ipv6
+echo MS Proxy NTLM \(ISA\) ... : $have_ntlm
+echo
+echo Perl .................. : $perl
+echo Python ................ : $python
+echo Tcl ................... : $tcl
+echo
+echo Checksum .............. : $checksum
+echo Do At ................. : $doat
+echo FiSHLiM ............... : $fishlim
+echo SASL .................. : $sasl
 echo
 echo The binary will be installed in $prefix/bin
 echo
--- a/faq.html
+++ b/faq.html
@ -82,6 +82,8 @@ p { margin: 3% }
 <br><br>
 <a href="#q225">25. Where did the Real Name field go?</a>
 <br><br>
+<a href="#q226">26. How do I migrate my settings from XChat?</a>
+<br><br>
 </p>

 <h2>3. Section Three: Contributions, Development and Bugs.</h2>
@ -134,7 +136,7 @@ language support and all menus and GUI will be in English only.</li>
 <p>
 <u>UNIX:</u><br>
    Identd isn't actually apart of HexChat. You will need to download and install
-    your own ident server. Most distributions, including Fedora, come with an 
+    your own ident server. Most distributions, including Fedora, come with an
    ident server program called oidentd. Make sure it is enabled in
    /etc/xinetd.conf or read you distribution's documentation.

@ -147,7 +149,7 @@ language support and all menus and GUI will be in English only.</li>

 <br><h3><a name="q22">2. How do I auto join more than one channel with keys?</a></h3>
 <p>
-   In the Server list's channel column enter multiple channels and separate 
+   In the Server list's channel column enter multiple channels and separate
   them by commas, eg:  "#linux,#warez,#chat". Do not put spaces between the
   channels. If the channels also have keys (passwords), then the syntax is:
   "#channel1,#channel2,#channel3 key1,key2,key3"
@ -522,6 +524,21 @@ the global real name, just issue the following command:
      /set irc_real_name Stewie Griffin
 </pre></blockquote>

+<br><h3><a name="q226">26. How do I migrate my settings from XChat?</a></h3>
+<p>
+<u>UNIX:</u><br />
+    Copy <i>~/.xchat2</i> to <i>~/.config/hexchat</i><br />
+	Rename <i>~/.config/hexchat/xchatlogs</i> to <i>~/.config/hexchat/logs</i><br />
+	Move all your 3rd party scripts/plugins to <i>~/.config/hexchat/addons</i><br />
+	Rename <i>~/.config/hexchat/plugin_*.conf</i> to <i>~/.config/hexchat/addon_*.conf</i><br />
+<br/>
+<u>WINDOWS:</u><br>
+    Copy <i>%APPDATA%\X-Chat 2</i> to <i>%APPDATA%\HexChat</i><br />
+    Rename <i>%APPDATA%\HexChat\xchatlogs</i> to <i>%APPDATA%\HexChat\logs</i><br />
+	Move all your 3rd party scripts/plugins to <i>%APPDATA%\HexChat\addons</i><br />
+	Rename <i>%APPDATA%\HexChat\plugin_*.conf</i> to <i>%APPDATA%\HexChat\addon_*.conf</i><br />
+</p>
+
 <br><h2>3. Section Three: Contributions, Development and Bugs.</h2>

 <br><h3><a name="q31">1. Why does HexChat leak so much memory?</a></h3>
--- a/hexchat-b.svg
+++ b/hexchat-b.svg
@ -0,0 +1,610 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="hexchat4.svg"
+   version="1.0"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64"
+   inkscape:export-filename="D:\Downloads\hexchat3.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2289">
+      <stop
+         style="stop-color:#ff2600;stop-opacity:1;"
+         offset="0"
+         id="stop2291" />
+      <stop
+         style="stop-color:#ffd600;stop-opacity:1;"
+         offset="1"
+         id="stop2293" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1317"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1319"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1320"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-160.10656,-7.1914058)"
+       x1="130.2673"
+       y1="78.743134"
+       x2="129.2081"
+       y2="25.771122" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3011"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3030"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3070"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientTransform="matrix(0.99894925,0,0,0.97549134,-3.1829063,4.465557)" />
+    <filter
+       id="filter3281"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3283"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3285"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3287"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3289"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3291"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3293"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3295"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3297"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3299"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3301"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3303"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4089"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4093"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4096"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4098"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientTransform="translate(-70.003571,-2.298097)" />
+    <filter
+       id="filter4111"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4113"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4115"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4117"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4119"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4121"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter4123"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4125"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4127"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4129"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4131"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4133"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1330"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1328"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1322-5"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1320-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1319-2"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1317-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1337-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1335-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2289-4">
+      <stop
+         id="stop2291-0"
+         offset="0"
+         style="stop-color:#ff2600;stop-opacity:1;" />
+      <stop
+         id="stop2293-9"
+         offset="1"
+         style="stop-color:#ffd600;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,8.0977348,6.9450134)"
+       x1="46.881573"
+       y1="91.824585"
+       x2="48.19709"
+       y2="-1.4575793" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3136"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,-120.3871,-29.360443)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <filter
+       id="filter3138"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3140"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3142"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3144"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3146"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3148"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3055"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94969205,0,0,0.89326813,2.4216955,2.7025635)"
+       x1="31.372862"
+       y1="60.111893"
+       x2="30.769272"
+       y2="4.0104952" />
+    <filter
+       id="filter3057"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3059"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3061"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3063"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3065"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3067"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3069"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3071"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3073"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3075"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3077"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3079"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8.0000001"
+     inkscape:cx="38.519547"
+     inkscape:cy="37.177925"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1270"
+     inkscape:window-height="972"
+     inkscape:window-x="619"
+     inkscape:window-y="10"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Guglielmi David</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Peter Zelezny</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4107"
+       d="m 32.154792,4.6214684 c -6.271873,0.05843 -14.928,0.744277 -16.110377,1.388109 C 13.679661,7.297237 0.77557733,29.32852 0.80334443,31.859522 c 0.02777,2.531005 13.46215957,24.293967 15.85468157,25.537309 2.392519,1.243342 29.481,1.287521 31.845753,-1.41e-4 C 50.868531,56.109028 63.897618,33.765246 63.869851,31.234242 63.842081,28.703238 50.157689,6.540262 47.765167,5.2969214 46.568907,4.6752504 38.426665,4.5630384 32.154792,4.6214684 z m 0.30429,8.4025596 c 4.90437,-0.047 9.661849,0.425368 10.597281,0.92538 1.870861,1.000021 10.667726,15.499216 10.689439,17.534904 C 53.767512,33.52 44.703434,48.643484 42.854286,49.67915 41.005138,50.714818 23.631044,50.742687 21.760184,49.742667 19.889321,48.742646 10.449106,33.795226 10.427392,31.759537 10.405682,29.72385 19.860508,15.185189 21.709656,14.14952 c 0.924575,-0.517833 5.845056,-1.078498 10.749426,-1.125492 z"
+       style="fill:#000000;fill-opacity:1;filter:url(#filter3057)"
+       sodipodi:nodetypes="ssssssssssssssss" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path2297"
+       d="m 12.848737,18.660684 6.998916,-7.560243 12.488019,13.136676 12.867701,-13.261676 7.451909,7.435243 -13.544847,13.503584 13.341856,13.152864 -6.670928,6.94334 L 32.335672,39.351071 19.323785,52.010472 12.426724,45.086347 25.565591,32.039268 z"
+       style="fill:url(#linearGradient3133);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31593215;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3069)"
+       inkscape:transform-center-x="2.25"
+       inkscape:transform-center-y="2.25" />
+    <path
+       style="fill:url(#linearGradient3055);fill-opacity:1"
+       d="M 31.793607,5.7202825 C 24.936514,5.7854875 18.319304,6.2021256 17.026601,6.9206116 14.441196,8.3575834 2.2463386,29.063913 2.2766972,31.888398 2.3070579,34.712884 14.945039,54.814527 17.560803,56.20204 20.176566,57.589553 45.00941,57.359866 47.594814,55.922894 50.180219,54.485922 62.625078,34.154591 62.594719,31.330106 62.564358,28.505621 49.613876,7.8135634 46.998112,6.4260506 45.690231,5.732294 38.650699,5.6550774 31.793607,5.7202825 z m 0.18436,5.9275485 c 5.36199,-0.05245 10.575046,0.320704 11.597761,0.878694 2.045429,1.115978 11.686445,16.671419 11.710184,18.943154 0.02374,2.271736 -9.523004,18.3578 -11.544693,19.513557 -2.02169,1.155758 -20.789608,0.763657 -22.835036,-0.352353 C 18.86075,49.514938 8.8958589,34.166602 8.8721197,31.894866 8.8483797,29.62313 19.328834,13.7806 21.350523,12.624842 c 1.010846,-0.577879 5.26545,-0.924567 10.627444,-0.977011 z"
+       id="path3305"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssssssssss" />
+    <path
+       style="fill:none"
+       d="M 15.390198,55.682743 C 10.447144,47.360612 3.6450957,35.733851 3.6919881,35.686959 c 0.031272,-0.03127 0.5023581,0.289334 1.0468575,0.712459 0.5444994,0.423125 1.0414462,0.769317 1.1043264,0.769317 0.06288,0 2.6329414,4.276521 5.711247,9.50338 l 5.59692,9.503379 2.159128,0.007 2.159126,0.007 -0.34365,-0.584653 C 20.936937,55.28323 18.053514,50.518786 14.718339,45.017137 11.383164,39.515488 8.6543842,34.929294 8.6543842,34.825595 c 0,-0.103699 0.2455542,-0.59277 0.545676,-1.086823 0.3001218,-0.494053 0.545676,-0.941721 0.545676,-0.994816 0,-0.05309 -0.2788317,-0.09654 -0.619626,-0.09654 -0.8505388,0 -1.0953557,-0.488405 -1.0953557,-2.185211 0,-1.90734 -0.048411,-1.868066 2.3051195,-1.870072 l 1.982335,-0.0017 1.052375,-1.721616 c 0.578806,-0.94689 1.052375,-1.785869 1.052375,-1.8644 0,-0.07853 -0.829918,-0.162484 -1.844262,-0.186561 l -1.844263,-0.04378 4.480955,-7.327649 4.480953,-7.32765 12.466741,-0.0399 12.466738,-0.0399 0.517892,0.854518 0.517892,0.854518 2.335995,0.04287 2.335994,0.04287 2.742626,4.521316 c 1.508447,2.486723 4.136212,6.819001 5.839482,9.627283 1.703268,2.808283 3.157599,5.105969 3.231846,5.105969 0.256907,0 0.13186,-0.393635 -0.411085,-1.294044 -0.299901,-0.497351 -0.545275,-0.935841 -0.545275,-0.974422 0,-0.03858 0.310833,-0.07015 0.69074,-0.07015 0.575204,0 0.699074,-0.05324 0.740561,-0.318272 0.03599,-0.229934 0.273254,0.06215 0.854835,1.052375 0.702767,1.196557 0.780303,1.410253 0.610448,1.682462 -0.107012,0.171499 -0.377881,0.627528 -0.601929,1.013399 l -0.407361,0.701583 0.533953,0.857491 c 0.293674,0.47162 0.535536,0.950306 0.537472,1.063747 0.0019,0.113441 -3.098537,5.322698 -6.889942,11.576127 l -6.893462,11.36987 -16.876654,0 -16.876655,0 -1.226996,-2.065773 z"
+       id="path3077"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/hexchat.desktop
+++ b/hexchat.desktop
@ -14,7 +14,7 @@ Comment[pt_BR]=Cliente de IRC
 Comment[sl]=Odjemalec IRC
 Comment[sv]=IRC-klient
 Comment[ro]=Client de IRC
-Comment[zh_TW]=X-Chat 聊天程式
+Comment[zh_TW]=HexChat 聊天程式
 Comment=Chat with other people using Internet Relay Chat
 Exec=hexchat
 Icon=hexchat
--- a/hexchat.ico
+++ b/hexchat.ico
--- a/hexchat.png
+++ b/hexchat.png
--- a/hexchat.spec
+++ b/hexchat.spec
@ -35,7 +35,7 @@ Provides: hexchat-python = %{epoch}:%{version}-%{release}
 Obsoletes: hexchat-python < %{epoch}:%{version}-%{release}

 %description
-X-Chat is an easy to use graphical IRC chat client for the X Window System.
+HexChat is an easy to use graphical IRC chat client for the X Window System.
 It allows you to join multiple IRC channels (chat rooms) at the same time, 
 talk publicly, private one-on-one conversations etc. Even file transfers
 are possible.
@ -43,11 +43,11 @@ are possible.
 This includes the plugins to run the Perl and Python scripts.

 %package tcl
-Summary: Tcl script plugin for X-Chat
+Summary: Tcl script plugin for HexChat
 Group: Applications/Internet
 Requires: %{name} = %{epoch}:%{version}-%{release}
 %description tcl
-This package contains the X-Chat plugin providing the Tcl scripting interface.
+This package contains the HexChat plugin providing the Tcl scripting interface.

 %prep
 %setup -q
@ -103,19 +103,19 @@ EOF
 %post
 # Install schema
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || :
+gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_hexchat_url_handler.schemas >& /dev/null || :


 %pre
 if [ "$1" -gt 1 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || :
+  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_hexchat_url_handler.schemas >& /dev/null || :
 fi

 %preun
 if [ "$1" -eq 0 ]; then
  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || :
+  gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/apps_hexchat_url_handler.schemas >& /dev/null || :
 fi

 %clean
@ -132,7 +132,7 @@ fi
 %{_libdir}/hexchat/plugins/python.so
 %{_datadir}/applications/hexchat.desktop
 %{_datadir}/pixmaps/*
-%{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
+%{_sysconfdir}/gconf/schemas/apps_hexchat_url_handler.schemas
 %{_datadir}/dbus-1/services/org.hexchat.service.service

 %files tcl
--- a/hexchat.svg
+++ b/hexchat.svg
@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="hexchat2.svg"
+   version="1.0"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:version="0.32"
+   id="svg2"
+   height="64"
+   width="64">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient2289">
+      <stop
+         style="stop-color:#ff2600;stop-opacity:1;"
+         offset="0"
+         id="stop2291" />
+      <stop
+         style="stop-color:#ffd600;stop-opacity:1;"
+         offset="1"
+         id="stop2293" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1317"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1319"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1320"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient1322"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="16.88862"
+       y2="19.001091" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient2997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-160.10656,-7.1914058)"
+       x1="130.2673"
+       y1="78.743134"
+       x2="129.2081"
+       y2="25.771122" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3011"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3030"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient3070"
+       gradientUnits="userSpaceOnUse"
+       x1="34.62241"
+       y1="53.508884"
+       x2="34.466503"
+       y2="5.4893961"
+       gradientTransform="matrix(0.99894925,0,0,0.97549134,-3.1829063,4.465557)" />
+    <filter
+       id="filter3281"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3283"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3285"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3287"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3289"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3291"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter3293"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3295"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3297"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3299"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3301"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3303"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4089"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4093"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4096"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289"
+       id="linearGradient4098"
+       gradientUnits="userSpaceOnUse"
+       x1="99.348503"
+       y1="59.934135"
+       x2="100.40916"
+       y2="10.613438"
+       gradientTransform="translate(-70.003571,-2.298097)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient4101"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94969205,0,0,0.89326813,1.6716955,2.7025635)"
+       x1="31.372862"
+       y1="60.111893"
+       x2="31.559002"
+       y2="5.6897221" />
+    <filter
+       id="filter4111"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4113"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4115"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4117"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4119"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4121"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <filter
+       id="filter4123"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood4125"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite4127"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur4129"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset4131"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite4133"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1330"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1328"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1322-5"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.172329,-1.111016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1320-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1319-2"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.735969,0,0,0.735801,-2.052758,-16.66733)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1317-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="19.001091"
+       x2="16.88862"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1337-8"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="20.59322"
+       x2="72.348671"
+       y1="77.796608"
+       x1="16.88862"
+       gradientTransform="matrix(0.545166,0,0,0.544959,0.186963,35.29511)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1335-4"
+       xlink:href="#linearGradient2289-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient2289-4">
+      <stop
+         id="stop2291-0"
+         offset="0"
+         style="stop-color:#ff2600;stop-opacity:1;" />
+      <stop
+         id="stop2293-9"
+         offset="1"
+         style="stop-color:#ffd600;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,7.3477348,6.9450134)"
+       x1="46.881573"
+       y1="91.824585"
+       x2="47.225189"
+       y2="1.5596932" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2289-4"
+       id="linearGradient3136"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51445624,0,0,0.53856587,-120.3871,-29.360443)"
+       x1="16.88862"
+       y1="77.796608"
+       x2="72.348671"
+       y2="20.59322" />
+    <filter
+       id="filter3138"
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow">
+      <feFlood
+         id="feFlood3140"
+         flood-opacity="0.33"
+         flood-color="rgb(0,0,0)"
+         result="flood" />
+      <feComposite
+         id="feComposite3142"
+         in2="SourceGraphic"
+         in="flood"
+         operator="in"
+         result="composite1" />
+      <feGaussianBlur
+         id="feGaussianBlur3144"
+         in="composite"
+         stdDeviation="2"
+         result="blur" />
+      <feOffset
+         id="feOffset3146"
+         dx="4"
+         dy="1"
+         result="offset" />
+      <feComposite
+         id="feComposite3148"
+         in2="offset"
+         in="SourceGraphic"
+         operator="over"
+         result="composite2" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="-86.273528"
+     inkscape:cy="9.7239157"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1270"
+     inkscape:window-height="972"
+     inkscape:window-x="115"
+     inkscape:window-y="32"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Guglielmi David</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Peter Zelezny</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4107"
+       d="m 31.404792,8.7464684 c -6.271873,0.05843 -12.553,0.431777 -13.735377,1.075609 C 15.304661,11.109737 4.1505773,29.32852 4.1783444,31.859522 c 0.02777,2.531005 11.5871596,20.543967 13.9796816,21.787309 2.392519,1.243342 25.106,1.037521 27.470753,-0.250141 C 47.993531,52.109028 59.147618,33.890246 59.119851,31.359242 59.092081,28.828238 47.532689,10.790262 45.140167,9.5469214 43.943907,8.9252504 37.676665,8.6880384 31.404792,8.7464684 z m 0.05429,4.5275596 c 4.90437,-0.047 9.786849,0.175368 10.722281,0.67538 1.870861,1.000021 10.917726,15.499216 10.939439,17.534904 C 53.142512,33.52 44.410541,48.158649 42.561393,49.194315 40.712245,50.229983 22.960549,50.419464 21.089689,49.419444 19.218826,48.419423 10.199106,33.920226 10.177392,31.884537 10.155682,29.84885 18.860508,15.185189 20.709656,14.14952 c 0.924575,-0.517833 5.845056,-0.828498 10.749425,-0.875492 z"
+       style="fill:#000000;fill-opacity:1;filter:url(#filter4111)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4103"
+       d="M 31.801142,5.3887159 C 24.358829,5.4607629 16.905535,5.9211193 15.502506,6.7149966 12.696449,8.3027513 -0.53918189,30.767467 -0.50623228,33.888328 -0.47328049,37.00919 13.243292,59.220118 16.0823,60.753225 18.921305,62.286332 45.873514,62.032541 48.67957,60.444787 51.485627,58.857032 64.721258,36.392315 64.688309,33.271454 64.655357,30.150593 50.938784,7.9088218 48.099776,6.3757155 46.680274,5.6091623 39.243454,5.3166688 31.801142,5.3887159 z m 0.06442,5.5827171 c 5.81961,-0.05795 11.613244,0.216241 12.723243,0.83278 2.219996,1.233079 12.955163,19.111349 12.980929,21.621461 0.02577,2.51011 -10.335747,20.560333 -12.529979,21.837366 -2.19423,1.277031 -23.2587,1.510671 -25.478697,0.277592 C 17.341063,54.307554 6.638107,36.429283 6.6123418,33.919173 6.5865755,31.409062 16.915878,13.327995 19.110109,12.050964 20.207224,11.412447 26.045952,11.02938 31.865563,10.971433 z"
+       style="fill:#000000;fill-opacity:1;filter:url(#filter4123)"
+       transform="matrix(0.97890109,0,0,0.98965389,0.52623659,-1.3159842)" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path2297"
+       d="m 10.723737,18.285684 7.623916,-7.935243 13.238019,13.886676 12.492701,-13.886676 8.576909,7.935243 -14.294847,14.878584 13.341856,11.902864 -6.670928,6.94334 L 31.585672,39.351071 18.573785,52.010472 11.676724,45.086347 24.065591,33.164268 10.723737,18.285684 z"
+       style="fill:url(#linearGradient3133);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.31593215000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3138)"
+       inkscape:transform-center-x="2.25"
+       inkscape:transform-center-y="2.25" />
+    <path
+       style="fill:url(#linearGradient4101);fill-opacity:1"
+       d="M 31.293607,6.0952825 C 24.436514,6.1604875 17.569304,6.5771256 16.276601,7.2956116 13.691196,8.7325834 1.4963386,29.063913 1.5266972,31.888398 1.5570579,34.712884 14.195039,54.814527 16.810803,56.20204 19.426566,57.589553 44.25941,57.359866 46.844814,55.922894 49.430219,54.485922 61.625078,34.154591 61.594719,31.330106 61.564358,28.505621 48.926376,8.3760634 46.310612,6.9885506 45.002731,6.294794 38.150699,6.0300774 31.293607,6.0952825 z m 0.05936,5.0525485 c 5.36199,-0.05245 10.700046,0.195704 11.722761,0.753694 2.045429,1.115978 11.936445,17.296419 11.960184,19.568154 0.02374,2.271736 -9.523004,18.6078 -11.544693,19.763557 -2.02169,1.155758 -21.429773,1.36721 -23.475201,0.251232 C 17.970585,50.368491 8.1092472,34.188049 8.085508,31.916313 8.061768,29.644577 17.578834,13.2806 19.600523,12.124842 c 1.010846,-0.577879 6.39045,-0.924567 11.75244,-0.977011 z"
+       id="path3305"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none"
+       d="M 14.640198,55.682743 C 9.6971439,47.360612 2.8950957,35.733851 2.9419881,35.686959 c 0.031272,-0.03127 0.5023581,0.289334 1.0468575,0.712459 0.5444994,0.423125 1.0414462,0.769317 1.1043264,0.769317 0.06288,0 2.6329414,4.276521 5.711247,9.50338 l 5.59692,9.503379 2.159128,0.007 2.159126,0.007 -0.34365,-0.584653 C 20.186937,55.28323 17.303514,50.518786 13.968339,45.017137 10.633164,39.515488 7.9043842,34.929294 7.9043842,34.825595 c 0,-0.103699 0.2455542,-0.59277 0.545676,-1.086823 0.3001218,-0.494053 0.545676,-0.941721 0.545676,-0.994816 0,-0.05309 -0.2788317,-0.09654 -0.619626,-0.09654 -0.8505388,0 -1.0953557,-0.488405 -1.0953557,-2.185211 0,-1.90734 -0.048411,-1.868066 2.30512,-1.870072 l 1.9823345,-0.0017 1.052375,-1.721616 c 0.578806,-0.94689 1.052375,-1.785869 1.052375,-1.8644 0,-0.07853 -0.829918,-0.162484 -1.844262,-0.186561 l -1.8442631,-0.04378 4.4809551,-7.327649 4.480953,-7.32765 12.466741,-0.0399 12.466738,-0.0399 0.517892,0.854518 0.517892,0.854518 2.335995,0.04287 2.335994,0.04287 2.742626,4.521316 c 1.508447,2.486723 4.136212,6.819001 5.839482,9.627283 1.703268,2.808283 3.157599,5.105969 3.231846,5.105969 0.256907,0 0.13186,-0.393635 -0.411085,-1.294044 -0.299901,-0.497351 -0.545275,-0.935841 -0.545275,-0.974422 0,-0.03858 0.310833,-0.07015 0.69074,-0.07015 0.575204,0 0.699074,-0.05324 0.740561,-0.318272 0.03599,-0.229934 0.273254,0.06215 0.854835,1.052375 0.702767,1.196557 0.780303,1.410253 0.610448,1.682462 -0.107012,0.171499 -0.377881,0.627528 -0.601929,1.013399 l -0.407361,0.701583 0.533953,0.857491 c 0.293674,0.47162 0.535536,0.950306 0.537472,1.063747 0.0019,0.113441 -3.098537,5.322698 -6.889942,11.576127 l -6.893462,11.36987 -16.876654,0 -16.876655,0 -1.226996,-2.065773 z"
+       id="path3077"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@ -17,5 +17,21 @@ if DO_TCL
 tcldir = tcl
 endif

+if DO_SASL
+sasldir = sasl
+endif
+
+if DO_DOAT
+doatdir = doat
+endif
+
+if DO_FISHLIM
+fishlimdir = fishlim
+endif
+
+if DO_CHECKSUM
+checksumdir = checksum
+endif
+
 #SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc
-SUBDIRS = . $(pythondir) $(perldir) $(tcldir)
+SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(sasldir) $(doatdir) $(fishlimdir) $(checksumdir)
--- a/plugins/checksum/Makefile.am
+++ b/plugins/checksum/Makefile.am
@ -0,0 +1,9 @@
+EXTRA_DIST = INSTALL LICENSE README
+
+libdir = $(hexchatlibdir)/plugins
+
+lib_LTLIBRARIES = checksum.la
+checksum_la_SOURCES = checksum.c
+checksum_la_LDFLAGS = -avoid-version -module 
+checksum_la_LIBADD = 
+INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
--- a/plugins/checksum/checksum.c
+++ b/plugins/checksum/checksum.c
@ -22,28 +22,39 @@

 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 #include <malloc.h>
 #include <errno.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <openssl/sha.h>
+#include <glib.h>

-#include "xchat-plugin.h"
-
-#define BUFSIZE 32768
-#define DEFAULT_LIMIT 256									/* default size is 256 MiB */
-
+#ifdef WIN32
 #ifndef snprintf
 #define snprintf _snprintf
 #endif
 #ifndef stat64
 #define stat64 _stat64
 #endif
+#else
+/* for INT_MAX */
+#include <limits.h>
+#define __USE_LARGEFILE64
+#define _LARGEFILE_SOURCE
+#define _LARGEFILE64_SOURCE
+#endif
+
+#include <sys/stat.h>
+
+#include "xchat-plugin.h"
+
+#define BUFSIZE 32768
+#define DEFAULT_LIMIT 256									/* default size is 256 MiB */

 static xchat_plugin *ph;									/* plugin handle */
 static const char name[] = "Checksum";
 static const char desc[] = "Calculate checksum for DCC file transfers";
-static const char version[] = "3.0";
+static const char version[] = "3.1";

 /* Use of OpenSSL SHA256 interface: http://adamlamers.com/?p=5 */
 static void
@ -217,11 +228,11 @@ dccoffer_cb (char *word[], void *userdata)
 static void
 checksum (char *word[], void *userdata)
 {
-	if (!stricmp ("GET", word[2]))
+	if (!g_ascii_strcasecmp ("GET", word[2]))
 	{
 		print_limit ();
 	}
-	else if (!stricmp ("SET", word[2]))
+	else if (!g_ascii_strcasecmp ("SET", word[2]))
 	{
 		set_limit (word[3]);
 	}
--- a/plugins/checksum/checksum.vcxproj
+++ b/plugins/checksum/checksum.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcchecksum</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcchecksum</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -63,7 +63,7 @@
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
@ -84,8 +84,8 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
--- a/plugins/checksum/checksum.vcxproj.user
+++ b/plugins/checksum/checksum.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/dns/dns.c
+++ b/plugins/dns/dns.c
@ -67,9 +67,11 @@ waitline (void *source, char *buf, int bufsize)
 	{
 		len = 1;
 		/* we can't read() here, due to glib's giowin32 */
-		if(ph->xchat_read_fd(ph, source, buf + i, &len) != 0)
+		if (ph->xchat_read_fd (ph, source, buf + i, &len) != 0)
+		{
 			return -1;
-		if(buf[i] == '\n' || bufsize == i + 1)
+		}
+		if (buf[i] == '\n' || bufsize == i + 1)
 		{
 			buf[i] = 0;
 			return i;
--- a/plugins/dns/dns.vcxproj
+++ b/plugins/dns/dns.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcdns</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcdns</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -84,7 +84,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
--- a/plugins/dns/dns.vcxproj.user
+++ b/plugins/dns/dns.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/doat/Makefile.am
+++ b/plugins/doat/Makefile.am
@ -0,0 +1,10 @@
+EXTRA_DIST = 
+
+libdir = $(hexchatlibdir)/plugins
+
+lib_LTLIBRARIES = doat.la
+doat_la_SOURCES = doat.c
+doat_la_LDFLAGS = -avoid-version -module 
+doat_la_LIBADD = 
+INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+
--- a/plugins/doat/doat.vcxproj
+++ b/plugins/doat/doat.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcdoat</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcdoat</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -82,7 +82,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
--- a/plugins/doat/doat.vcxproj.user
+++ b/plugins/doat/doat.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/exec/exec.vcxproj
+++ b/plugins/exec/exec.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcexec</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcexec</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -82,7 +82,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/plugins/exec/exec.vcxproj.user
+++ b/plugins/exec/exec.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/fishlim/Makefile
+++ b/plugins/fishlim/Makefile
@ -1,40 +0,0 @@
-
-OURCFLAGS = -Wall -Wextra -Wno-unused-parameter -std=c99 -pedantic `pkg-config --cflags glib-2.0 libcrypto` -DG_DISABLE_DEPRECATED=1 -fPIC $(CFLAGS)
-#OURLINKFLAGS = `pkg-config --libs glib-2.0 libcrypto` -shared -fPIC -Wl,-z,defs $(CFLAGS) $(LDFLAGS)
-OURLINKFLAGS = `pkg-config --libs glib-2.0 libcrypto` $(CFLAGS) $(LDFLAGS)
-
-BASE_OBJECTS = irc.o fish.o keystore.o misc.o
-PLUGIN_OBJECTS = $(BASE_OBJECTS) plugin_xchat.o
-TEST_OBJECTS = $(BASE_OBJECTS) test.o
-
-all: fishlim.so test
-
-fish.o: fish.h keystore.h misc.h
-irc.o: irc.h
-keystore.o: keystore.h irc.h fish.h misc.h plugin_xchat.h
-misc.o: misc.h
-test.o: fish.h
-plugin_xchat.o: fish.h irc.h keystore.h plugin_xchat.h
-
-.c.o:
-	$(CC) $(OURCFLAGS) -c $< -o $@
-
-fishlim.so: $(PLUGIN_OBJECTS)
-	$(CC) -shared $(OURLINKFLAGS) $(PLUGIN_OBJECTS) -o $@
-
-test: $(TEST_OBJECTS)
-	$(CC) $(TEST_OBJECTS) -o $@ $(OURLINKFLAGS)
-
-
-.PHONY: all clean distclean install uninstall
-clean:
-	-$(RM) -f $(PLUGIN_OBJECTS) $(TEST_OBJECTS) fishlim.so test
-distclean: clean
-
-install: fishlim.so
-	install -d $(DESTDIR)/usr/lib/xchat/plugins/
-	install -m 644 fishlim.so $(DESTDIR)/usr/lib/xchat/plugins/
-uninstall:
-	rm $(DESTDIR)/usr/lib/xchat/plugins/fishlim.so
-
-
--- a/plugins/fishlim/Makefile.am
+++ b/plugins/fishlim/Makefile.am
@ -0,0 +1,9 @@
+EXTRA_DIST = INSTALL LICENSE README
+
+libdir = $(hexchatlibdir)/plugins
+
+lib_LTLIBRARIES = fishlim.la
+fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_xchat.c
+fishlim_la_LDFLAGS = -avoid-version -module 
+fishlim_la_LIBADD = 
+INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
--- a/plugins/fishlim/fishlim.vcxproj
+++ b/plugins/fishlim/fishlim.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcfishlim</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcfishlim</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -84,7 +84,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/plugins/fishlim/fishlim.vcxproj.user
+++ b/plugins/fishlim/fishlim.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/fishlim/keystore.c
+++ b/plugins/fishlim/keystore.c
@ -36,7 +36,7 @@ static char *keystore_password = NULL;


 /**
- * Opens the key store file: ~/.xchat2/blow.ini
+ * Opens the key store file: ~/.config/hexchat/addon_fishlim.conf
 */
 static GKeyFile *getConfigFile() {
    gchar *filename = get_config_filename();
@ -63,7 +63,7 @@ static const char *get_keystore_password() {


 /**
- * Gets a value for a nick/channel from blow.ini. Unlike
+ * Gets a value for a nick/channel from addon_fishlim.conf. Unlike
 * g_key_file_get_string, this function is case insensitive.
 */
 static gchar *get_nick_value(GKeyFile *keyfile, const char *nick, const char *item) {
--- a/plugins/fishlim/plugin_xchat.c
+++ b/plugins/fishlim/plugin_xchat.c
@ -27,11 +27,7 @@
 #include <string.h>

 // #pragma GCC visibility push(default)
-#ifdef _MSC_VER
 #include "xchat-plugin.h"
-#else
-#include <xchat/xchat-plugin.h>
-#endif
 #define XCHAT_MAX_WORDS 32
 // #pragma GCC visibility pop

@ -56,7 +52,7 @@ static xchat_plugin *ph;
 * Returns the path to the key store file.
 */
 gchar *get_config_filename() {
-    return g_build_filename(xchat_get_info(ph, "xchatdirfs"), "blow.ini", NULL);
+    return g_build_filename(xchat_get_info(ph, "xchatdirfs"), "addon_fishlim.conf", NULL);
 }

 /**
--- a/plugins/hextray/hextray.vcxproj
+++ b/plugins/hextray/hextray.vcxproj
@ -44,13 +44,13 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -81,7 +81,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;XTRAY_EXPORTS;_STL70_;_STATIC_CPPLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;XTRAY_EXPORTS;_STL70_;_STATIC_CPPLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
@ -96,15 +96,13 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <None Include="bitmaps\sd.bmp" />
-    <None Include="icons\banned.ico" />
-    <None Include="icons\chan_msg.ico" />
-    <None Include="icons\disconnected.ico" />
-    <None Include="icons\highlight-1-3.ico" />
+    <None Include="icons\ban.ico" />
+    <None Include="icons\disconnect.ico" />
    <None Include="icons\highlight.ico" />
-    <None Include="icons\kicked.ico" />
-    <None Include="icons\priv_msg-1-2-2.ico" />
+    <None Include="icons\kick.ico" />
+    <None Include="icons\message.ico" />
    <None Include="icons\sd.ico" />
-    <None Include="icons\server_notice.ico" />
+    <None Include="icons\notice.ico" />
    <None Include="icons\hexchat.ico" />
    <None Include="xtray.def" />
  </ItemGroup>
--- a/plugins/hextray/hextray.vcxproj.filters
+++ b/plugins/hextray/hextray.vcxproj.filters
@ -27,31 +27,25 @@
    <None Include="bitmaps\sd.bmp">
      <Filter>Resource Files\bitmaps</Filter>
    </None>
-    <None Include="icons\banned.ico">
+    <None Include="icons\ban.ico">
      <Filter>Resource Files\icons</Filter>
    </None>
-    <None Include="icons\chan_msg.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <None Include="icons\disconnected.ico">
+    <None Include="icons\disconnect.ico">
      <Filter>Resource Files\icons</Filter>
    </None>
    <None Include="icons\highlight.ico">
      <Filter>Resource Files\icons</Filter>
    </None>
-    <None Include="icons\highlight-1-3.ico">
+    <None Include="icons\kick.ico">
      <Filter>Resource Files\icons</Filter>
    </None>
-    <None Include="icons\kicked.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <None Include="icons\priv_msg-1-2-2.ico">
+    <None Include="icons\message.ico">
      <Filter>Resource Files\icons</Filter>
    </None>
    <None Include="icons\sd.ico">
      <Filter>Resource Files\icons</Filter>
    </None>
-    <None Include="icons\server_notice.ico">
+    <None Include="icons\notice.ico">
      <Filter>Resource Files\icons</Filter>
    </None>
    <None Include="icons\hexchat.ico">
--- a/plugins/hextray/hextray.vcxproj.user
+++ b/plugins/hextray/hextray.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/hextray/icons/ban.ico
+++ b/plugins/hextray/icons/ban.ico
--- a/plugins/hextray/icons/banned.ico
+++ b/plugins/hextray/icons/banned.ico
--- a/plugins/hextray/icons/chan_msg.ico
+++ b/plugins/hextray/icons/chan_msg.ico
--- a/plugins/hextray/icons/disconnect.ico
+++ b/plugins/hextray/icons/disconnect.ico
--- a/plugins/hextray/icons/disconnected.ico
+++ b/plugins/hextray/icons/disconnected.ico
--- a/plugins/hextray/icons/hexchat.ico
+++ b/plugins/hextray/icons/hexchat.ico
--- a/plugins/hextray/icons/highlight-1-3.ico
+++ b/plugins/hextray/icons/highlight-1-3.ico
--- a/plugins/hextray/icons/highlight.ico
+++ b/plugins/hextray/icons/highlight.ico
--- a/plugins/hextray/icons/kick.ico
+++ b/plugins/hextray/icons/kick.ico
--- a/plugins/hextray/icons/kicked.ico
+++ b/plugins/hextray/icons/kicked.ico
--- a/plugins/hextray/icons/message.ico
+++ b/plugins/hextray/icons/message.ico
--- a/plugins/hextray/icons/notice.ico
+++ b/plugins/hextray/icons/notice.ico
--- a/plugins/hextray/icons/priv_msg-1-2-2.ico
+++ b/plugins/hextray/icons/priv_msg-1-2-2.ico
--- a/plugins/hextray/icons/server_notice.ico
+++ b/plugins/hextray/icons/server_notice.ico
--- a/plugins/hextray/resource.rc
+++ b/plugins/hextray/resource.rc
@ -32,7 +32,7 @@ IDD_EVENTS DIALOGEX 8, 20, 216, 143
 STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CHILD
 FONT 8, "Tahoma", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "XChat Events",IDC_STATIC,5,5,205,77
+    GROUPBOX        "HexChat Events",IDC_STATIC,5,5,205,77
    CONTROL         "Banned",4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,18,49,10
    CONTROL         "Kicked",5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,32,49,10
    CONTROL         "Killed",8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,46,49,10
@ -53,13 +53,13 @@ BEGIN
    GROUPBOX        "Options",IDC_STATIC,5,5,205,135
    CONTROL         "Auto away on minimize",11,"Button",BS_AUTOCHECKBOX | 
                    WS_TABSTOP,16,60,100,10
-    CONTROL         "Minimize XChat to the system tray",12,"Button",
+    CONTROL         "Minimize HexChat to the system tray",12,"Button",
                    BS_AUTOCHECKBOX | WS_TABSTOP,16,18,133,10
    CONTROL         "Minimize to the tray instead of closing",17,"Button",
                    BS_AUTOCHECKBOX | WS_TABSTOP,16,32,174,9
    EDITTEXT        IDC_AWAY_MSG,33,86,169,50,ES_AUTOHSCROLL
    LTEXT           "Away Msg:",IDC_STATIC,27,72,35,8
-    CONTROL         "Remove XChat from the taskbar (only show in tray)",
+    CONTROL         "Remove HexChat from the taskbar (only show in tray)",
                    20,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,46,191,9
 END

@ -279,13 +279,13 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 ICO_XCHAT               ICON                    "icons\\hexchat.ico"
-ICO_BANNED              ICON                    "icons\\banned.ico"
-ICO_CHANMSG             ICON                    "icons\\chan_msg.ico"
+ICO_BANNED              ICON                    "icons\\ban.ico"
+ICO_CHANMSG             ICON                    "icons\\message.ico"
 ICO_HIGHLIGHT           ICON                    "icons\\highlight.ico"
-ICO_KICKED              ICON                    "icons\\kicked.ico"
-ICO_PMSG                ICON                    "icons\\priv_msg-1-2-2.ico"
-ICO_SNOTICE             ICON                    "icons\\server_notice.ico"
-ICO_DISCONNECTED        ICON                    "icons\\disconnected.ico"
+ICO_KICKED              ICON                    "icons\\kick.ico"
+ICO_PMSG                ICON                    "icons\\message.ico"
+ICO_SNOTICE             ICON                    "icons\\notice.ico"
+ICO_DISCONNECTED        ICON                    "icons\\disconnect.ico"

 /////////////////////////////////////////////////////////////////////////////
 //
--- a/plugins/hextray/utility.cpp
+++ b/plugins/hextray/utility.cpp
@ -97,9 +97,9 @@ void SavePrefs(int iDlg)

 	// ok this one is really ugly
 	// it checks to see if the file exists in two locations
-	// X-Chat default config dir, if that fails it trys xchat\plugins\config
+	// HexChat default config dir, if that fails it tries hexchat\plugins\config
 	// if neither one exists it tries to create it in
-	// X-Chat default config dir, if that fails it trys xchat\plugins\config
+	// HexChat default config dir, if that fails it tries hexchat\plugins\config
 	// In either case it writes \xFF\xFE to the file ( on creation )
 	// so that we can save unicode away messages WritePrivateProfile doesn't 
 	// do this for us, though I think it really should
--- a/plugins/hextray/xtray.cpp
+++ b/plugins/hextray/xtray.cpp
@ -49,7 +49,7 @@ HWND	g_hXchatWnd;
 HWND	g_hHotkeyWnd;
 HWND	g_hPrefDlg;
 HMENU	g_hTrayMenu;
-HICON	g_hIcons[11];
+HICON	g_hIcons[24];
 HANDLE	g_hInstance;
 /*****************************************************/
 /***************** Preferences ***********************/
@ -104,13 +104,13 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl
 	g_hPrefDlg		= CreateDialog((HINSTANCE)g_hInstance, MAKEINTRESOURCE(IDD_PREF),  g_hXchatWnd, (DLGPROC)PrefProc);

 	g_hIcons[0]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_XCHAT),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
-	g_hIcons[1]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_CHANMSG),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[2]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_HIGHLIGHT),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[5]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_BANNED),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[6]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_KICKED),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[8]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_PMSG),			IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[10]= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_SNOTICE),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
 	g_hIcons[11]= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_DISCONNECTED),	IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);
+	g_hIcons[22]	= (HICON)LoadImage((HINSTANCE)g_hInstance, MAKEINTRESOURCE(ICO_CHANMSG),		IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR);

 	/***************************************************************************************************************************/
 	/************************* Add our icon to the tray ************************************************************************/
--- a/plugins/hextray/xtray.h
+++ b/plugins/hextray/xtray.h
@ -24,7 +24,7 @@ extern HWND				g_hXchatWnd;
 extern HWND				g_hHotkeyWnd;
 extern HWND				g_hPrefDlg;
 extern HMENU			g_hTrayMenu;
-extern HICON			g_hIcons[11];
+extern HICON			g_hIcons[24];
 extern HANDLE			g_hInstance;
 extern unsigned int		g_dwPrefs;
 extern TCHAR			g_szAway[512];
--- a/plugins/lua/lua.c
+++ b/plugins/lua/lua.c
@ -518,13 +518,15 @@ static int lxc_cb_load(char *word[], char *word_eol[], void *userdata)
 			strncpy(file, word[2], PATH_MAX);
 		else {
 			if (stat(word[2], st) == 0)
-				xdir = getcwd(buf, PATH_MAX);
-			else {
-				xdir = xchat_get_info(ph, "xchatdirfs");
-				if (!xdir) /* xchatdirfs is new for 2.0.9, will fail on older */
-					xdir = xchat_get_info (ph, "xchatdir");
+			{
+				xdir = getcwd (buf, PATH_MAX);
+				snprintf (file, PATH_MAX, "%s/%s", xdir, word[2]);
+			}
+			else
+			{
+				xdir = xchat_get_info (ph, "xchatdirfs");
+				snprintf (file, PATH_MAX, "%s/addons/%s", xdir, word[2]);
 			}
-			snprintf(file, PATH_MAX, "%s/%s", xdir, word[2]);
 		}

 		if (lxc_load_file((const char *)file) == 0) {
@ -663,6 +665,7 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
 	lua_State *L;
 	const char *xdir;
 	const char *name, *desc, *vers;
+	char *xsubdir;
   /* we need to save this for use with any xchat_* functions */
   ph = plugin_handle;

@ -675,11 +678,13 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
 	xchat_hook_command(ph, "UNLOAD", XCHAT_PRI_NORM, lxc_cb_unload, NULL, NULL);
 	xchat_hook_command(ph, "LUA", XCHAT_PRI_NORM, lxc_cb_lua, "Usage: LUA <code>, executes <code> in a new lua state", NULL);

-	xdir = xchat_get_info(ph, "xchatdirfs");
-	if (!xdir) /* xchatdirfs is new for 2.0.9, will fail on older */
-		xdir = xchat_get_info (ph, "xchatdir");
-		
-	lxc_autoload_from_path(xdir);
+	xdir = xchat_get_info (ph, "xchatdirfs");
+	xsubdir = g_build_filename (xdir, "addons", NULL);
+	lxc_autoload_from_path (xsubdir);
+	g_free (xsubdir);
+
+	/* put this here, otherwise it's only displayed when a script is autoloaded upon start */
+	xchat_printf(ph, "Lua interface loaded");

 	if (!lxc_states) /* no scripts loaded */
 		return 1;
@ -716,7 +721,6 @@ int xchat_plugin_init(xchat_plugin *plugin_handle,
 		}
 		state = state->next;
 	}
-	xchat_printf(ph, "Lua interface (v%s) loaded", LXC_VERSION);
 	return 1; 
 }

@ -732,7 +736,7 @@ int xchat_plugin_deinit(xchat_plugin *plug_handle)
 		state = state->next;
 		free(st);
 	}
-	xchat_printf(plug_handle, "Lua plugin v%s removed", LXC_VERSION);
+	xchat_printf(plug_handle, "Lua interface unloaded");
 	return 1;
 }

--- a/plugins/lua/lua.vcxproj
+++ b/plugins/lua/lua.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(LuaOutput)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(LuaOutput)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -115,7 +115,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);snprintf=g_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);snprintf=g_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
--- a/plugins/lua/lua.vcxproj.user
+++ b/plugins/lua/lua.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/mpcinfo/mpcinfo.vcxproj
+++ b/plugins/mpcinfo/mpcinfo.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcmpcinfo</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcmpcinfo</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -82,7 +82,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/plugins/mpcinfo/mpcinfo.vcxproj.user
+++ b/plugins/mpcinfo/mpcinfo.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/perl/Makefile.am
+++ b/plugins/perl/Makefile.am
@ -4,7 +4,7 @@ EXTRA_DIST=alt_completion.pl xchat2-perldocs.html xchat2-perl.html \
 	lib/Xchat/List/Network/Entry.pm lib/Xchat/List/Network/AutoJoin.pm \
 	lib/IRC.pm

-libdir = $(xchatlibdir)/plugins
+libdir = $(hexchatlibdir)/plugins

 lib_LTLIBRARIES = perl.la
 perl_la_SOURCES = perl.c
--- a/plugins/perl/lib/IRC.pm
+++ b/plugins/perl/lib/IRC.pm
@ -3,7 +3,7 @@ package IRC;
 sub IRC::register {
  my ($script_name, $version, $callback) = @_;
  my $package = caller;
-  $callback = Xchat::Embed::fix_callback( $package, $callback) if $callback;
+  $callback = Xchat::Embed::fix_callback( $package, undef, $callback) if $callback;
  Xchat::register( $script_name, $version, undef, $callback );
 }

@ -12,7 +12,7 @@ sub IRC::add_command_handler {
  my ($command, $callback) = @_;
  my $package = caller;

-  $callback = Xchat::Embed::fix_callback( $package, $callback );
+  $callback = Xchat::Embed::fix_callback( $package, undef, $callback );

  # starting index for word_eol array
  # this is for compatibility with '' as the command
@ -30,7 +30,7 @@ sub IRC::add_command_handler {
 sub IRC::add_message_handler {
  my ($message, $callback) = @_;
  my $package = caller;
-  $callback = Xchat::Embed::fix_callback( $package, $callback );
+  $callback = Xchat::Embed::fix_callback( $package, undef, $callback );

  Xchat::hook_server( $message,
 		      sub {
@ -44,7 +44,7 @@ sub IRC::add_message_handler {
 sub IRC::add_print_handler {
  my ($event, $callback) = @_;
  my $package = caller;
-  $callback = Xchat::Embed::fix_callback( $package, $callback );
+  $callback = Xchat::Embed::fix_callback( $package, undef, $callback );
  Xchat::hook_print( $event,
 		     sub {
 		       my @word = @{$_[0]};
@ -58,7 +58,7 @@ sub IRC::add_print_handler {
 sub IRC::add_timeout_handler {
  my ($timeout, $callback) = @_;
  my $package = caller;
-  $callback = Xchat::Embed::fix_callback( $package, $callback );
+  $callback = Xchat::Embed::fix_callback( $package, undef, $callback );
  Xchat::hook_timer( $timeout,
 		     sub {
 		       no strict 'refs';
--- a/plugins/perl/lib/Xchat.pm
+++ b/plugins/perl/lib/Xchat.pm
@ -74,7 +74,7 @@ our @EXPORT = @{$EXPORT_TAGS{constants}};
 our @EXPORT_OK = @{$EXPORT_TAGS{all}};

 sub register {
-	my $package = Xchat::Embed::find_pkg();
+	my ($package, $calling_package) = Xchat::Embed::find_pkg();
 	my $pkg_info = Xchat::Embed::pkg_info( $package );
 	my $filename = $pkg_info->{filename};
 	my ($name, $version, $description, $callback) = @_;
@ -86,6 +86,11 @@ sub register {
 	}
 	
 	$description = "" unless defined $description;
+	if( $callback ) {
+		$callback = Xchat::Embed::fix_callback(
+			$package, $calling_package, $callback
+		);
+	}
 	$pkg_info->{shutdown} = $callback;
 	unless( $name && $name =~ /[[:print:]\w]/ ) {
 		$name = "Not supplied";
@ -124,9 +129,11 @@ sub hook_server {
 	my $message = shift;
 	my $callback = shift;
 	my $options = shift;
-	my $package = Xchat::Embed::find_pkg();
+	my ($package, $calling_package) = Xchat::Embed::find_pkg();
 	
-	$callback = Xchat::Embed::fix_callback( $package, $callback );
+	$callback = Xchat::Embed::fix_callback(
+		$package, $calling_package, $callback
+	);
 	
 	my ($priority, $data) = ( Xchat::PRI_NORM, undef );
 	_process_hook_options(
@ -148,9 +155,11 @@ sub hook_command {
 	my $command = shift;
 	my $callback = shift;
 	my $options = shift;
-	my $package = Xchat::Embed::find_pkg();
+	my ($package, $calling_package) = Xchat::Embed::find_pkg();

-	$callback = Xchat::Embed::fix_callback( $package, $callback );
+	$callback = Xchat::Embed::fix_callback(
+		$package, $calling_package, $callback
+	);
 	
 	my ($priority, $help_text, $data) = ( Xchat::PRI_NORM, undef, undef );
 	_process_hook_options(
@ -172,9 +181,11 @@ sub hook_print {
 	my $event = shift;
 	my $callback = shift;
 	my $options = shift;
-	my $package = Xchat::Embed::find_pkg();
+	my ($package, $calling_package) = Xchat::Embed::find_pkg();

-	$callback = Xchat::Embed::fix_callback( $package, $callback );
+	$callback = Xchat::Embed::fix_callback(
+		$package, $calling_package, $callback
+	);
 	
 	my ($priority, $run_after, $filter, $data) = ( Xchat::PRI_NORM, 0, 0, undef );
 	_process_hook_options(
@ -247,9 +258,11 @@ sub hook_print {
 sub hook_timer {
 	return undef unless @_ >= 2;
 	my ($timeout, $callback, $data) = @_;
-	my $package = Xchat::Embed::find_pkg();
+	my ($package, $calling_package) = Xchat::Embed::find_pkg();

-	$callback = Xchat::Embed::fix_callback( $package, $callback );
+	$callback = Xchat::Embed::fix_callback(
+		$package, $calling_package, $callback
+	);

 	if(
 		ref( $data ) eq 'HASH' && exists( $data->{data} )
@ -272,8 +285,10 @@ sub hook_fd {
 	my $fileno = fileno $fd;
 	return undef unless defined $fileno; # no underlying fd for this handle
 	
-	my $package = Xchat::Embed::find_pkg();
-	$callback = Xchat::Embed::fix_callback( $package, $callback );
+	my ($package, $calling_package) = Xchat::Embed::find_pkg();
+	$callback = Xchat::Embed::fix_callback(
+		$package, $calling_package, $callback
+	);
 	
 	my ($flags, $data) = (Xchat::FD_READ, undef);
 	_process_hook_options(
--- a/plugins/perl/lib/Xchat/Embed.pm
+++ b/plugins/perl/lib/Xchat/Embed.pm
@ -259,7 +259,7 @@ sub find_external_pkg {
 		return @frame if $frame[0] !~ /(?:^IRC$|^Xchat)/;
 		$level++;
 	}
-
+	return;
 }

 sub find_pkg {
@ -281,7 +281,7 @@ sub find_pkg {
 	if( $frame[0] or $frame[1] ) {
 		my $calling_package = $frame[0];
 		if( defined( my $owner = $owner_package{ $calling_package } ) ) {
-			return $owner;
+			return ($owner, $calling_package);
 		}

 		$location = $frame[1] ? $frame[1] : "package $frame[0]";
@ -294,10 +294,16 @@ sub find_pkg {

 }

+# convert function names into code references
 sub fix_callback {
-	my ($package, $callback) = @_;
+	my ($package, $calling_package, $callback) = @_;
 	
 	unless( ref $callback ) {
+		unless( $callback =~ /::/ ) {
+			my $prefix = defined $calling_package ? $calling_package : $package;
+			$callback =~ s/^/${prefix}::/;
+		}
+
 		no strict 'subs';
 		$callback = \&{$callback};
 	}
--- a/plugins/perl/perl-512.vcxproj
+++ b/plugins/perl/perl-512.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(Perl512Output)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(Perl512Output)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -93,7 +93,7 @@ move xchat.pm.h "$(IntDir)"</Command>
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalIncludeDirectories>$(Perl512Path)\perl\lib\CORE;$(IntDir);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/plugins/perl/perl-512.vcxproj.user
+++ b/plugins/perl/perl-512.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/perl/perl-514.vcxproj
+++ b/plugins/perl/perl-514.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(Perl514Output)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(Perl514Output)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -93,7 +93,7 @@ move xchat.pm.h "$(IntDir)"</Command>
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Perl514Path)\perl\lib\CORE;$(IntDir);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
--- a/plugins/perl/perl-514.vcxproj.user
+++ b/plugins/perl/perl-514.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/perl/perl-516.vcxproj
+++ b/plugins/perl/perl-516.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(Perl516Output)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(Perl516Output)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -93,7 +93,7 @@ move xchat.pm.h "$(IntDir)"</Command>
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
--- a/plugins/perl/perl-516.vcxproj.user
+++ b/plugins/perl/perl-516.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@ -144,17 +144,22 @@ perl_auto_load (void *unused)
 	if (!xdir)			/* xchatdirfs is new for 2.0.9, will fail on older */
 		xdir = xchat_get_info (ph, "xchatdir");

-	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
+	/* don't pollute the filesystem with script files, this only causes misuse of the folders
+	 * only use ~/.config/hexchat/addons/ and %APPDATA%\HexChat\addons */
+#if 0
+	/* autoload from ~/.config/hexchat/ or %APPDATA%\HexChat\ on win32 */
 	perl_auto_load_from_path (xdir);
+#endif

-	sub_dir = malloc (strlen (xdir) + 9);
+	sub_dir = malloc (strlen (xdir) + 8);
 	strcpy (sub_dir, xdir);
-	strcat (sub_dir, "/plugins");
+	strcat (sub_dir, "/addons");
 	perl_auto_load_from_path (sub_dir);
 	free (sub_dir);

+#if 0
 #ifdef WIN32
-	/* autoload from  C:\program files\xchat\plugins\ */
+	/* autoload from  C:\Program Files\HexChat\plugins\ */
 	sub_dir = malloc (1025 + 9);
 	copied = GetModuleFileName( 0, sub_dir, 1024 );
 	sub_dir[copied] = '\0';
@ -164,6 +169,7 @@ perl_auto_load (void *unused)
 	}
 	perl_auto_load_from_path ( strncat (sub_dir, "\\plugins", 9));
 	free (sub_dir);
+#endif
 #endif
 	return 0;
 }
--- a/plugins/plugin-conf.in
+++ b/plugins/plugin-conf.in
@ -1,4 +1,3 @@
-
 AC_INIT(@PLUGIN@-config.h.in)
 AM_CONFIG_HEADER(@PLUGIN@-config.h)
 AM_INIT_AUTOMAKE(xchat-@PLUGIN@, @PLUGIN_VERSION@)
@ -12,8 +11,8 @@ AC_ARG_WITH(plugin-includes,

 AC_SUBST(PLUGIN_INCLUDES)

-xchatlibdir=${libdir}/xchat
-AC_SUBST(xchatlibdir)
+hexchatlibdir=${libdir}/hexchat
+AC_SUBST(hexchatlibdir)

 AC_OUTPUT(
 Makefile
--- a/plugins/python/Makefile.am
+++ b/plugins/python/Makefile.am
@ -1,6 +1,6 @@
 EXTRA_DIST = 

-libdir = $(xchatlibdir)/plugins
+libdir = $(hexchatlibdir)/plugins

 lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@ -389,20 +389,27 @@ Util_Autoload()
 	char *sub_dir;
 	/* we need local filesystem encoding for chdir, opendir etc */

-	/* auto-load from ~/.xchat2/ or %APPDATA%\X-Chat 2\ */
 	xdir = xchat_get_info(ph, "xchatdirfs");
-	Util_Autoload_from(xchat_get_info(ph, "xchatdirfs"));

-	/* auto-load from subdirectory plugins */
-	sub_dir = malloc (strlen (xdir) + 9);
+	/* don't pollute the filesystem with script files, this only causes misuse of the folders
+	 * only use ~/.config/hexchat/addons/ and %APPDATA%\HexChat\addons */
+#if 0
+	/* auto-load from ~/.config/hexchat/ or %APPDATA%\HexChat\ */
+	Util_Autoload_from(xchat_get_info(ph, "xchatdirfs"));
+#endif
+
+	/* auto-load from subdirectory addons */
+	sub_dir = malloc (strlen (xdir) + 8);
 	strcpy (sub_dir, xdir);
-	strcat (sub_dir, "/plugins");
+	strcat (sub_dir, "/addons");
 	Util_Autoload_from(sub_dir);
 	free (sub_dir);

-#ifdef WIN32	/* also auto-load C:\Program Files\XChat\Plugins\*.py */
+#if 0
+#ifdef WIN32	/* also auto-load C:\Program Files\HexChat\Plugins\*.py */
 	Util_Autoload_from(HEXCHATLIBDIR"/plugins");
 #endif
+#endif
 }

 static char *
@ -437,9 +444,9 @@ Util_Expand(char *filename)
 		return expanded;
 	g_free(expanded);

-	/* Check if ~/.xchat2/<filename> exists. */
+	/* Check if ~/.config/hexchat/addons/<filename> exists. */
 	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
-				    filename, NULL);
+				    "addons", filename, NULL);
 	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
 		return expanded;
 	g_free(expanded);
--- a/plugins/python/python.vcxproj
+++ b/plugins/python/python.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(PythonOutput)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(PythonOutput)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -84,7 +84,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);$(PythonPath)\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
--- a/plugins/python/python.vcxproj.user
+++ b/plugins/python/python.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/sasl/Makefile.am
+++ b/plugins/sasl/Makefile.am
@ -0,0 +1,10 @@
+EXTRA_DIST = 
+
+libdir = $(hexchatlibdir)/plugins
+
+lib_LTLIBRARIES = sasl.la
+sasl_la_SOURCES = sasl.c
+sasl_la_LDFLAGS = -avoid-version -module 
+sasl_la_LIBADD = 
+INCLUDES = $(COMMON_CFLAGS) -I$(srcdir)/..
+
--- a/plugins/sasl/sasl.c
+++ b/plugins/sasl/sasl.c
@ -32,17 +32,18 @@
 *  http://tools.ietf.org/html/rfc4422
 */

+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <glib/gbase64.h>
+#include <glib.h>

 #include "xchat-plugin.h"

 static xchat_plugin *ph;   /* plugin handle */
 static const char name[] = "SASL";
 static const char desc[] = "SASL authentication plugin for HexChat";
-static const char version[] = "1.1";
+static const char version[] = "1.2";
 static const char sasl_help[] = "SASL Usage:\n /SASL ADD <login> <password> <network>, enable/update SASL authentication for given network\n /SASL DEL <network>, disable SASL authentication for given network\n /SASL LIST, get the list of SASL-enabled networks\n";

 struct sasl_info
@ -211,7 +212,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata)
 	const char* network;
 	const char* mode = word[2];

-	if (!stricmp ("ADD", mode))
+	if (!g_ascii_strcasecmp ("ADD", mode))
 	{
 		login = word[3];
 		password = word[4];
@ -234,7 +235,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata)

 		return XCHAT_EAT_ALL;
 	}
-	else if (!stricmp ("DEL", mode))
+	else if (!g_ascii_strcasecmp ("DEL", mode))
 	{
 		network = word_eol[3];

@ -255,7 +256,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata)

 		return XCHAT_EAT_ALL;
 	}
-	else if (!stricmp ("LIST", mode))
+	else if (!g_ascii_strcasecmp ("LIST", mode))
 	{
 		print_info ();
 		return XCHAT_EAT_ALL;
--- a/plugins/sasl/sasl.vcxproj
+++ b/plugins/sasl/sasl.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcsasl</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcsasl</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -84,7 +84,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;SASL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;SASL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(Glib);..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
--- a/plugins/sasl/sasl.vcxproj.user
+++ b/plugins/sasl/sasl.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/tcl/Makefile.am
+++ b/plugins/tcl/Makefile.am
@ -1,7 +1,7 @@

 EXTRA_DIST=printevents.h tclplugin.h README

-libdir = $(xchatlibdir)/plugins
+libdir = $(hexchatlibdir)/plugins

 lib_LTLIBRARIES = tcl.la
 tcl_la_SOURCES = tclplugin.c
--- a/plugins/tcl/printevents.h
+++ b/plugins/tcl/printevents.h
@ -3,8 +3,8 @@
                           -------------------------------------------------
    begin                : Sat Nov  9 17:31:20 MST 2002
    copyright            : Copyright 2002-2007 Daniel P. Stasinski
-    email                : mooooooo@avenues.org
-    generated            : Mon May 21 06:03:00 PM MST 2007
+    copyright            : Copyright 2002-2012 Daniel P. Stasinski
+    email                : daniel@GenericInbox.com
 ***************************************************************************/

 /***************************************************************************
--- a/plugins/tcl/tcl.vcxproj
+++ b/plugins/tcl/tcl.vcxproj
@ -55,14 +55,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(TclOutput)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>$(TclOutput)</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -93,7 +93,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;TCL_EXPORTS;TCL_DLL="$(TclLib).dll";$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;TCL_EXPORTS;TCL_DLL="$(TclLib).dll";$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(TclPath)\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
--- a/plugins/tcl/tcl.vcxproj.user
+++ b/plugins/tcl/tcl.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/tcl/tclplugin.c
+++ b/plugins/tcl/tclplugin.c
@ -2,8 +2,8 @@
                           tclplugin.c  -  Tcl plugin for xchat 1.9.x / 2.x.x
                           -------------------------------------------------s
    begin                : Sat Nov 19 17:31:20 MST 2002
-    copyright            : Copyright 2002-2010 Daniel P. Stasinski
-    email                : daniel@avenues.org
+    copyright            : Copyright 2002-2012 Daniel P. Stasinski
+    email                : daniel@GenericInbox.com
 ***************************************************************************/

 /***************************************************************************
@ -15,7 +15,7 @@
 *                                                                         *
 ***************************************************************************/

-static char RCSID[] = "$Id: tclplugin.c,v 1.64 2010/03/10 04:24:16 mooooooo Exp $";
+static char RCSID[] = "$Id: tclplugin.c,v 1.65 2012/07/26 20:02:12 mooooooo Exp $";

 #include <stdio.h>
 #include <stdlib.h>
@ -89,8 +89,10 @@ static char unknown[] = {
 "}\n"
 };

+/* don't pollute the filesystem with script files, this only causes misuse of the folders
+ * only use ~/.config/hexchat/addons/ and %APPDATA%\HexChat\addons */
 static char sourcedirs[] = {
-    "set files [lsort [glob -nocomplain -directory [xchatdir] \"*.tcl\"]]\n"
+    "set files [lsort [glob -nocomplain -directory [xchatdir] \"/addons/*.tcl\"]]\n"
        "set init [lsearch -glob $files \"*/init.tcl\"]\n"
        "if { $init > 0 } {\n"
        "set initfile [lindex $files $init]\n"
@ -2037,7 +2039,7 @@ static int Command_Source(char *word[], char *word_eol[], void *userdata)
        } else {
            if (!strchr(word_eol[2], '/')) {
                Tcl_DStringAppend(&ds, xchatdir, strlen(xchatdir));
-                Tcl_DStringAppend(&ds, "/", 1);
+                Tcl_DStringAppend(&ds, "/addons/", 8);
                Tcl_DStringAppend(&ds, word_eol[2], strlen(word_eol[2]));
            }
        }
@ -2203,9 +2205,11 @@ static void Tcl_Plugin_DeInit()

 static void banner()
 {
-    xchat_printf(ph, "Tcl plugin for XChat - Version %s\n", VERSION);
-    xchat_print(ph, "Copyright 2002-2005 Daniel P. Stasinski\n");
+#if 0
+    xchat_printf(ph, "Tcl plugin for HexChat - Version %s\n", VERSION);
+    xchat_print(ph, "Copyright 2002-2012 Daniel P. Stasinski\n");
    xchat_print(ph, "http://www.scriptkitties.com/tclplugin/\n");
+#endif
 }

 int xchat_plugin_init(xchat_plugin * plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg)
@ -2229,7 +2233,7 @@ int xchat_plugin_init(xchat_plugin * plugin_handle, char **plugin_name, char **p

    if (initialized != 0) {
        banner();
-        xchat_print(ph, "Tcl plugin already loaded");
+        xchat_print(ph, "Tcl interface already loaded");
        reinit_tried++;
        return 0;
    }
@ -2282,7 +2286,7 @@ void xchat_plugin_get_info(char **name, char **desc, char **version, void **rese
 {
   strncpy(VERSION, &RCSID[19], 5);
   *name = "tclplugin";
-   *desc = "Tcl plugin for XChat";
+   *desc = "Tcl plugin for HexChat";
   *version = VERSION;
   if (reserved)
      *reserved = NULL;
--- a/plugins/tcl/tclplugin.h
+++ b/plugins/tcl/tclplugin.h
@ -2,8 +2,8 @@
                           tclplugin.h  -  TCL plugin header file
                           -------------------------------------------------
    begin                : Sat Nov  9 17:31:20 MST 2002
-    copyright            : Copyright 2002-2010 Daniel P. Stasinski
-    email                : daniel@avenues.org
+    copyright            : Copyright 2002-2012 Daniel P. Stasinski
+    email                : daniel@GenericInbox.com
 ***************************************************************************/

 /***************************************************************************
--- a/plugins/upd/upd.vcxproj
+++ b/plugins/upd/upd.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcupd</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcupd</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -84,7 +84,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;UPD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/plugins/upd/upd.vcxproj.user
+++ b/plugins/upd/upd.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/winamp/winamp.vcxproj
+++ b/plugins/winamp/winamp.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcwinamp</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcwinamp</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -82,7 +82,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINAMP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
--- a/plugins/winamp/winamp.vcxproj.user
+++ b/plugins/winamp/winamp.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/winsys/winsys.vcxproj
+++ b/plugins/winsys/winsys.vcxproj
@ -45,14 +45,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcwinsys</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcwinsys</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -85,7 +85,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;WINSYS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WINSYS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
--- a/plugins/winsys/winsys.vcxproj.user
+++ b/plugins/winsys/winsys.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/wmpa/wmpa.vcxproj
+++ b/plugins/wmpa/wmpa.vcxproj
@ -47,14 +47,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcwmpa</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <LinkIncremental>false</LinkIncremental>
    <TargetName>hcwmpa</TargetName>
-    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
-    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin\</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -84,7 +84,7 @@
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;NDEBUG;_WINDOWS;_USRDLL;WMPA_EXPORTS;_AFXDLL;_AFX_NO_DAO_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;WMPA_EXPORTS;_AFXDLL;_AFX_NO_DAO_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MultiProcessorCompilation>false</MultiProcessorCompilation>
    </ClCompile>
    <Link>
--- a/plugins/wmpa/wmpa.vcxproj.user
+++ b/plugins/wmpa/wmpa.vcxproj.user
@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
--- a/plugins/wmpa/xchat-plugin.cpp
+++ b/plugins/wmpa/xchat-plugin.cpp
@ -131,7 +131,7 @@ void wmpaCommands(void)
   xchat_printf(ph, "WMPA: /play            : Play the current song");
   xchat_printf(ph, "WMPA: /pause           : Pause the current song");
   xchat_printf(ph, "WMPA: /prev            : Play the previous song");
-   xchat_printf(ph, "WMPA: /song            : Announce the current song from Windows Media Player in xchat");
+   xchat_printf(ph, "WMPA: /song            : Announce the current song from Windows Media Player in HexChat");
   xchat_printf(ph, "WMPA: /stop            : Stop the current song");
   xchat_printf(ph, "WMPA: /volume [volume] : Set the volume (0 to 100) or display the current volume");
   xchat_printf(ph, "WMPA: /wmpahelp        : Display this help.");
--- a/po/be.po
+++ b/po/be.po
@ -2898,7 +2898,7 @@ msgstr "Вы можаце адкрыць акно са спісам забаро

 #: src/fe-gtk/banlist.c:321
 #, c-format
-msgid "XChat: Ban List (%s)"
+msgid ": Ban List (%s)"
 msgstr "XChat: спіс забаронаў (%s)"

 #: src/fe-gtk/banlist.c:337
@ -2936,7 +2936,7 @@ msgstr "Капіяваць тэкст _тэмы"

 #: src/fe-gtk/chanlist.c:677
 #, c-format
-msgid "XChat: Channel List (%s)"
+msgid ": Channel List (%s)"
 msgstr "XChat: Спіс каналаў (%s)"

 #: src/fe-gtk/chanlist.c:733
@ -3024,7 +3024,7 @@ msgid "Cannot resume the same file from two people."
 msgstr "Немагчыма працягнуць той жа самы файл з двух чалавек."

 #: src/fe-gtk/dccgui.c:740
-msgid "XChat: Uploads and Downloads"
+msgid ": Uploads and Downloads"
 msgstr "XChat: запампоўкі і спампоўкі"

 #: src/fe-gtk/dccgui.c:756 src/fe-gtk/dccgui.c:993 src/fe-gtk/notifygui.c:138
@ -3080,7 +3080,7 @@ msgid "Open Folder..."
 msgstr "Адкрыць тэчку..."

 #: src/fe-gtk/dccgui.c:982
-msgid "XChat: DCC Chat List"
+msgid ": DCC Chat List"
 msgstr "XChat: Спіс DCC Chat"

 #: src/fe-gtk/dccgui.c:995
@ -3284,7 +3284,7 @@ msgid "Action"
 msgstr "Дзеянне"

 #: src/fe-gtk/fkeys.c:718
-msgid "XChat: Keyboard Shortcuts"
+msgid ": Keyboard Shortcuts"
 msgstr "XChat: Камбінацыі клавішаў"

 #: src/fe-gtk/fkeys.c:796
@ -3392,7 +3392,7 @@ msgid "Enter mask to ignore:"
 msgstr "Увядзіце маску для ігнаравання:"

 #: src/fe-gtk/ignoregui.c:354
-msgid "XChat: Ignore list"
+msgid ": Ignore list"
 msgstr "XChat: Спіс ігнараванняў"

 #: src/fe-gtk/ignoregui.c:361
@ -3428,7 +3428,7 @@ msgid "Channel name too short, try again."
 msgstr "Імя канала занадта кароткае, паспрабуйце зноў."

 #: src/fe-gtk/joind.c:125
-msgid "XChat: Connection Complete"
+msgid ": Connection Complete"
 msgstr "XChat: Злучэнне выканана"

 #: src/fe-gtk/joind.c:150
@ -3660,7 +3660,7 @@ msgid "Cycle Channel"
 msgstr "Каналы па кругу"

 #: src/fe-gtk/menu.c:864
-msgid "XChat: User menu"
+msgid ": User menu"
 msgstr "XChat: Меню карыстальніка"

 #: src/fe-gtk/menu.c:873
@ -3806,11 +3806,11 @@ msgstr ""
 "абалонка, а не XChat"

 #: src/fe-gtk/menu.c:1192
-msgid "XChat: User Defined Commands"
+msgid ": User Defined Commands"
 msgstr "XChat: Вызначаныя карыстальнікам каманды"

 #: src/fe-gtk/menu.c:1199
-msgid "XChat: Userlist Popup menu"
+msgid ": Userlist Popup menu"
 msgstr "XChat: Кантэкстнае меню спісу карыстальнікаў"

 #: src/fe-gtk/menu.c:1206
@ -3818,23 +3818,23 @@ msgid "Replace with"
 msgstr "Замяніць"

 #: src/fe-gtk/menu.c:1206
-msgid "XChat: Replace"
+msgid ": Replace"
 msgstr "XChat: Замена"

 #: src/fe-gtk/menu.c:1213
-msgid "XChat: URL Handlers"
+msgid ": URL Handlers"
 msgstr "XChat: Апрацоўчыкі URL"

 #: src/fe-gtk/menu.c:1232
-msgid "XChat: Userlist buttons"
+msgid ": Userlist buttons"
 msgstr "XChat: Кнопкі спісу карыстальнікаў"

 #: src/fe-gtk/menu.c:1239
-msgid "XChat: Dialog buttons"
+msgid ": Dialog buttons"
 msgstr "XChat: Кнопкі дыялогу"

 #: src/fe-gtk/menu.c:1246
-msgid "XChat: CTCP Replies"
+msgid ": CTCP Replies"
 msgstr "XChat: Адказы CTCP"

 #: src/fe-gtk/menu.c:1344
@ -4103,7 +4103,7 @@ msgid "Comma separated list of networks is accepted."
 msgstr "Прымаецца спіс сеціваў, падзеленых коскамі."

 #: src/fe-gtk/notifygui.c:407
-msgid "XChat: Notify List"
+msgid ": Notify List"
 msgstr "XChat: спіс абвяшчэнняў"

 #: src/fe-gtk/notifygui.c:424
@ -4124,7 +4124,7 @@ msgstr ""

 #: src/fe-gtk/plugin-tray.c:206
 #, c-format
-msgid "XChat: Connected to %u networks and %u channels"
+msgid ": Connected to %u networks and %u channels"
 msgstr "XChat: злучана з %u сецівамі і %u каналамі"

 #: src/fe-gtk/plugin-tray.c:400
@ -4166,42 +4166,42 @@ msgstr "Выхад..."

 #: src/fe-gtk/plugin-tray.c:510 src/fe-gtk/plugin-tray.c:518
 #, c-format
-msgid "XChat: Highlighed message from: %s (%s)"
+msgid ": Highlighed message from: %s (%s)"
 msgstr "XChat: Падсвечанае паведамленне ад: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:513
 #, c-format
-msgid "XChat: %u highlighted messages, latest from: %s (%s)"
+msgid ": %u highlighted messages, latest from: %s (%s)"
 msgstr "XChat: %u падсвечаных паведамленняў, апошняе ад: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:536 src/fe-gtk/plugin-tray.c:543
 #, c-format
-msgid "XChat: New public message from: %s (%s)"
+msgid ": New public message from: %s (%s)"
 msgstr "XChat: Новае агульнае паведамленне ад: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:539
 #, c-format
-msgid "XChat: %u new public messages."
+msgid ": %u new public messages."
 msgstr "XChat: %u новых агульных паведамленняў."

 #: src/fe-gtk/plugin-tray.c:562 src/fe-gtk/plugin-tray.c:569
 #, c-format
-msgid "XChat: Private message from: %s (%s)"
+msgid ": Private message from: %s (%s)"
 msgstr "XChat: Асабістае паведамленне ад: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:565
 #, c-format
-msgid "XChat: %u private messages, latest from: %s (%s)"
+msgid ": %u private messages, latest from: %s (%s)"
 msgstr "XChat: %u асабістых паведамленняў, апошняе ад: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:615 src/fe-gtk/plugin-tray.c:623
 #, c-format
-msgid "XChat: File offer from: %s (%s)"
+msgid ": File offer from: %s (%s)"
 msgstr "XChat: прапанова файла ад: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:618
 #, c-format
-msgid "XChat: %u file offers, latest from: %s (%s)"
+msgid ": %u file offers, latest from: %s (%s)"
 msgstr "XChat: %u прапаноў файлаў, апошняя ад: %s (%s)"

 #: src/fe-gtk/plugingui.c:76 src/fe-gtk/textgui.c:421
@ -4213,7 +4213,7 @@ msgid "Select a Plugin or Script to load"
 msgstr "Выберыце плагін ці скрыпт для загрузкі"

 #: src/fe-gtk/plugingui.c:223
-msgid "XChat: Plugins and Scripts"
+msgid ": Plugins and Scripts"
 msgstr "XChat: плагіны і скрыпты"

 #: src/fe-gtk/plugingui.c:229
@ -4235,7 +4235,7 @@ msgstr "Захаваць як..."

 #: src/fe-gtk/rawlog.c:97
 #, c-format
-msgid "XChat: Rawlog (%s)"
+msgid ": Rawlog (%s)"
 msgstr "XChat: Журнал (%s)"

 #: src/fe-gtk/rawlog.c:127
@ -4251,7 +4251,7 @@ msgid "Search hit end, not found."
 msgstr "Пошук дасягнуў канца, не знойдзена."

 #: src/fe-gtk/search.c:109
-msgid "XChat: Search"
+msgid ": Search"
 msgstr "XChat: Пошук"

 #: src/fe-gtk/search.c:127
@ -4281,7 +4281,7 @@ msgstr "Імя карыстальніка і сапраўднае імя не м

 #: src/fe-gtk/servlistgui.c:978
 #, c-format
-msgid "XChat: Edit %s"
+msgid ": Edit %s"
 msgstr "XChat: Рэдагаваць %s"

 #: src/fe-gtk/servlistgui.c:997
@ -4382,7 +4382,7 @@ msgid "_Edit"
 msgstr "_Рэдагаваць"

 #: src/fe-gtk/servlistgui.c:1230
-msgid "XChat: Network List"
+msgid ": Network List"
 msgstr "XChat: спіс абвяшчэнняў"

 #: src/fe-gtk/servlistgui.c:1242
@ -5216,7 +5216,7 @@ msgstr ""
 "нехта можа даслаць вам .bash_profile"

 #: src/fe-gtk/setup.c:1989
-msgid "XChat: Preferences"
+msgid ": Preferences"
 msgstr "XChat: Асаблівасці"

 #: src/fe-gtk/textgui.c:177
@ -5253,7 +5253,7 @@ msgid "URL"
 msgstr "URL"

 #: src/fe-gtk/urlgrab.c:188
-msgid "XChat: URL Grabber"
+msgid ": URL Grabber"
 msgstr "XChat: Зборшчык URL"

 #: src/fe-gtk/urlgrab.c:201
--- a/po/cs.po
+++ b/po/cs.po
@ -3002,7 +3002,7 @@ msgstr "Okno se seznamem banů otevřet pouze pokud se nacházíte na kanálu."

 #: src/fe-gtk/banlist.c:321
 #, c-format
-msgid "XChat: Ban List (%s)"
+msgid ": Ban List (%s)"
 msgstr "XChat: Seznam Banů (%s)"

 #: src/fe-gtk/banlist.c:337
@ -3040,7 +3040,7 @@ msgstr "Zkopíruje _téma kanálu"

 #: src/fe-gtk/chanlist.c:714
 #, c-format
-msgid "XChat: Channel List (%s)"
+msgid ": Channel List (%s)"
 msgstr "XChat: Seznam kanálu (%s)"

 #: src/fe-gtk/chanlist.c:771
@ -3132,7 +3132,7 @@ msgid "Cannot resume the same file from two people."
 msgstr "Nemohu pokračovat ve stahování souboru od dvou lidí."

 #: src/fe-gtk/dccgui.c:740
-msgid "XChat: Uploads and Downloads"
+msgid ": Uploads and Downloads"
 msgstr "XChat: Upload a Download"

 #: src/fe-gtk/dccgui.c:756 src/fe-gtk/dccgui.c:993 src/fe-gtk/notifygui.c:138
@ -3188,7 +3188,7 @@ msgid "Open Folder..."
 msgstr "Otevřít adresář"

 #: src/fe-gtk/dccgui.c:982
-msgid "XChat: DCC Chat List"
+msgid ": DCC Chat List"
 msgstr "XChat: Seznam DCC Chat"

 #: src/fe-gtk/dccgui.c:995
@ -3453,7 +3453,7 @@ msgid "Action"
 msgstr "Akce"

 #: src/fe-gtk/fkeys.c:718
-msgid "XChat: Keyboard Shortcuts"
+msgid ": Keyboard Shortcuts"
 msgstr "XChat: Klávesové zkratky"

 #: src/fe-gtk/fkeys.c:796
@ -3561,7 +3561,7 @@ msgid "Enter mask to ignore:"
 msgstr "Zadejte masku pro ignorování:"

 #: src/fe-gtk/ignoregui.c:354
-msgid "XChat: Ignore list"
+msgid ": Ignore list"
 msgstr "XChat: Seznam ignorovaných"

 #: src/fe-gtk/ignoregui.c:361
@ -3597,7 +3597,7 @@ msgid "Channel name too short, try again."
 msgstr "Název kanálu je příliš krátký, zkuste to znovu."

 #: src/fe-gtk/joind.c:125
-msgid "XChat: Connection Complete"
+msgid ": Connection Complete"
 msgstr "XChat: Dokončení připojení"

 #: src/fe-gtk/joind.c:150
@ -3860,7 +3860,7 @@ msgid "Cycle Channel"
 msgstr "Otočit kanál"

 #: src/fe-gtk/menu.c:892
-msgid "XChat: User menu"
+msgid ": User menu"
 msgstr "X-Chat: Uživatelské menu"

 #: src/fe-gtk/menu.c:901
@ -4007,11 +4007,11 @@ msgstr ""
 "XChatu"

 #: src/fe-gtk/menu.c:1226
-msgid "XChat: User Defined Commands"
+msgid ": User Defined Commands"
 msgstr "X-Chat: Uživatelem definované příkazy"

 #: src/fe-gtk/menu.c:1233
-msgid "XChat: Userlist Popup menu"
+msgid ": Userlist Popup menu"
 msgstr "XChat: Menu se seznamem uživatelů"

 #: src/fe-gtk/menu.c:1240
@ -4019,23 +4019,23 @@ msgid "Replace with"
 msgstr "Nahradit s"

 #: src/fe-gtk/menu.c:1240
-msgid "XChat: Replace"
+msgid ": Replace"
 msgstr "X-Chat: Nahrazení"

 #: src/fe-gtk/menu.c:1247
-msgid "XChat: URL Handlers"
+msgid ": URL Handlers"
 msgstr "XChat: Obsluhy URL"

 #: src/fe-gtk/menu.c:1266
-msgid "XChat: Userlist buttons"
+msgid ": Userlist buttons"
 msgstr "XChat: Tlačítka uživatelského seznamu"

 #: src/fe-gtk/menu.c:1273
-msgid "XChat: Dialog buttons"
+msgid ": Dialog buttons"
 msgstr "XChat: Dialogová tlačítka"

 #: src/fe-gtk/menu.c:1280
-msgid "XChat: CTCP Replies"
+msgid ": CTCP Replies"
 msgstr "XChat: Odpovědi CTCP"

 #: src/fe-gtk/menu.c:1378
@ -4308,7 +4308,7 @@ msgid "Comma separated list of networks is accepted."
 msgstr "Čárkou oddělený seznam zvolených sítí."

 #: src/fe-gtk/notifygui.c:407
-msgid "XChat: Notify List"
+msgid ": Notify List"
 msgstr "XChat: Seznam upozornění"

 #: src/fe-gtk/notifygui.c:424
@ -4329,7 +4329,7 @@ msgstr ""

 #: src/fe-gtk/plugin-tray.c:214
 #, c-format
-msgid "XChat: Connected to %u networks and %u channels"
+msgid ": Connected to %u networks and %u channels"
 msgstr "XChat: Připojen k %u sítím a %u kanálům"

 #: src/fe-gtk/plugin-tray.c:451
@ -4358,42 +4358,42 @@ msgstr "Zvýrazněná zpráva"

 #: src/fe-gtk/plugin-tray.c:507 src/fe-gtk/plugin-tray.c:515
 #, c-format
-msgid "XChat: Highlighted message from: %s (%s)"
+msgid ": Highlighted message from: %s (%s)"
 msgstr "XChat: Zvýrazněná zpráva od: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:510
 #, c-format
-msgid "XChat: %u highlighted messages, latest from: %s (%s)"
+msgid ": %u highlighted messages, latest from: %s (%s)"
 msgstr "XChat: %u zvýrazněných zpráv, poslední od: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:533 src/fe-gtk/plugin-tray.c:540
 #, c-format
-msgid "XChat: New public message from: %s (%s)"
+msgid ": New public message from: %s (%s)"
 msgstr "XChat: Nová veřejná zpráva od: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:536
 #, c-format
-msgid "XChat: %u new public messages."
+msgid ": %u new public messages."
 msgstr "XChat: %u nových veřejných zpráv."

 #: src/fe-gtk/plugin-tray.c:562 src/fe-gtk/plugin-tray.c:569
 #, c-format
-msgid "XChat: Private message from: %s (%s)"
+msgid ": Private message from: %s (%s)"
 msgstr "XChat: Soukromá zpráva od: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:565
 #, c-format
-msgid "XChat: %u private messages, latest from: %s (%s)"
+msgid ": %u private messages, latest from: %s (%s)"
 msgstr "XChat: %u soukromých zpráv, poslední od: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:615 src/fe-gtk/plugin-tray.c:623
 #, c-format
-msgid "XChat: File offer from: %s (%s)"
+msgid ": File offer from: %s (%s)"
 msgstr "XChat: Nabídka souboru od: %s (%s)"

 #: src/fe-gtk/plugin-tray.c:618
 #, c-format
-msgid "XChat: %u file offers, latest from: %s (%s)"
+msgid ": %u file offers, latest from: %s (%s)"
 msgstr "XChat: %u nabídnutých souborů, poslední od: %s (%s)"

 #: src/fe-gtk/plugingui.c:76 src/fe-gtk/textgui.c:424
@ -4405,7 +4405,7 @@ msgid "Select a Plugin or Script to load"
 msgstr "Zvolit plugin nebo skript pro načtení"

 #: src/fe-gtk/plugingui.c:223
-msgid "XChat: Plugins and Scripts"
+msgid ": Plugins and Scripts"
 msgstr "XChat: Pluginy a skripty"

 #: src/fe-gtk/plugingui.c:229
@ -4427,7 +4427,7 @@ msgstr "Uložit jako..."

 #: src/fe-gtk/rawlog.c:97
 #, c-format
-msgid "XChat: Rawlog (%s)"
+msgid ": Rawlog (%s)"
 msgstr "XChat: Rawlog (%s)"

 #: src/fe-gtk/rawlog.c:127
@ -4443,7 +4443,7 @@ msgid "Search hit end, not found."
 msgstr "Nebylo nic nalezeno."

 #: src/fe-gtk/search.c:109
-msgid "XChat: Search"
+msgid ": Search"
 msgstr "XChat: Vyhledávání"

 #: src/fe-gtk/search.c:127
@ -4474,7 +4474,7 @@ msgstr "Uživatelské jméno a skutečné jméno nemohou být prázdná políčk

 #: src/fe-gtk/servlistgui.c:978
 #, c-format
-msgid "XChat: Edit %s"
+msgid ": Edit %s"
 msgstr "XChat: Upravit %s"

 #: src/fe-gtk/servlistgui.c:997
@ -4585,7 +4585,7 @@ msgid "_Edit"
 msgstr "_Editovat"

 #: src/fe-gtk/servlistgui.c:1230
-msgid "XChat: Network List"
+msgid ": Network List"
 msgstr "XChat: Seznam sítí"

 #: src/fe-gtk/servlistgui.c:1242
@ -5445,7 +5445,7 @@ msgstr ""
 "Někdo vám může poslat soubor .bash_profile"

 #: src/fe-gtk/setup.c:2011
-msgid "XChat: Preferences"
+msgid ": Preferences"
 msgstr "XChat: Nastavení"

 #: src/fe-gtk/textgui.c:180
@ -5482,7 +5482,7 @@ msgid "URL"
 msgstr "URL"

 #: src/fe-gtk/urlgrab.c:188
-msgid "XChat: URL Grabber"
+msgid ": URL Grabber"
 msgstr "XChat: Grabování URL"

 #: src/fe-gtk/urlgrab.c:201
@ -5590,7 +5590,7 @@ msgstr "%d op, %d celkem"
 #~ msgid "Speed limit"
 #~ msgstr "Omezení rychlosti"

-#~ msgid "XChat: File Receive List"
+#~ msgid ": File Receive List"
 #~ msgstr "XChat: Seznam přijmutých souborů"

 #~ msgid "Open"
@ -5599,7 +5599,7 @@ msgstr "%d op, %d celkem"
 #~ msgid "Ack"
 #~ msgstr "Ack"

-#~ msgid "XChat: File Send List"
+#~ msgid ": File Send List"
 #~ msgstr "XChat: Seznam poslaných souborů"

 #~ msgid "To/From"
--- a/po/de.po
+++ b/po/de.po
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Berke Viktor	f750097617	Enable updates to 2.9.1	2012-07-27 17:06:36 +02:00
Berke Viktor	42a1ed1b8b	Add info about HexChat changelog	2012-07-27 17:00:23 +02:00
Berke Viktor	1cbb226179	Update XChat to r1521 part 2	2012-07-27 11:49:11 +02:00
Berke Viktor	fdd3f3aa89	Update XChat to r1521	2012-07-27 11:47:49 +02:00
Richard Hitt	8752861b7e	Remember last search pattern during sessions	2012-07-27 11:37:14 +02:00
Berke Viktor	b6e62524f4	Fix Perl interface filename in the installer, too	2012-07-27 00:35:40 +02:00
Berke Viktor	cd0ffbe8ba	Fix auto-loading the Perl interface on Windows	2012-07-27 00:24:56 +02:00
Berke Viktor	9f0559ffe5	Update notes about config changes	2012-07-26 23:42:33 +02:00
Berke Viktor	94c66e935d	Make FiSHLiM consistent with recent naming changes	2012-07-26 23:41:03 +02:00
Berke Viktor	52175f439a	Don't hardcode path when printing error message for config dir creation	2012-07-26 22:18:38 +02:00
Berke Viktor	ec301a5a54	Auto-load user plugins and scripts from <config>/addons On Unix leave $(libdir)/hexchat/plugins for plugin packagers, on Windows prevent users from modifying Program Files by ignoring everything except bundled plugins	2012-07-26 20:53:59 +02:00
Berke Viktor	7f831646bb	Autoload local plugins from <config>/plugins	2012-07-26 16:19:45 +02:00
Richard Hitt	309f1d3562	Fix memory leak in lastlog	2012-07-26 08:58:00 +02:00
Richard Hitt	ead7f234e5	Initial support for lastlog -r on win32 (Richard)	2012-07-25 22:14:27 +02:00
Berke Viktor	0d36e0cd2f	No idea why I put 2011 here	2012-07-24 12:53:06 +02:00
Berke Viktor	1c447889f9	This applies to all scripts/plugins, not just Perl	2012-07-24 12:52:44 +02:00
Berke Viktor	1268ec4bc3	No reason to put Windows on the bottom	2012-07-23 11:01:06 +02:00
Berke Viktor	ef9fc1bcbb	Don't suggest --enable-maintainer-mode, noone's using it anyway	2012-07-23 10:54:23 +02:00
Berke Viktor	4e2d376390	Make HexChat remember minimum and maximum users set in channel list	2012-07-23 10:09:39 +02:00
Berke Viktor	fdc3ed47b8	Update list of supported Windows versions	2012-07-23 09:27:00 +02:00
Berke Viktor	157dab258e	Now, really fix grep on Windows	2012-07-22 02:23:30 +02:00
Berke Viktor	22cde0e5a2	Make GREP work on Windows, regexp support isn't implemented in fe_lastlog yet	2012-07-22 02:13:36 +02:00
Berke Viktor	6533b75313	Unused sndPlaySound method for future reference	2012-07-21 23:06:04 +02:00
Berke Viktor	56afb16608	GtkFileFilter shouldn't be g_freed	2012-07-21 21:56:19 +02:00
Berke Viktor	6091c8e75e	Fix error message displayed when cannot create config folder	2012-07-21 21:43:14 +02:00
Berke Viktor	bc651b0222	Add extension filter for file dialogs, specify filters and starting folder for loading plugins	2012-07-21 21:42:48 +02:00
Berke Viktor	2b3e1f46e3	Use <configdir>/scripts to (auto)load Lua/Perl/Python/Tcl scripts	2012-07-21 19:16:31 +02:00
Berke Viktor	9ea3ac9ddd	Update .gitignore to include all Unix-specific files	2012-07-21 17:09:54 +02:00
Berke Viktor	d05d298bbb	Get rid of yet another implicit declaration	2012-07-21 16:25:08 +02:00
Berke Viktor	9dd3942c88	Minor cosmetics for util.c too	2012-07-21 16:17:53 +02:00
Berke Viktor	92cb1dc12c	Reformat the DNS plugin a bit while we're at it	2012-07-21 16:16:30 +02:00
Berke Viktor	d559401c50	Supposed fix for g_io_channel_read() deprecation	2012-07-21 16:16:00 +02:00
Berke Viktor	0e3fbb01d7	Add _AMD64_ definition for x64 builds, make Visual Studio even happier	2012-07-21 14:59:25 +02:00
Berke Viktor	2ae76fcacf	Add trailing backslashes to Output and Intermediate directories, make Visual Studio happy	2012-07-21 14:46:29 +02:00
Berke Viktor	c1f332f0a2	More unused variables	2012-07-21 14:36:16 +02:00
Berke Viktor	e7f723539d	Some aid for compiler warnings	2012-07-21 14:26:19 +02:00
Berke Viktor	4cae471af3	Add MS Gothic to default list of alternative fonts	2012-07-21 11:46:56 +02:00
Berke Viktor	63ae51242b	Some XChat string left out	2012-07-20 22:01:21 +02:00
Berke Viktor	f15b8090b7	Eliminate some Tcl noise	2012-07-20 19:12:39 +02:00
Berke Viktor	78cc4adfed	Only g_free() if we g_malloc() with strip_color()	2012-07-20 18:45:12 +02:00
Berke Viktor	1edd920362	Restructure the preferences window which in turn fixes the marker line toggle bug	2012-07-20 17:15:20 +02:00
Berke Viktor	5290c7f392	Some more rebranding	2012-07-20 15:52:33 +02:00
Berke Viktor	47d6222f1c	Be consistent about caps	2012-07-20 15:50:42 +02:00
bviktor	7fdcf9620e	Merge pull request #9 from XhmikosR/master more branding changes	2012-07-20 06:43:35 -07:00
Berke Viktor	27c6150ab3	Fix file version info	2012-07-20 15:41:08 +02:00
xhmikosr	d4ce3fb240	Merge branch 'master' of https://github.com/XhmikosR/hexchat	2012-07-19 18:30:37 +03:00
xhmikosr	f535702903	more branding changes	2012-07-19 18:30:12 +03:00
xhmikosr	c9634793dd	more branding changes	2012-07-19 18:25:49 +03:00
Berke Viktor	0d87087fce	Add note about building info	2012-07-19 12:10:06 +02:00
Berke Viktor	504e4f2e66	Remove obsolete and empty files	2012-07-19 12:09:37 +02:00
Berke Viktor	397425a9aa	Version bump for tarname too	2012-07-19 12:02:59 +02:00
Berke Viktor	d4eebf7424	Update Unix build instructions	2012-07-19 11:37:23 +02:00
Berke Viktor	521d60736d	Oh sweet free()dom	2012-07-19 10:34:48 +02:00
Berke Viktor	ef81a24f64	Add option to retain colors in scrollback	2012-07-19 09:14:56 +02:00
Berke Viktor	89584e565a	A decent WizardImage for the installer	2012-07-18 22:55:21 +02:00
Berke Viktor	1084a85d5d	Rebrand the manifest file too	2012-07-18 22:27:15 +02:00
Berke Viktor	7fff475fda	Rebrand HexTray and fix icon rendering for certain events	2012-07-18 22:23:09 +02:00
Berke Viktor	a251934b36	Fix dbus-libproxy confusion causing compilation to fail with dbus disabled and libproxy present	2012-07-18 21:19:11 +02:00
Berke Viktor	cb2f9f3e7b	Use GTK+ file dialogs on Windows too, the Win32 dialogs are too buggy	2012-07-18 20:16:35 +02:00
Berke Viktor	b63a4ced19	Fix Checksum compilation on Windows	2012-07-18 18:48:45 +02:00
Berke Viktor	f6f1dafc27	Remove duplicates caused by manual find-n-replace in German translation	2012-07-18 16:28:02 +02:00
Berke Viktor	ad711026f5	Use hardcoded string for this one instance, otherwise it may be untranslatable for certain languages	2012-07-18 16:22:58 +02:00
Berke Viktor	d39acb7ae2	Replace hardcoded "XChat:" strings in translations	2012-07-18 16:11:16 +02:00
Berke Viktor	bc6a452c54	Don't use hardcoded string for quit window	2012-07-18 16:06:00 +02:00
Berke Viktor	a4e32b104c	Update quit window string	2012-07-18 16:02:52 +02:00
bviktor	cfb9f4738b	Merge pull request #5 from gandaro/german-translation Update for German translation	2012-07-18 06:54:54 -07:00
Berke Viktor	3ce307994d	Add FAQ entry for migrating from XChat	2012-07-18 15:51:04 +02:00
Berke Viktor	e0c9af93a6	configure.in cosmetics	2012-07-18 15:41:01 +02:00
Berke Viktor	e690b83f4a	Even more rebranding for the D-Bus plugin	2012-07-18 15:24:21 +02:00
Berke Viktor	746d9b542b	Complete the rebranding of the D-Bus plugin	2012-07-18 15:18:43 +02:00
Berke Viktor	1b0c07f8ea	Checksum Unix support and configure.in cosmetics	2012-07-18 14:50:58 +02:00
Berke Viktor	d3effc806f	Improve the logic for FiSHLiM checks	2012-07-18 14:03:15 +02:00
Berke Viktor	8aaff85e70	Prepare FiSHLiM to use the plugin config API	2012-07-18 11:17:21 +02:00
Berke Viktor	a4052aff32	Add some Unix-specific files for .gitignore, more to come later	2012-07-18 10:51:39 +02:00
Berke Viktor	1d3c6d672e	Add make support for FiSHLiM on Unix	2012-07-18 10:51:22 +02:00
Jakob Kramer	f6eee67ae1	Update for German translation	2012-07-17 23:08:08 +02:00
Berke Viktor	0cf80ecb32	For private messages, use message icon instead of hightlight icon	2012-07-17 20:45:51 +02:00
Berke Viktor	8ef97f24e0	Update Plugin-Tray icons (TingPing)	2012-07-17 20:45:11 +02:00
Berke Viktor	2044a9568c	Add make support for Do At on Unix	2012-07-17 19:47:19 +02:00
Berke Viktor	e5f4c4d217	Add make support for SASL on Unix	2012-07-17 19:19:48 +02:00
Jakob Kramer	6d55ce363b	Unix compatibility for SASL	2012-07-17 18:37:29 +02:00
Berke Viktor	e47235efe3	Remove tab_xp as it was an xchat-windows thing	2012-07-16 22:56:28 +02:00
Berke Viktor	d8225f79f6	Update logos thanks to TingPing, now only WizardImage is left	2012-07-16 22:53:28 +02:00
Berke Viktor	e222ff56e2	Use highest compression available, it actually speeds up compression and slightly reduces executable size, no reason not to use it	2012-07-16 00:52:55 +02:00
bviktor	eecc005901	Merge pull request #4 from cremno/master Unescaped backslash in mutex object name	2012-07-15 15:39:27 -07:00
cremno	8f4399f900	escaped an unescaped backslash	2012-07-15 23:42:41 +02:00
Berke Viktor	f78acf5eda	Another supposed fix for tray restoration	2012-07-15 14:54:44 +02:00
Berke Viktor	74ad736626	Update version and revision info	2012-07-15 12:32:45 +02:00
Berke Viktor	bf98464d2d	Windows doesn't seem to like the hexchat mutex, stops working after some time, let's use the old, working one (might be a Win8 bug though)	2012-07-15 12:29:17 +02:00
Berke Viktor	b20e8feca2	Add these back, removed with XChat r1516 by the GTK check cleanup	2012-07-15 11:07:16 +02:00
Berke Viktor	7f675ca254	Update a few remaining XChat strings in HexTray	2012-07-14 23:53:24 +02:00
Berke Viktor	ad65235bbe	Add copyright while we're at it	2012-07-14 20:56:00 +02:00
Berke Viktor	1e1501fdcc	Update XChat to r1520	2012-07-14 20:54:00 +02:00
Berke Viktor	095d32556c	Update XChat to r1519	2012-07-14 20:52:41 +02:00
Berke Viktor	11b73bc8a7	Update XChat to r1517	2012-07-14 20:50:00 +02:00
Berke Viktor	c80cb47e5c	Update XChat to r1516	2012-07-14 20:46:42 +02:00
Berke Viktor	a5cc3b15d7	Ultra compression slows down compilation but doesn't really reduce the size, isn't worth it	2012-07-14 20:24:07 +02:00
Berke Viktor	98dd5b89cb	Update script/plugin paths in README	2012-07-14 20:23:11 +02:00
Berke Viktor	17e6e2ada4	This is breaking page rendering	2012-07-14 20:23:00 +02:00
Berke Viktor	37bd8287c7	Fix EOLs screwed up by GitHub client actually	2012-07-14 20:15:53 +02:00
bviktor	87074105be	Merge pull request #1 from XhmikosR/master Minor changes, merge as a whole for convenience, update it slightly later	2012-07-14 11:03:38 -07:00
Berke Viktor	016ebd8899	Fix EOLs screwed up by GitHub	2012-07-14 19:48:30 +02:00
bviktor	5749eee43c	Merge pull request #2 from TingPing/master Update scripting interfaces to use correct libdir	2012-07-14 10:24:35 -07:00
TingPing	8d643d376f	Update master	2012-07-14 09:42:53 -03:00
TingPing	a19fc013a5	fixed plugins using correct libdir	2012-07-14 02:22:24 -05:00
xhmikosr	34bae3ef6d	remove a few more *.user files	2012-07-14 06:14:27 +03:00
xhmikosr	3a06b7779a	win32/nls/nls.vcxproj: get rid of unused elements	2012-07-14 06:10:37 +03:00
xhmikosr	a6729b2266	remove trailing space	2012-07-14 06:06:48 +03:00
xhmikosr	d26c9c23b8	installer: use lzma2/ultra compression	2012-07-14 06:06:37 +03:00
xhmikosr	1d0c2943c4	more XChat to HexChat renaming	2012-07-14 06:04:45 +03:00
xhmikosr	1fae4ef09f	get rid of *.user files and ignore them	2012-07-14 06:03:42 +03:00