Python: Use iterator for get_list()

and don't hardcode 2.7/3.3

.gitignore

@@ -20,6 +20,8 @@ config.sub
 configure
 configure.tmp
 depcomp
+doxygen*.tmp
+html/
 install-sh
 intl/
 libtool
@@ -32,6 +34,7 @@ po/Makefile.in.in
 po/POTFILES
 po/remove-potcdate.sed
 po/stamp-po
+share/pkgconfig/hexchat-plugin.pc
 src/common/dbus/example
 src/common/dbus/marshallers.h
 src/common/dbus/org.hexchat.service.service
@@ -41,7 +44,11 @@ src/common/textenums.h
 src/common/textevents.h
 src/fe-gtk/hexchat
 src/fe-text/hexchat-text
+src/htm/Main.resources
 src/htm/thememan.exe
+src/htm/thememan.exe.config
+src/htm/thememan.exe.mdb
+src/htm/thememan
 stamp-h1
 *.a
 *.o
@@ -50,14 +57,17 @@ stamp-h1
 *.gmo
 *.mo
 *.po~
+*.patch
 # Win32 generated files
 plugins/wmpa/wmpa_h.h
 plugins/wmpa/wmpa_i.c
 src/pixmaps/inline_pngs.h
 src/htm/obj/*
-win32/build/*
-win32/build-xp/*
 win32/ipch/*
+win32/ext/perl/perl-x86-cache
+win32/ext/perl/perl-x86-SetupFiles
+win32/ext/perl/perl-x64-cache
+win32/ext/perl/perl-x64-SetupFiles
 resource.h
 *.opensdf
 *.sdf

.travis.yml

@@ -0,0 +1,14 @@
+language: c
+compiler: gcc
+before_script:
+    - sudo apt-get build-dep -qq xchat
+    - sudo apt-get install -qq libnotify-dev libproxy-dev libpci-dev libcanberra-dev monodevelop
+script: 
+    - ./autogen.sh
+    - ./configure --enable-textfe --with-theme-manager
+    - make
+notifications:
+    irc:
+        channels: "chat.freenode.net#hexchat-devel"
+        template: "Build #%{build_number} (%{commit}) by %{author}: %{message}"
+        on_success: change

.tx/config

@@ -1,9 +1,8 @@
-[main]
+[main]
-host = https://www.transifex.com
+host = https://www.transifex.com
-
+
-[hexchat.main]
+[hexchat.main]
-file_filter = po\<lang>.po
+file_filter = po/<lang>.po
-source_file = po\hexchat.pot
+source_file = po/hexchat.pot
-source_lang = en
+source_lang = en
-type = PO
+type = PO
-

.tx/howto.md

@@ -0,0 +1,65 @@
+Go to the [Transifex client documentation](http://help.transifex.com/features/client/index.html) for more info.
+
+## Initializing a new project on Transifex
+
+<pre>
+tx init
+tx set --auto-local -r hexchat.main "po\<lang>.po" --source-lang en --source-file po\hexchat.pot --execute
+</pre>
+
+Append `type = PO` to _.tx\config_.
+
+Push the resources to Transifex:
+
+<pre>
+tx push --source --translation
+</pre>
+
+
+## Updating online translations with the template
+
+Regenerate the source file ( _hexchat.pot_ ) on a Unix machine:
+
+<pre>
+rm po/hexchat.pot && ./autogen.sh && ./configure --enable-nls && cd src/common && make textevents.h && cd../.. && make
+</pre>
+
+Push the updated source file to Transifex (this automatically updates all translation files):
+
+<pre>
+tx push --source
+</pre>
+
+
+## Updating the repo with online translations
+
+Update local copy with Transifex updates:
+
+<pre>
+tx pull
+</pre>
+
+Update GitHub repo:
+
+<pre>git add po/
+git commit
+git push
+</pre>
+
+
+## Updating just one translation with local changes
+
+<pre>
+tx push --translation --language xy
+</pre>
+
+Where _xy_ is the language code.
+
+
+## Forcing translation updates
+
+<pre>
+tx pull --force
+</pre>
+
+This might be required when the repo is freshly cloned and thus timestamps are newer than on Transifex.

.tx/howto.txt

@@ -1,41 +0,0 @@
-More info: http://help.transifex.com/features/client/index.html
-
-1) To initialize a new project on Transifex:
-
-# tx init
-# tx set --auto-local -r hexchat.main "po\<lang>.po" --source-lang en --source-file po\hexchat.pot --execute
-
-Append 'type = PO' to .tx\config without apostrophes
-
-Push the resources to Transifex
-# tx push --source --translation
-
-
-
-2) To update online translations:
-
-Regenerate the source file (hexchat.pot) on a Unix machine
-# rm po/hexchat.pot && ./autogen.sh && ./configure --enable-nls && make
-
-Push the updated source file to Transifex (this automatically updates all translation files)
-# tx push --source
-
-
-
-3) To update repo with online translations:
-
-Update local copy with Transifex updates
-# tx pull
-
-Update GitHub repo
-# git add po/
-# git commit
-# git push
-
-
-
-4) To update just one translation with local changes:
-
-# tx push --translation --language xy
-
-Where xy is the language code

Makefile.am

@@ -1,13 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po intl src plugins man
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = po intl src plugins man share
 
 EXTRA_DIST = autogen.sh
 
-icon_DATA = src/pixmaps/hexchat.png
-icondir = $(datadir)/pixmaps
-
-util_DATA = share/misc/hexchat.desktop
-utildir = $(datadir)/applications
-
-ACLOCAL_AMFLAGS = -I m4

autogen.sh

@@ -78,7 +78,7 @@ if test "$?" != "0"; then
 	exit 2
 fi
 echo running libtoolize...
-libtoolize --force
+libtoolize --copy --force --install
 if test "$?" != "0"; then
 	echo libtoolize failed, stopping.
 	exit 3
@@ -90,7 +90,7 @@ if test "$?" != "0"; then
 	exit 4
 fi
 echo running $AUTOMAKE...
-$AUTOMAKE -a
+$AUTOMAKE -a -c
 if test "$?" != "0"; then
 	echo automake failed, stopping.
 	exit 5

config-win32.h

@@ -1,4 +1,4 @@
-#define LOCALEDIR "./locale"
+#define LOCALEDIR ".\\share\\locale"
 #define ENABLE_NLS
 #define USE_GMODULE
 #define USE_PLUGIN
@@ -7,12 +7,12 @@
 #define USE_IPV6
 #define HAVE_ISO_CODES
 #define PACKAGE_NAME "hexchat"
-#define PACKAGE_VERSION "2.9.4"
+#define PACKAGE_VERSION "2.9.6"
-#define HEXCHATLIBDIR "."
+#define HEXCHATLIBDIR ".\\plugins"
 #define HEXCHATSHAREDIR "."
 #define OLD_PERL
 #define GETTEXT_PACKAGE "hexchat"
-#define PACKAGE_TARNAME "hexchat-2.9.4"
+#define PACKAGE_TARNAME "hexchat-2.9.6"
 #ifndef USE_IPV6
 #define socklen_t int
 #endif

configure.ac

@@ -1,16 +1,16 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([HexChat],[2.9.4])
+AC_INIT([HexChat],[2.9.6])
 
 AC_PREREQ([2.60])
 AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
+
 AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects no-define foreign])
-
 AM_SILENT_RULES([yes])
 
 AC_USE_SYSTEM_EXTENSIONS
@@ -21,6 +21,7 @@ AC_PROG_CPP
 AM_PROG_AS
 AM_DISABLE_STATIC
 AC_PROG_LIBTOOL
+AC_PATH_PROG(MDTOOL, mdtool, no)
 
 dnl -----------------------------------------------------------
 dnl Language Support
@@ -46,6 +47,7 @@ AH_VERBATIM([USE_GTKSPELL],[#undef USE_GTKSPELL])
 AH_VERBATIM([USE_LIBSEXY],[#undef USE_LIBSEXY])
 AH_VERBATIM([HAVE_ISO_CODES],[#undef HAVE_ISO_CODES])
 AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY])
+AH_VERBATIM([USE_LIBCANBERRA],[#undef USE_LIBCANBERRA])
 AH_VERBATIM([USE_IPV6],[#undef USE_IPV6])
 AH_VERBATIM([USE_MMX],[#undef USE_MMX])
 AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL])
@@ -87,8 +89,8 @@ AC_ARG_ENABLE(socks,
         socks=$enableval, socks=no)
 
 AC_ARG_ENABLE(ipv6,
-	[AS_HELP_STRING([--enable-ipv6],[enable IPv6 (default: no)])],
+	[AS_HELP_STRING([--disable-ipv6],[disable IPv6])],
-        ipv6=$enableval, ipv6=no)
+        ipv6=$enableval, ipv6=yes)
 
 AC_ARG_ENABLE(xft,
 	[AS_HELP_STRING([--enable-xft],[enable use of Xft directly (default: no)])],
@@ -115,21 +117,18 @@ AC_ARG_ENABLE(xlib,
         xlib=$enableval, xlib=yes)
 
 AC_ARG_ENABLE(python,
-	[AS_HELP_STRING([--disable-python],[don't build the python plugin])],
+	[AS_HELP_STRING([--enable-python=pythonversion],[build the python plugin; possible values: "python2", "python3" or specific such as "python3.3" (default on, python2)])],
-        python=$enableval, python=yes)
+        python=$enableval, python=python2)
+AS_IF([test "x$python" = "xyes"], [python=python2])
 
 AC_ARG_ENABLE(perl,
-	[AS_HELP_STRING([--disable-perl],[don't build the perl plugin])],
+	[AS_HELP_STRING([--disable-perl],[don\'t build the perl plugin])],
         perl=$enableval, perl=yes)
 
 AC_ARG_ENABLE(perl_old,
 	[AS_HELP_STRING([--disable-perl_old],[no backwards compatibility for perl plugin])],
         perl_old=$enableval, perl_old=yes)
 
-AC_ARG_ENABLE(tcl,
-	[AS_HELP_STRING([--enable-tcl[=PATH]],[directory with Tcl config file: tclConfig.sh])],
-        tcl=$enableval, tcl=yes)
-
 AC_ARG_ENABLE(plugin,
 	[AS_HELP_STRING([--disable-plugin],[disable plugin support])],
         plugin=$enableval, plugin=yes)
@@ -146,10 +145,6 @@ AC_ARG_ENABLE(fishlim,
 	[AS_HELP_STRING([--disable-fishlim],[disable the FiSHLiM plugin])],
         fishlim=$enableval, fishlim=yes)
 
-dnl AC_ARG_ENABLE(sasl,
-dnl 	[AS_HELP_STRING([--disable-sasl],[disable the SASL plugin])],
-dnl         sasl=$enableval, sasl=yes)
-
 AC_ARG_ENABLE(sysinfo,
 	[AS_HELP_STRING([--disable-sysinfo],[disable the SysInfo plugin])],
         sysinfo=$enableval, sysinfo=yes)
@@ -162,6 +157,11 @@ AC_ARG_ENABLE(libnotify,
 	[AS_HELP_STRING([--disable-libnotify],[disable libnotify support])],
         libnotify=$enableval, libnotify=yes)
 
+AC_ARG_ENABLE(libcanberra,
+	[AS_HELP_STRING([--disable-libcanberra],[disable libcanberra support])],
+		libcanberra=$enableval, libcanberra=yes)
+
+
 AC_ARG_ENABLE(mmx,
 	[AS_HELP_STRING([--disable-mmx],[disable MMX assembly routines])],
         mmx=$enableval, mmx=yes)
@@ -172,47 +172,68 @@ AC_ARG_ENABLE(shm,
 
 AC_ARG_ENABLE(spell,
 	[AS_HELP_STRING([--enable-spell=type],[enable spelling type: none static libsexy gtkspell])],
-		  spell=$enableval, spell=static)
+		  spell=$enableval, spell=libsexy)
 
 AC_ARG_ENABLE(ntlm,
-	[AS_HELP_STRING([--enable-ntlm],[enable Microsoft's NTLM auth (libntlm) library support (default: no)])],
+	[AS_HELP_STRING([--enable-ntlm],[enable Microsoft\'s NTLM auth (libntlm) library support (default: no)])],
 	ntlm=$enableval, ntlm=no)
 
 AC_ARG_ENABLE(libproxy,
 	[AS_HELP_STRING([--disable-libproxy],[disable libproxy support (default: auto)])],
         libproxy=$enableval, libproxy=auto)
 
+AC_ARG_ENABLE(minimal-flags,
+	[AS_HELP_STRING([--enable-minimal-flags],[only add those CFLAGS that are really needed or not intrusive (default: no)])],
+        minimalflags=$enableval, minimalflags=no)
+
+AC_ARG_WITH(theme-manager,
+	[AS_HELP_STRING([--with-theme-manager],[compile theme manager (needs monodevelop, default: off)])],
+		theme_manager=$withval, theme_manager=no)
+
+
+
+dnl *********************************************************************
+dnl ** THEME-MANAGER ****************************************************
+dnl *********************************************************************
+if test "x$theme_manager" != "xno" ; then
+	if test "x$MDTOOL" = "xno"; then
+		AC_MSG_ERROR([No "mdtool" found, you need to install monodevelop!])
+	fi
+fi
+
 
 dnl *********************************************************************
 dnl ** GLIB *************************************************************
 dnl *********************************************************************
 
-AM_PATH_GLIB_2_0(2.12.0, glib=yes, glib=no)
+AM_PATH_GLIB_2_0(2.28.0, glib=yes, glib=no)
 if test "$glib" = no; then
 	AC_MSG_ERROR(Cannot find GLib!)
 fi
 
-COMMON_CFLAGS="$GLIB_CFLAGS"
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0], [], [AC_MSG_ERROR(Cannot find gobject-2.0!)])
-COMMON_LIBS="$GLIB_LIBS"
+
-COMMON_LIBS="$COMMON_LIBS -lgmodule-2.0"
+COMMON_CFLAGS="$GLIB_CFLAGS $GOBJECT_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+COMMON_LIBS="$GLIB_LIBS $GOBJECT_LIBS -lgmodule-2.0"
 
 dnl *********************************************************************
 dnl ** GTK **************************************************************
 dnl *********************************************************************
 
-AM_PATH_GTK_2_0(2.10.0, havegtk=yes, havegtk=no)
+# we might get undefined macro without this test
+if test "$gtkfe" = yes ; then
+	AM_PATH_GTK_2_0(2.24.0, havegtk=yes, havegtk=no)
 
-if test "$havegtk" = no; then
+	if test "$havegtk" = no; then
-	gtkfe=no
+		gtkfe=no
-	echo
+		echo
-	echo Cannot find GTK\! Not building GTK FrontEnd.
+		echo Cannot find GTK\! Not building GTK FrontEnd.
-	echo
+		echo
+	fi
 fi
 
 if test "$gtkfe" != yes; then
 	gnome=no
-	COMMON_LIBS="$GLIB_LIBS"
-	COMMON_CFLAGS="$GLIB_CFLAGS"
 fi
 
 dnl *********************************************************************
@@ -220,19 +241,17 @@ dnl ** GNOME ************************************************************
 dnl *********************************************************************
 
 GUI_LIBS="$GUI_LIBS $GTK_LIBS"
-GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS"
+GUI_CFLAGS="$GUI_CFLAGS $GTK_CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
 
-gnome=no
 #if test "$gnome" = yes; then
-#	AC_PATH_PROG(pkgconfigpath, pkg-config)
 #	AC_MSG_CHECKING(Gnome2 compile flags)
-#	GNOME_CFLAGS="`$pkgconfigpath libgnome-2.0 --cflags 2>/dev/null`"
+#	GNOME_CFLAGS="`$PKG_CONFIG libgnome-2.0 --cflags 2>/dev/null`"
 #	if test "_$GNOME_CFLAGS" = _ ; then
 #		gnome=no
 #		AC_MSG_RESULT([Gnome not found, building without it.])
 #	else
-#		GNOME_VER="`$pkgconfigpath libgnome-2.0 --modversion`"
+#		GNOME_VER="`$PKG_CONFIG libgnome-2.0 --modversion`"
-#		GUI_LIBS="$GUI_LIBS `$pkgconfigpath libgnome-2.0 --libs`"
+#		GUI_LIBS="$GUI_LIBS `$PKG_CONFIG libgnome-2.0 --libs`"
 #		GUI_CFLAGS="$GUI_CFLAGS $GNOME_CFLAGS"
 #		AC_DEFINE(USE_GNOME)
 #		AC_MSG_RESULT(ok)
@@ -240,17 +259,20 @@ gnome=no
 #fi
 
 # GConf
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+#if test "$gnome" != no ; then
+#	AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+#else
+#	GCONFTOOL=no
+#fi
 
 dnl *********************************************************************
 dnl ** XFT **************************************************************
 dnl *********************************************************************
 
 if test "$xft" = yes; then
-	AC_PATH_PROG(pkgconfigpath, pkg-config)
+	if $PKG_CONFIG xft --exists; then
-	if $pkgconfigpath xft --exists; then
+		GUI_CFLAGS="$GUI_CFLAGS `$PKG_CONFIG xft --cflags`"
-		GUI_CFLAGS="$GUI_CFLAGS `$pkgconfigpath xft --cflags`"
+		GUI_LIBS="$GUI_LIBS `$PKG_CONFIG xft --libs`"
-		GUI_LIBS="$GUI_LIBS `$pkgconfigpath xft --libs`"
 	else
 		xft=no
 		oldCPPFLAGS=$CPPFLAGS
@@ -329,64 +351,28 @@ dnl *********************************************************************
 dnl ** PYTHON ***********************************************************
 dnl *********************************************************************
 
-if test "$python" = yes; then
+if test "x$python" != xno ; then
-        AC_PATH_PROG(pythonpath, python2)
+	case $python in
-        if test "_$pythonpath" = _ ; then
+		dnl set python2 default here
-                AC_PATH_PROG(pythonpath, python)
+		python2)
-        fi
+			PKG_CHECK_MODULES([PY], [python-2.7], [], [AC_MSG_ERROR(Cannot find python-2.7!)])
-        if test "_$pythonpath" = _ ; then
+			PY_VER="`$PKG_CONFIG --modversion python-2.7`";;
-                python=no
+		dnl set python3 default here
-        else
+		python3)
-                AC_MSG_CHECKING(Python version)
+			PKG_CHECK_MODULES([PY], [python-3.3], [], [AC_MSG_ERROR(Cannot find python-3.3!)])
-                changequote(<<, >>)dnl
+			PY_VER="`$PKG_CONFIG --modversion python-3.3`";;
-                PY_VER=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'`
+		dnl add broken versions here
-                PY_LIB=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(standard_lib=1);'`
+		python2.5|python2.6|python3.1|python3.2)
-                PY_INC=`$pythonpath -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("INCLUDEPY")[0];'`
+			AC_MSG_ERROR(Unsupported Python version ${python}!);;
-                $pythonpath -c "import sys; map(int,sys.version[:3].split('.')) >= [2,2] or sys.exit(1)"
+		python*)
-                changequote([, ])dnl
+			python="python-${python#python}" # stay posix compliant
-                AC_MSG_RESULT($PY_VER)
+			PKG_CHECK_MODULES([PY], [${python}], [], [AC_MSG_ERROR(Cannot find "${python}.pc"!)])
-                if test "$?" != "1"; then
+			PY_VER="`$PKG_CONFIG --modversion ${python}`";;
-                        AC_MSG_CHECKING(Python compile flags)
+		*)
-                        PY_PREFIX=`$pythonpath -c 'import sys; print sys.prefix'`
+			AC_MSG_ERROR(Unsupported Python ${python}!)
-                        PY_EXEC_PREFIX=`$pythonpath -c 'import sys; print sys.exec_prefix'`
+	esac
-                        if test -f $PY_INC/Python.h; then
+	AC_MSG_CHECKING(Python version)
-                                PY_LIBS="-L$PY_LIB/config -lpython$PY_VER -lpthread -lutil"
+	AC_MSG_RESULT($PY_VER)
-                                PY_CFLAGS="-I$PY_INC"
-                                AC_MSG_RESULT(ok)
-                        else
-                                python=no
-                                AC_MSG_RESULT([Can't find Python.h])
-                        fi
-                else
-                        echo "Python too old. Only 2.2 or above is supported."
-                        python=no
-                fi
-        fi
-fi
-
-dnl *********************************************************************
-dnl ** TCL **************************************************************
-dnl *********************************************************************
-
-AC_MSG_CHECKING(for location of tclConfig.sh)
-dirs="$tcl /lib /usr/lib /usr/tcl/lib /usr/lib/tcl8.4 /usr/local/lib /usr/local/tcl-8.4/lib /usr/local/tcl/lib /opt/lib /usr/lib/tcl8.3"
-found=0
-if test "$tcl" != "no"; then
-	tcl=no
-	for try in $dirs; do
-		if test -f $try/tclConfig.sh; then
-			found=1
-			. $try/tclConfig.sh
-			TCL_LIBS="$TCL_LIB_SPEC $TCL_LIBS"
-			TCL_CFLAGS="-I${TCL_PREFIX}/include $TCL_INCLUDE_SPEC"
-			tcl=yes
-			AC_MSG_RESULT($try/tclConfig.sh)
-			break
-		fi
-	done
-	if test "$found" -eq 0 ; then
-		AC_MSG_RESULT([tclConfig.sh not found - use the --enable-tcl option])
-	fi
 fi
 
 dnl *********************************************************************
@@ -421,11 +407,10 @@ dnl *********************************************************************
 
 retry=no
 if test "$openssl" != no; then
-	AC_PATH_PROG(pkgconfigpath, pkg-config)
 	AC_MSG_CHECKING(for openssl through pkg-config)
-	if $pkgconfigpath openssl --exists; then
+	if $PKG_CONFIG openssl --exists; then
-		CPPFLAGS="$CPPFLAGS `$pkgconfigpath openssl --cflags`"
+		CPPFLAGS="$CPPFLAGS `$PKG_CONFIG openssl --cflags`"
-		LIBS="$LIBS `$pkgconfigpath openssl --libs`"
+		LIBS="$LIBS `$PKG_CONFIG openssl --libs`"
 		AC_DEFINE(USE_OPENSSL)
 		AC_MSG_RESULT(yes)
 		openssl=yes
@@ -501,9 +486,8 @@ if test "$plugin" = yes; then
 	fi
 	if test "$have_dl" = yes; then
 		AC_DEFINE(USE_PLUGIN)
-		AC_PATH_PROG(pkgconfigpath, pkg-config)
 		dnl we just need the -Wl,--export-dynamic, but not -lgmodule-2.0
-		RDYNAMIC_FLAGS="`$pkgconfigpath gmodule-2.0 --libs | $sedpath 's/ -lgmodule-2.0//'`"
+		RDYNAMIC_FLAGS="`$PKG_CONFIG gmodule-2.0 --libs | $sedpath 's/ -lgmodule-2.0//'`"
 		LIBS="$LIBS $RDYNAMIC_FLAGS"
 		if test "$LD" = ""; then
 			VS="`ld --help | grep version-script 2> /dev/null`"
@@ -575,21 +559,6 @@ if test "$fishlim" != "no"; then
 	fi
 fi
 
-dnl *********************************************************************
-dnl ** SASL *************************************************************
-dnl *********************************************************************
-
-dnl if test "$sasl" != "no"; then
-dnl 	AC_MSG_CHECKING(for plugin interface used by SASL)
-dnl 	sasl=no
-dnl 	if test "$plugin" = yes; then
-dnl 		sasl=yes
-dnl 		AC_MSG_RESULT([yes])
-dnl 	else
-dnl 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option for SASL])
-dnl 	fi
-dnl fi
-
 dnl *********************************************************************
 dnl ** SYSINFO **********************************************************
 dnl *********************************************************************
@@ -643,6 +612,21 @@ if test "x$libnotify" = "xyes" ; then
 	fi
 fi
 
+dnl *********************************************************************
+dnl ** LIBCANBERRA ******************************************************
+dnl *********************************************************************
+
+if test "x$libcanberra" = "xyes" ; then
+	PKG_CHECK_MODULES(LIBCANBERRA, libcanberra >= 0.22, [], [
+		libcanberra=no
+	])
+	if test "$libcanberra" != "no" ; then
+		COMMON_LIBS="$COMMON_LIBS $LIBCANBERRA_LIBS"
+		COMMON_CFLAGS="$COMMON_CFLAGS $LIBCANBERRA_CFLAGS"
+		AC_DEFINE(USE_LIBCANBERRA)
+	fi
+fi
+
 dnl *********************************************************************
 dnl ** SPELL ************************************************************
 dnl *********************************************************************
@@ -674,7 +658,7 @@ if test "$spell" = "static" ; then
 	PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= 2.0.0, [
 	AC_DEFINE(HAVE_ISO_CODES)
 	AC_DEFINE(USE_LIBSEXY)
-	GUI_CFLAGS="$GUI_CFLAGS -I/usr/include/libxml2"
+	GUI_CFLAGS="$GUI_CFLAGS $LIBXML2_CFLAGS"
 	LIBS="$LIBS -lxml2"
 	], [
 	AC_MSG_ERROR(Cannot find libxml2!)
@@ -688,19 +672,19 @@ dnl *********************************************************************
 AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
 AM_CONDITIONAL(USE_LIBSEXY, test "x$spell" = "xstatic")
 AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
+AM_CONDITIONAL(USE_LIBCANBERRA, test "x$libcanberra" = "xyes")
 AM_CONDITIONAL(DO_TEXT, test "x$textfe" = "xyes")
 AM_CONDITIONAL(DO_GTK, test "x$gtkfe" = "xyes")
 AM_CONDITIONAL(DO_PERL, test "x$perl" = "xyes")
-AM_CONDITIONAL(DO_PYTHON, test "x$python" = "xyes")
+AM_CONDITIONAL(DO_PYTHON, test "x$python" != "xno")
-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")
-dnl AM_CONDITIONAL(DO_SASL, test "x$sasl" = "xyes")
 AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
 AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
-AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
+#AM_CONDITIONAL(DO_GCONF, test "x$GCONFTOOL" != "xno")
+AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno")
 
 dnl *********************************************************************
 dnl ** SOCKS5 ***********************************************************
@@ -740,8 +724,8 @@ dnl *********************************************************************
 if test "$shm" = yes; then
 	oldl=$LIBS
 	oldc=$CPPFLAGS
-	LIBS="$LIBS `$pkgconfigpath --libs-only-L xft`"
+	LIBS="$LIBS `$PKG_CONFIG --libs-only-L xft`"
-	CPPFLAGS="$CPPFLAGS `$pkgconfigpath --cflags-only-I xft`"
+	CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I xft`"
 	shm=no
 	AC_CHECK_LIB(Xext, XShmAttach, shm=yes)
 	if test "$shm" = yes; then
@@ -755,7 +739,7 @@ if test "$shm" = yes; then
 
 	LIBS=$oldl
 	if test "$shm" = yes; then
-		GUI_LIBS="$GUI_LIBS `$pkgconfigpath --libs-only-L xft` -lX11 -lXext"
+		GUI_LIBS="$GUI_LIBS `$PKG_CONFIG --libs-only-L xft` -lX11 -lXext"
 		AC_DEFINE(USE_SHM)
 	else
 		CPPFLAGS=$oldc
@@ -797,13 +781,16 @@ if test "x$GCC" = "xyes"; then
 	if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then
 		CFLAGS="$CFLAGS -Wall"
 	fi
-	if test "$system" = "Linux" -o "$system" = "FreeBSD"; then
+	dnl these flags might be unwanted
-		if test -z "`echo "$CFLAGS" | grep "\-pipe" 2> /dev/null`" ; then
+	if test x$minimalflags != xyes; then
-			CFLAGS="$CFLAGS -pipe"
+		if test "$system" = "Linux" -o "$system" = "FreeBSD"; then
+			if test -z "`echo "$CFLAGS" | grep "\-pipe" 2> /dev/null`" ; then
+				CFLAGS="$CFLAGS -pipe"
+			fi
+		fi
+		if test -z "`echo "$CFLAGS" | grep "\-g " 2> /dev/null`" ; then
+			CFLAGS="$CFLAGS -g"
 		fi
-	fi
-	if test -z "`echo "$CFLAGS" | grep "\-g " 2> /dev/null`" ; then
-		CFLAGS="$CFLAGS -g"
 	fi
 fi
 
@@ -851,12 +838,34 @@ if test x$unsigned_char = xyes; then
 	CFLAGS="$CFLAGS -funsigned-char"
 fi
 
+dnl does this compiler support -Wno-unused-result ?
+AC_MSG_CHECKING([if gcc accepts -Wno-unused-result ])
+
+safe_CFLAGS=$CFLAGS
+CFLAGS="-Wno-unused-result"
+
+AC_TRY_COMPILE(, [
+int main () { return 0 ; }
+],
+[
+no_unused_result=yes
+AC_MSG_RESULT([yes])
+], [
+no_unused_result=no
+AC_MSG_RESULT([no])
+])
+CFLAGS=$safe_CFLAGS
+
+if test x$no_unused_result = xyes; then
+	CFLAGS="$CFLAGS -Wno-unused-result"
+fi
+
 dnl *********************************************************************
 dnl ** FUNCTIONS/LIBS/CFLAGS ********************************************
 dnl *********************************************************************
 
 AC_MSG_CHECKING(for modern sigaction)
-dnl libc5 on linux and FreeBSD 3.x doesn't have siginfo_t
+dnl libc5 on linux and FreeBSD 3.x doesn\'t have siginfo_t
 dnl and the sa_sigation field.
 AC_TRY_COMPILE(
 	[#include <signal.h>],
@@ -875,7 +884,7 @@ if test "$gtkfe" != no -a "_$gdkpixbufcsourcepath" = _; then
 	AC_MSG_ERROR(Cannot find gdk-pixbuf-csource: Install GTK+ 2.0!)
 fi
 
-dnl if we don't have this, use g_snprintf instead
+dnl if we don\'t have this, use g_snprintf instead
 AC_CHECK_FUNCS(snprintf vsnprintf memrchr strtoull)
 
 AC_CHECK_FUNC(gethostbyname, ,
@@ -923,11 +932,10 @@ AC_SUBST(PERL_CFLAGS)
 AC_SUBST(PERL_LDFLAGS)
 AC_SUBST(PY_CFLAGS)
 AC_SUBST(PY_LIBS)
-AC_SUBST(TCL_LIBS)
-AC_SUBST(TCL_CFLAGS)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig))
 
 PLUGIN_INCLUDES='-I$(top_srcdir)/plugins'
 AC_SUBST(PLUGIN_INCLUDES)
@@ -938,28 +946,34 @@ test "x$exec_prefix" = xNONE && exec_prefix="$prefix"
 
 AC_DEFINE_UNQUOTED(PREFIX, "${prefix}")
 
-AS_AC_EXPAND(HEXCHATLIBDIR, "${libdir}/hexchat")
+AS_AC_EXPAND(HEXCHATLIBDIR, "${libdir}/hexchat/plugins")
 AC_DEFINE_UNQUOTED(HEXCHATLIBDIR, "$HEXCHATLIBDIR")
 
 AS_AC_EXPAND(HEXCHATSHAREDIR, "$datadir")
 AC_DEFINE_UNQUOTED(HEXCHATSHAREDIR, "$HEXCHATSHAREDIR")
 
 dnl for plugins/xxx/Makefile.am
-hexchatlibdir=${libdir}/hexchat
+hexchatlibdir=${libdir}/hexchat/plugins
 AC_SUBST(hexchatlibdir)
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 Makefile
+share/Makefile
+share/icons/Makefile
+share/misc/Makefile
+share/pkgconfig/Makefile
+share/pkgconfig/hexchat-plugin.pc
 src/Makefile
 src/common/Makefile
 src/common/dbus/Makefile
 src/fe-text/Makefile
 src/fe-gtk/Makefile
+src/htm/Makefile
+src/htm/thememan
 src/pixmaps/Makefile
 plugins/Makefile
 plugins/python/Makefile
 plugins/perl/Makefile
-plugins/tcl/Makefile
 plugins/checksum/Makefile
 plugins/doat/Makefile
 plugins/fishlim/Makefile
@@ -968,13 +982,15 @@ intl/Makefile
 po/Makefile.in
 man/Makefile
 ])
-dnl plugins/sasl/Makefile
+
+AC_OUTPUT
 
 echo
 echo HexChat $VERSION
 echo
 echo GTK+ interface ........ : $gtkfe
 echo Text interface ........ : $textfe
+echo Theme manager ......... : $theme_manager
 echo
 echo MMX tinting ........... : $mmx
 echo XShm tinting .......... : $shm
@@ -986,6 +1002,7 @@ fi
 echo OpenSSL support ....... : $openssl
 echo D-Bus support ......... : $dbus
 echo libnotify support ..... : $libnotify
+echo libcanberra support ... : $libcanberra
 echo Spelling .............. : $spell
 echo Plugin interface ...... : $plugin
 echo NLS/gettext ........... : $USE_NLS
@@ -994,13 +1011,11 @@ echo MS Proxy NTLM \(ISA\) ... : $have_ntlm
 echo libproxy support ...... : $libproxy
 echo
 echo Perl .................. : $perl
-echo Python ................ : $python
+echo Python ................ : python-$PY_VER
-echo Tcl ................... : $tcl
 echo
 echo Checksum .............. : $checksum
 echo Do At ................. : $doat
 echo FiSHLiM ............... : $fishlim
-dnl echo SASL .................. : $sasl
 echo SysInfo ............... : $sysinfo
 echo
 echo The binary will be installed in $prefix/bin

man/hexchat.1

@@ -1,55 +1,55 @@
-.TH HEXCHAT "1" "November 2012" "HexChat 2.9.4" "User Commands"
+.TH HEXCHAT "1" "April 2013" "HexChat 2.9.6" "User Commands"
-.SH NAME
+.SH NAME
-HexChat \- manual page for HexChat 2.9.4
+HexChat \- IRC Client
-.SH DESCRIPTION
+.SH DESCRIPTION
-.SS "Usage:"
+.SS "Usage:"
-.IP
+.IP
-hexchat [OPTION...]
+hexchat [OPTION...] URL
-.SS "Help Options:"
+.SS "Help Options:"
-.TP
+.TP
-\fB\-h\fR, \fB\-\-help\fR
+\fB\-h\fR, \fB\-\-help\fR
-Show help options
+Show help options
-.TP
+.TP
-\fB\-\-help\-all\fR
+\fB\-\-help\-all\fR
-Show all help options
+Show all help options
-.TP
+.TP
-\fB\-\-help\-gtk\fR
+\fB\-\-help\-gtk\fR
-Show GTK+ Options
+Show GTK+ Options
-.SS "Application Options:"
+.SS "Application Options:"
-.TP
+.TP
-\fB\-a\fR, \fB\-\-no\-auto\fR
+\fB\-a\fR, \fB\-\-no\-auto\fR
-Don't auto connect to servers
+Don't auto connect to servers
-.TP
+.TP
-\fB\-d\fR, \fB\-\-cfgdir\fR=\fIPATH\fR
+\fB\-d\fR, \fB\-\-cfgdir\fR=\fIPATH\fR
-Use a different config directory
+Use a different config directory
-.TP
+.TP
-\fB\-n\fR, \fB\-\-no\-plugins\fR
+\fB\-n\fR, \fB\-\-no\-plugins\fR
-Don't auto load any plugins
+Don't auto load any plugins
-.TP
+.TP
-\fB\-p\fR, \fB\-\-plugindir\fR
+\fB\-p\fR, \fB\-\-plugindir\fR
-Show plugin auto\-load directory
+Show plugin auto\-load directory
-.TP
+.TP
-\fB\-u\fR, \fB\-\-configdir\fR
+\fB\-u\fR, \fB\-\-configdir\fR
-Show user config directory
+Show user config directory
-.TP
+.TP
-\fB\-\-url\fR=\fIURL\fR
+\fB\-\-url\fR=\fIURL\fR
-Open an irc://server:port/channel URL
+Open an irc://server:port/channel?key URL
-.TP
+.TP
-\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
+\fB\-c\fR, \fB\-\-command\fR=\fICOMMAND\fR
-Execute command:
+Execute command:
-.TP
+.TP
-\fB\-e\fR, \fB\-\-existing\fR
+\fB\-e\fR, \fB\-\-existing\fR
-Open URL or execute command in an existing HexChat
+Open URL or execute command in an existing HexChat
-.TP
+.TP
-\fB\-\-minimize\fR=\fIlevel\fR
+\fB\-\-minimize\fR=\fIlevel\fR
-Begin minimized. Level 0=Normal 1=Iconified 2=Tray
+Begin minimized. Level 0=Normal 1=Iconified 2=Tray
-.TP
+.TP
-\fB\-v\fR, \fB\-\-version\fR
+\fB\-v\fR, \fB\-\-version\fR
-Show version information
+Show version information
-.TP
+.TP
-\fB\-\-display\fR=\fIDISPLAY\fR
+\fB\-\-display\fR=\fIDISPLAY\fR
-X display to use
+X display to use
-
+
-.SH AUTHOR
+.SH AUTHOR
-This manual page was written by Davide Puricelli <evo@debian.org> for the Debian GNU/Linux system (but
+This manual page was written by Davide Puricelli <evo@debian.org> for the Debian GNU/Linux system (but
-may be used by others).
+may be used by others).

plugins/Makefile.am

@@ -11,14 +11,6 @@ if DO_PERL
 perldir = perl
 endif
 
-if DO_TCL
-tcldir = tcl
-endif
-
-#if DO_SASL
-#sasldir = sasl
-#endif
-
 if DO_DOAT
 doatdir = doat
 endif
@@ -36,4 +28,4 @@ sysinfodir = sysinfo
 endif
 
 #SUBDIRS = . $(pythondir) $(perldir) mailcheck xdcc
-SUBDIRS = . $(pythondir) $(perldir) $(tcldir) $(doatdir) $(fishlimdir) $(checksumdir) $(sysinfodir)
+SUBDIRS = . $(pythondir) $(perldir) $(checksumdir) $(doatdir) $(fishlimdir) $(sysinfodir)

plugins/checksum/Makefile.am

@@ -1,4 +1,4 @@
-libdir = $(hexchatlibdir)/plugins
+libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = checksum.la
 checksum_la_SOURCES = checksum.c

plugins/checksum/checksum-xp.vcxproj

@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5EF7F47D-D09C-43C4-BF64-B28B11A0FF91}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>checksum</RootNamespace>
-    <ProjectName>checksum</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcchecksum</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcchecksum</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>checksum.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>checksum.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="checksum.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="checksum.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/checksum/checksum-xp.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="checksum.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="checksum.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

plugins/checksum/checksum.c

@@ -23,9 +23,9 @@
 #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>
 
@@ -33,9 +33,7 @@
 #ifndef snprintf
 #define snprintf _snprintf
 #endif
-#ifndef stat64
+#define stat _stat64
-#define stat64 _stat64
-#endif
 #else
 /* for INT_MAX */
 #include <limits.h>
@@ -44,8 +42,6 @@
 #define _LARGEFILE64_SOURCE
 #endif
 
-#include <sys/stat.h>
-
 #include "hexchat-plugin.h"
 
 #define BUFSIZE 32768
@@ -108,6 +104,7 @@ sha256_file (char *path, char outputBuffer[65])
 
 	if (!buffer)
 	{
+		fclose (file);
 		return ENOMEM;
 	}
 
@@ -171,15 +168,26 @@ static int
 dccrecv_cb (char *word[], void *userdata)
 {
 	int result;
-	struct stat64 buffer;									/* buffer for storing file info */
+	struct stat buffer;									/* buffer for storing file info */
 	char sum[65];											/* buffer for checksum */
+	const char *file;
+	char *cfile;
 
-	result = stat64 (word[2], &buffer);
+	if (hexchat_get_prefs (ph, "dcc_completed_dir", &file, NULL) == 1 && file[0] != 0)
+	{
+		cfile = g_strconcat (file, G_DIR_SEPARATOR_S, word[1], NULL);
+	}
+	else
+	{
+		cfile = g_strdup(word[2]);
+	}
+
+	result = stat (cfile, &buffer);
 	if (result == 0)										/* stat returns 0 on success */
 	{
 		if (buffer.st_size <= (unsigned long long) get_limit () * 1048576)
 		{
-			sha256_file (word[2], sum);						/* word[2] is the full filename */
+			sha256_file (cfile, sum);						/* file is the full filename even if completed dir set */
 			/* try to print the checksum in the privmsg tab of the sender */
 			hexchat_set_context (ph, hexchat_find_context (ph, NULL, word[3]));
 			hexchat_printf (ph, "SHA-256 checksum for %s (local):  %s\n", word[1], sum);
@@ -195,6 +203,7 @@ dccrecv_cb (char *word[], void *userdata)
 		hexchat_printf (ph, "File access error!\n");
 	}
 
+	g_free (cfile);
 	return HEXCHAT_EAT_NONE;
 }
 
@@ -202,10 +211,10 @@ static int
 dccoffer_cb (char *word[], void *userdata)
 {
 	int result;
-	struct stat64 buffer;									/* buffer for storing file info */
+	struct stat buffer;									/* buffer for storing file info */
 	char sum[65];											/* buffer for checksum */
 
-	result = stat64 (word[3], &buffer);
+	result = stat (word[3], &buffer);
 	if (result == 0)										/* stat returns 0 on success */
 	{
 		if (buffer.st_size <= (unsigned long long) get_limit () * 1048576)
@@ -240,7 +249,7 @@ checksum (char *word[], char *word_eol[], void *userdata)
 	}
 	else
 	{
-		hexchat_printf (ph, "Usage: /CHECKSUM GET|INC|DEC\n");
+		hexchat_printf (ph, "Usage: /CHECKSUM GET|SET\n");
 		hexchat_printf (ph, "  GET - print the maximum file size (in MiB) to be hashed\n");
 		hexchat_printf (ph, "  SET <filesize> - set the maximum file size (in MiB) to be hashed\n");
 	}

plugins/checksum/checksum.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -56,7 +59,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -77,7 +79,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;CHECKSUM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

plugins/dns/dns-xp.vcxproj

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3786FA8C-3E76-45E3-984E-FCCFF44729C9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>dns</RootNamespace>
-    <ProjectName>dns</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcdns</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcdns</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>dns.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>dns.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="dns.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dns.c" />
-    <ClCompile Include="thread.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="thread.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/dns/dns-xp.vcxproj.filters

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="dns.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dns.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="thread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="thread.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

plugins/dns/dns.c

@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 /*
  * Requires MS Visual Studio and IPV6 headers to compile (run nmake).

plugins/dns/dns.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -56,7 +59,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -77,7 +79,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

plugins/doat/Makefile.am

@@ -1,4 +1,4 @@
-libdir = $(hexchatlibdir)/plugins
+libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = doat.la
 doat_la_SOURCES = doat.c

plugins/doat/doat-xp.vcxproj

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{4980AF24-9D42-427D-A8E6-0DF3B97C455D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>doat</RootNamespace>
-    <ProjectName>doat</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcdoat</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcdoat</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>doat.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>doat.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="doat.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="doat.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/doat/doat-xp.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="doat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="doat.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

plugins/doat/doat.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -56,7 +59,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -75,7 +77,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

plugins/ewc/ewc.c

@@ -14,7 +14,7 @@ Lesser General Public License for more details.
 
 You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 */
 
 #include <windows.h>

plugins/exec/exec-xp.vcxproj

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{17E4BE39-76F7-4A06-AD21-EFD0C5091F76}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>exec</RootNamespace>
-    <ProjectName>exec</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcexec</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcexec</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>exec.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>exec.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="exec.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="exec.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/exec/exec-xp.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="exec.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="exec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

plugins/exec/exec.c

@@ -28,7 +28,7 @@
 static hexchat_plugin *ph;   /* plugin handle */
 static char name[] = "Exec";
 static char desc[] = "Execute commands inside HexChat";
-static char version[] = "1.1";
+static char version[] = "1.2";
 
 static int
 run_command (char *word[], char *word_eol[], void *userdata)
@@ -41,6 +41,10 @@ run_command (char *word[], char *word_eol[], void *userdata)
 	time_t start;
 	double timeElapsed;
 
+	char *token;
+	char *context = NULL;
+	int announce = 0;
+
 	HANDLE readPipe;
 	HANDLE writePipe;
 	STARTUPINFO sInfo; 
@@ -59,9 +63,8 @@ run_command (char *word[], char *word_eol[], void *userdata)
 
 		if (!stricmp("-O", word[2]))
 		{
-			/*strcat (commandLine, word_eol[3]);*/
+			strcat (commandLine, word_eol[3]);
-			hexchat_printf (ph, "Printing Exec output to others is not supported yet.\n");
+			announce = 1;
-			return HEXCHAT_EAT_HEXCHAT;
 		}
 		else
 		{
@@ -90,7 +93,19 @@ run_command (char *word[], char *word_eol[], void *userdata)
 				{
 					/* avoid garbage */
 					buffer[dwRead] = '\0';
-					hexchat_printf (ph, "%s", buffer);
+
+					if (announce)
+					{
+						/* Say each line seperately, TODO: improve... */
+						token = strtok_s (buffer, "\n", &context);
+						while (token != NULL)
+						{
+							hexchat_commandf (ph, "SAY %s", token);
+							token = strtok_s (NULL, "\n", &context);
+						}
+					}
+					else
+						hexchat_printf (ph, "%s", buffer);
 				}
 			}
 			else
@@ -100,20 +115,25 @@ run_command (char *word[], char *word_eol[], void *userdata)
 			}
 			timeElapsed = difftime (time (0), start);
 		}
+
+		/* display a newline to separate things */
+		if (!announce)
+			hexchat_printf (ph, "\n");
+
+		if (timeElapsed >= 10)
+		{
+			hexchat_printf (ph, "Command took too much time to run, execution aborted.\n");
+		}
+
+		CloseHandle (readPipe);
+		CloseHandle (pInfo.hProcess);
+		CloseHandle (pInfo.hThread);
 	}
-
+	else
-	/* display a newline to separate things */
-	hexchat_printf (ph, "\n");
-
-	if (timeElapsed >= 10)
 	{
-		hexchat_printf (ph, "Command took too much time to run, execution aborted.\n");
+		hexchat_command (ph, "help exec");
 	}
 
-	CloseHandle (readPipe);
-	CloseHandle (pInfo.hProcess);
-	CloseHandle (pInfo.hThread);
-
 	return HEXCHAT_EAT_HEXCHAT;
 }
 

plugins/exec/exec.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -56,7 +59,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -75,7 +77,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;EXEC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

plugins/fishlim/Makefile.am

@@ -1,6 +1,6 @@
 EXTRA_DIST = INSTALL LICENSE README
 
-libdir = $(hexchatlibdir)/plugins
+libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = fishlim.la
 fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_hexchat.c

plugins/fishlim/bool.h

@@ -1,5 +0,0 @@
-/* stdbool.h replacement for MSVC */
-#define false 0
-#define true 1
-#define bool _Bool
-typedef int _Bool;

plugins/fishlim/fish.h

@@ -25,11 +25,7 @@
 #ifndef FISH_H
 #define FISH_H
 
-#ifdef _MSC_VER
-#include "bool.h"
-#else
 #include <stdbool.h>
-#endif
 #include <stddef.h>
 
 char *fish_encrypt(const char *key, size_t keylen, const char *message);

plugins/fishlim/fishlim-xp.vcxproj

@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3C4F42FC-292A-420B-B63D-C03DFBDD8E4E}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>fishlim</RootNamespace>
-    <ProjectName>fishlim</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcfishlim</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcfishlim</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>fishlim.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>fishlim.def</ModuleDefinitionFile>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="fishlim.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bool.h" />
-    <ClInclude Include="fish.h" />
-    <ClInclude Include="irc.h" />
-    <ClInclude Include="keystore.h" />
-    <ClInclude Include="misc.h" />
-    <ClInclude Include="plugin_hexchat.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="fish.c" />
-    <ClCompile Include="irc.c" />
-    <ClCompile Include="keystore.c" />
-    <ClCompile Include="misc.c" />
-    <ClCompile Include="plugin_hexchat.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/fishlim/fishlim-xp.vcxproj.filters

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="fishlim.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="fish.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="irc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="keystore.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="misc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="plugin_hexchat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="fish.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="irc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="keystore.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="misc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="plugin_hexchat.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

plugins/fishlim/fishlim.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -56,7 +59,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -77,7 +79,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;FISHLIM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

plugins/fishlim/irc.h

@@ -25,11 +25,7 @@
 #ifndef IRC_H
 #define IRC_H
 
-#ifdef _MSC_VER
-#include "bool.h"
-#else
 #include <stdbool.h>
-#endif
 #include <stddef.h>
 
 bool irc_parse_message(const char *words[],

plugins/fishlim/keystore.h

@@ -25,11 +25,7 @@
 #ifndef KEYSTORE_H
 #define KEYSTORE_H
 
-#ifdef _MSC_VER
-#include "bool.h"
-#else
 #include <stdbool.h>
-#endif
 #include <stddef.h>
 
 char *keystore_get_key(const char *nick);

plugins/hextray/callbacks.cpp

@@ -1,734 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#define _WIN32_IE 0x0601
-
-#include <windows.h>
-#include <stdio.h>
-#include <commctrl.h>
-#include <tchar.h>
-
-#include "hexchat-plugin.h"
-#include "utility.h"
-#include "hextray.h"
-#include "hexchat.h"
-#include "callbacks.h"
-#include "resource.h"
-#include "sdTray.h"
-#include "sdAlerts.h"
-
-HWND	g_hPrefTabEvents;
-HWND	g_hPrefTabSettings;
-HWND	g_hPrefTabAlerts;
-HWND	g_hPrefTabAbout;
-bool	g_bCanQuit;
-int		g_iIsActive = 1;
-
-
-BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam)
-{
-	TCHAR szTitle[10];
-	GetWindowText(hWnd, szTitle, 9);
-
-	if(_tcsstr(szTitle, _T("HexChat [")))
-	{
-		g_hXchatWnd = hWnd;
-		return false;
-	}
-	
-	return true;
-}
-
-/***********************************************************************************************/
-/******* our HexChat event call back, get the name and info for each event and save it *********/
-/******* for our alerts later ******************************************************************/
-/***********************************************************************************************/
-int event_cb(char *word[], void *userdata)
-{
-	int iEvent = (int)userdata;
-
-	if(iEvent > 10 && iEvent != 21)
-		return HEXCHAT_EAT_NONE;
-
-	/***************************************************************************************/
-	/***** if the window is minimized or if we're allowed to show alerts when its not	 **/
-	/***** and if the option to show the specified alert is true and if we're even		**/
-	/***** allowed to show alerts at all then we show them (a bit confusing but it works) **/
-	/***************************************************************************************/
-	if(((g_iIsActive == 0) || !(g_dwPrefs & (1<<PREF_OSBWM))) && (g_dwPrefs & (1<<PREF_AMAE)) && (g_dwPrefs & (1<<iEvent)))
-	{	
-		/*********************************/
-		/*********** Our Buffers *********/
-		/*********************************/
-		char			szInfo[512];
-		char			szName[64];
-		DWORD			dwInfoFlags;
-		int iTime		= g_iTime*1000;
-		char *szTemp	= NULL;
-
-		if(g_dwPrefs & (1<<PREF_KAOI))
-		{
-			iTime = 0;
-		}
-
-		switch(iEvent)
-		{
-		case CHAN_HILIGHT:
-			_snprintf(szInfo, 512, "%s:\r\n%s", word[1], word[2]);
-			_snprintf(szName, 64, "Highlight: %s", hexchat_get_info (ph, "channel"));
-			dwInfoFlags = NIIF_INFO;
-			break;
-		case CHAN_MESSAGE:
-			_snprintf(szInfo, 512, "%s:\r\n%s", word[1], word[2]);
-			_snprintf(szName, 64, "Channel Message: %s", hexchat_get_info (ph, "channel"));
-			dwInfoFlags = NIIF_INFO;
-			break;
-		case CHAN_TOPIC_CHANGE:
-			_snprintf(szInfo, 512, "%s has changed the topic to %s", word[1], word[2]);
-			_snprintf(szName, 64, "Topic Change: %s", word[3]);
-			dwInfoFlags = NIIF_INFO;
-			break;
-		case CHAN_INVITE:
-			_snprintf(szInfo, 512, "%s has invited you into %s", word[1], word[2]);
-			_snprintf(szName, 64, "Invite");
-			dwInfoFlags = NIIF_INFO;
-			break;
-		case CHAN_KICKED:
-			_snprintf(szInfo, 512, "Kicked from %s by %s:\r\n%s", word[2], word[3], word[4]);
-			_snprintf(szName, 64, "Kick");
-			dwInfoFlags = NIIF_WARNING;
-			break;
-		case CHAN_BANNED:
-			_snprintf(szInfo, 512, "Cannot join %s You are banned.", word[1]);
-			_snprintf(szName, 64, "Banned");
-			dwInfoFlags = NIIF_WARNING;
-			break;
-		case CTCP_GENERIC:
-			_snprintf(szInfo, 512, "%s:\r\nCTCP %s", word[2], word[1]);
-			_snprintf(szName, 64, "CTCP");
-			dwInfoFlags = NIIF_INFO;
-			break;
-		case PMSG_RECEIVE:
-			_snprintf(szInfo, 512, "%s:\r\n%s", word[1], word[2]);
-			_snprintf(szName, 64, "Private Message");
-			dwInfoFlags = NIIF_INFO;
-			break;
-		case SERV_DISCONNECT:
-			_snprintf(szInfo, 512, "Disconnected\r\nError: %s", word[1]);
-			_snprintf(szName, 64, "Disconnect");
-			dwInfoFlags = NIIF_ERROR;
-			break;
-		case SERV_KILLED:
-			_snprintf(szInfo, 512, "Killed(%s(%s))", word[1], word[2]);
-			_snprintf(szName, 64, "Server Admin has killed you");
-			dwInfoFlags = NIIF_ERROR;
-			break;
-		case SERV_NOTICE:
-			_snprintf(szInfo, 512, "Notice:\r\n%s: %s", word[1], word[2]);
-			_snprintf(szName, 64, "Notice");
-			dwInfoFlags = NIIF_INFO;
-			break;
-		case 11:
-			_snprintf(szInfo, 512, ":\r\n%s: %s", word[1], word[2]);
-			_snprintf(szName, 64, "Notice");
-			dwInfoFlags = NIIF_INFO;
-			break;
-		}
-
-		/**************************************************************************************/
-		/***** Use windows instead of balloons, and if its a window should we keep it open ****/
-		/***** indefinitely?															   ****/
-		/**************************************************************************************/
-		szTemp = hexchat_strip_color(szInfo);
-
-		if(g_dwPrefs & (1<<PREF_UWIOB))
-		{
-			sdSystemAlert((HINSTANCE)g_hInstance, IDD_ALERT, szTemp, szName, iTime);
-		}
-		else
-		{
-			ShowBalloon(g_hXchatWnd, 1, szTemp, szName, iTime, dwInfoFlags);
-		}
-
-		free(szTemp);
-	}
-
-	if(g_dwPrefs & (1<<PREF_BLINK) && (g_dwPrefs & (1<<iEvent)))
-	{
-		BlinkIcon(g_hXchatWnd, 1, g_hIcons[0], g_hIcons[(iEvent+1)], 700, 5);
-	}
-
-	/***********************************/
-	/***** pass the events to HexChat **/
-	/***********************************/
-	return HEXCHAT_EAT_NONE;
-}
-
-int command_cb(char *word[], char *word_eol[], void *userdata)
-{
-	char szInfo[512];
-	char *szTemp	= NULL;
-	int iTime		= g_iTime*1000;
-
-	_snprintf(szInfo, 512, word_eol[2]);
-	szTemp = hexchat_strip_color(szInfo);
-
-	if(g_dwPrefs & (1<<PREF_KAOI))
-	{
-		iTime = 0;
-	}
-
-	if(((g_iIsActive == 0) || !(g_dwPrefs & (1<<PREF_OSBWM))) && (g_dwPrefs & (1<<PREF_AMAE)))
-	{
-		if(g_dwPrefs & (1<<PREF_UWIOB))
-		{
-			sdSystemAlert((HINSTANCE)g_hInstance, IDD_ALERT, szTemp, "Alert", iTime);
-		}
-		else
-		{
-			ShowBalloon(g_hXchatWnd, 1, szTemp, "Alert", iTime, NIIF_INFO);
-		}
-	}
-
-	free(szTemp);
-
-	return HEXCHAT_EAT_ALL;
-}
-
-LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	switch(msg)
-	{
-	case WM_CLOSE:
-		{
-			if((g_dwPrefs & (1<<PREF_MIOC)) && (g_bCanQuit == false))
-			{
-				/*******************************************/
-				/**** to autoaway or not to autoaway...  ***/
-				/*******************************************/
-				if(g_dwPrefs & (1<<PREF_AOM))
-				{
-					hexchat_globally_away(g_szAway);
-				}
-
-				/**************************************************/
-				/**** Win32 API call to hide the window and	     **/
-				/**** save the fact that its minimized for later **/
-				/**************************************************/
-				g_iIsActive = 0;
-				ShowWindow(hWnd, SW_HIDE);
-
-				return 0;
-			}
-			else
-			{
-				if(g_hPrefDlg != NULL)
-				{
-					DestroyWindow(g_hPrefDlg);
-				}
-
-				StopBlink(hWnd, 1, g_hIcons[0]);
-				
-				if(sdAlertNum())
-				{
-					sdCloseAlerts();
-					HoldClose();
-					return 0;
-				}
-			}
-		}
-		break;
-	case WM_SIZE:
-		{
-			/******************************************/
-			/***** User wants to minimize HexChat, ****/
-			/***** are we allowed to go to tray? ******/
-			/******************************************/
-			if((g_dwPrefs & (1<<PREF_TOT)) && (wparam == SIZE_MINIMIZED))
-			{
-				/*******************************************/
-				/**** to autoaway or not to autoaway...  ***/
-				/*******************************************/
-				if(g_dwPrefs & (1<<PREF_AOM))
-				{
-					hexchat_globally_away(g_szAway);
-				}
-
-				/**************************************************/
-				/**** Win32 API call to hide the window and	     **/
-				/**** save the fact that its minimized for later **/
-				/**************************************************/
-				g_iIsActive = 0;
-				ShowWindow(hWnd, SW_HIDE);
-			}
-		}
-		break;
-	/**********************************/
-	/*** user clicked the tray icon ***/
-	/**********************************/
-	case WM_TRAYMSG:
-		{
-			switch(lparam)
-			{
-			case WM_LBUTTONDOWN:
-				{
-					if(!g_iIsActive)
-					{
-						/*********************************************************/
-						/*** 0: its hiden, restore it and show it, if autoaway ***/
-						/*** is on, set us as back							 ***/
-						/*********************************************************/
-						SendMessage(hWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
-						SetForegroundWindow(hWnd);
-						g_iIsActive = 1;
-
-						if(g_dwPrefs & (1<<PREF_AOM))
-						{
-							hexchat_globally_back();
-						}
-					}
-					else
-					{
-						SendMessage(hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0);
-					}
-				}
-				break;
-			case WM_RBUTTONDOWN:
-				{
-					/******************************************/
-					/*** user wants to see the menu find out **/
-					/*** where the mouse is and show it	  **/
-					/******************************************/
-					POINT pt;
-					int iRet;
-
-					GetCursorPos(&pt);
-					SetForegroundWindow(hWnd);
-
-					ModifyMenu(g_hTrayMenu, 2, (MF_POPUP | MF_BYPOSITION), (UINT)setServerMenu(), _T("Away"));
-
-					Sleep(175);
-
-					iRet = TrackPopupMenuEx(g_hTrayMenu, (TPM_RETURNCMD | TPM_LEFTALIGN), pt.x, pt.y, hWnd, NULL);
-
-					/***********************************/
-					/*** nRet is the users selection, **/
-					/*** process it				   **/
-					/***********************************/
-					sdTrayProc(hWnd, iRet);
-				}
-				break;
-			}
-		}
-		break;
-	default:
-		{
-			/*****************************************************/
-			/*** the taskbar has been restarted, re-add our icon */
-			/*****************************************************/
-			if(msg == RegisterWindowMessage(_T("TaskbarCreated")))
-			{
-				char szVersion[64];
-				_snprintf(szVersion, 64, "HexChat [%s]", hexchat_get_info(ph, "version"));
-				AddIcon(g_hXchatWnd, 1, g_hIcons[0], szVersion, (NIF_ICON | NIF_MESSAGE | NIF_TIP), WM_TRAYMSG);
-			}
-		}
-		break;
-	}
-
-	return CallWindowProc(g_hOldProc, hWnd, msg, wparam, lparam);
-}
-
-/****************************************************/
-/*** process messages from the tray menu ************/
-/****************************************************/
-LRESULT CALLBACK sdTrayProc(HWND hWnd, int msg)
-{
-	switch(msg)
-	{
-	case ACT_EXIT:
-		{
-			g_bCanQuit = true;
-			PostMessage(hWnd, WM_CLOSE, 0, 0);
-		}
-		break;
-	case ACT_RESTORE:
-		{
-			/*************************************************/
-			/** user wants us to restore the HexChat window **/
-			/** and of autoaway is on, set as back ******** **/
-			/*************************************************/
-			SendMessage(g_hXchatWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
-			SetForegroundWindow(hWnd);
-			
-			if((!g_iIsActive) && (g_dwPrefs & (1<<PREF_AOM)))
-			{
-				hexchat_globally_back();
-				g_iIsActive = 1;
-			}
-		}
-		break;
-	case ACT_SETTINGS:
-		{
-			ShowWindow(g_hPrefDlg, SW_SHOW);
-		}
-		break;
-	case ACT_AWAY:
-		{
-			hexchat_globally_away(g_szAway);
-		}
-		break;
-	case ACT_BACK:
-		{
-			hexchat_globally_back();
-		}
-		break;
-	default:
-		{
-			if(msg > 0)
-			{
-				hexchat_set_context(ph, hexchat_find_server(msg-1));
-
-				if(!hexchat_get_info(ph, "away"))
-				{
-					hexchat_away(g_szAway);
-				}
-				else
-				{
-					hexchat_back();
-				}
-			}
-		}
-		break;
-	}
-
-	return 1;
-}
-
-int CALLBACK PrefProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	switch(msg)
-	{
-	case WM_INITDIALOG:
-		{
-			TCITEM tci1;
-			TCITEM tci2;
-			TCITEM tci3;
-			TCITEM tci4;
-
-			tci1.mask		= TCIF_TEXT;
-			tci1.pszText	= _T("Settings");
-			tci1.cchTextMax	= strlen("Settings");
-			SendDlgItemMessage(hWnd, IDC_TAB_CONTROL, TCM_INSERTITEM, 0, (LPARAM)&tci1);
-
-			tci2.mask		= TCIF_TEXT;
-			tci2.pszText	= _T("Alerts");
-			tci2.cchTextMax	= strlen("Alerts");
-			SendDlgItemMessage(hWnd, IDC_TAB_CONTROL, TCM_INSERTITEM, 1, (LPARAM)&tci2);
-
-			tci3.mask		= TCIF_TEXT;
-			tci3.pszText	= _T("Events");
-			tci3.cchTextMax	= strlen("Events");
-			SendDlgItemMessage(hWnd, IDC_TAB_CONTROL, TCM_INSERTITEM, 2, (LPARAM)&tci3);
-
-			tci4.mask		= TCIF_TEXT;
-			tci4.pszText	= _T("About");
-			tci4.cchTextMax	= strlen("About");
-			SendDlgItemMessage(hWnd, IDC_TAB_CONTROL, TCM_INSERTITEM, 3, (LPARAM)&tci4);
-
-
-			/***********************************************************************************/
-			/***********************************************************************************/
-			/***********************************************************************************/
-
-			g_hPrefTabSettings	= CreateDialog((HINSTANCE)g_hInstance,
-									MAKEINTRESOURCE(IDD_SETTINGS),
-									hWnd,		
-									(DLGPROC)SettingsProc);
-			SetDialog(g_hPrefTabSettings,	IDD_SETTINGS);
-
-			g_hPrefTabAlerts	= CreateDialog((HINSTANCE)g_hInstance,
-									MAKEINTRESOURCE(IDD_ALERTS),
-									hWnd,
-									(DLGPROC)AlertsProc);
-			SetDialog(g_hPrefTabAlerts,		IDD_ALERTS);
-
-			g_hPrefTabEvents	= CreateDialog((HINSTANCE)g_hInstance,
-									MAKEINTRESOURCE(IDD_EVENTS),
-									hWnd,		
-									(DLGPROC)EventsProc);
-			SetDialog(g_hPrefTabEvents,		IDD_EVENTS);
-
-			g_hPrefTabAbout		= CreateDialog((HINSTANCE)g_hInstance,
-									MAKEINTRESOURCE(IDD_ABOUT),
-									hWnd,
-									(DLGPROC)AboutProc);
-		}
-		break;
-	case WM_SHOWWINDOW:
-		{
-			if(wparam)
-			{
-				SendDlgItemMessage(hWnd, IDC_TAB_CONTROL, TCM_SETCURSEL, 0, 0);
-				ShowWindow(g_hPrefTabSettings,	SW_SHOW);
-				ShowWindow(g_hPrefTabAlerts,	SW_HIDE);
-				ShowWindow(g_hPrefTabEvents,	SW_HIDE);
-				ShowWindow(g_hPrefTabAbout,		SW_HIDE);
-			}
-		}
-		break;
-	case WM_NOTIFY:
-		{
-			NMHDR *pData = (NMHDR *)lparam;
-
-			switch(pData->code)
-			{
-			case TCN_SELCHANGE:
-				{
-					switch(SendDlgItemMessage(hWnd, IDC_TAB_CONTROL, TCM_GETCURSEL, 0, 0))
-					{
-					case 0:
-						{
-							ShowWindow(g_hPrefTabSettings,	SW_SHOW);
-							ShowWindow(g_hPrefTabAlerts,	SW_HIDE);
-							ShowWindow(g_hPrefTabEvents,	SW_HIDE);
-							ShowWindow(g_hPrefTabAbout,		SW_HIDE);
-						}
-						break;
-					case 1:
-						{
-							ShowWindow(g_hPrefTabSettings,	SW_HIDE);
-							ShowWindow(g_hPrefTabAlerts,	SW_SHOW);
-							ShowWindow(g_hPrefTabEvents,	SW_HIDE);
-							ShowWindow(g_hPrefTabAbout,		SW_HIDE);
-						}
-						break;
-					case 2:
-						{
-							ShowWindow(g_hPrefTabSettings,	SW_HIDE);
-							ShowWindow(g_hPrefTabAlerts,	SW_HIDE);
-							ShowWindow(g_hPrefTabEvents,	SW_SHOW);
-							ShowWindow(g_hPrefTabAbout,		SW_HIDE);
-						}
-						break;
-					case 3:
-						{
-							ShowWindow(g_hPrefTabSettings,	SW_HIDE);
-							ShowWindow(g_hPrefTabAlerts,	SW_HIDE);
-							ShowWindow(g_hPrefTabEvents,	SW_HIDE);
-							ShowWindow(g_hPrefTabAbout,		SW_SHOW);
-						}
-						break;
-					}
-				}
-				break;
-			}
-		}
-		break;
-	case WM_CLOSE:
-		{
-			ShowWindow(g_hPrefTabEvents,	SW_HIDE);
-			ShowWindow(g_hPrefTabSettings,	SW_HIDE);
-			ShowWindow(g_hPrefTabAlerts,	SW_HIDE);
-			ShowWindow(g_hPrefTabAbout,		SW_HIDE);
-			ShowWindow(hWnd,				SW_HIDE);
-			return TRUE;
-		}
-		break;
-	case WM_COMMAND:
-		{
-			switch(wparam)
-			{
-			case IDC_PREF_OK:
-				{
-					CheckPrefs(g_hPrefTabEvents,	IDD_EVENTS);
-					CheckPrefs(g_hPrefTabSettings,	IDD_SETTINGS);
-					CheckPrefs(g_hPrefTabAlerts,	IDD_ALERTS);
-
-					SavePrefs(0);
-
-					ShowWindow(g_hPrefTabEvents,	SW_HIDE);
-					ShowWindow(g_hPrefTabSettings,	SW_HIDE);
-					ShowWindow(g_hPrefTabAlerts,	SW_HIDE);
-					ShowWindow(g_hPrefTabAbout,		SW_HIDE);
-					ShowWindow(hWnd,				SW_HIDE);
-					return TRUE;
-				}
-				break;
-			case IDC_PREF_CANCEL:
-				{
-					ShowWindow(g_hPrefTabEvents,	SW_HIDE);
-					ShowWindow(g_hPrefTabSettings,	SW_HIDE);
-					ShowWindow(g_hPrefTabAlerts,	SW_HIDE);
-					ShowWindow(g_hPrefTabAbout,		SW_HIDE);
-					ShowWindow(hWnd,				SW_HIDE);
-					return TRUE;
-				}
-				break;
-			case IDC_PREF_APPLY:
-				{
-					CheckPrefs(g_hPrefTabEvents,	IDD_EVENTS);
-					CheckPrefs(g_hPrefTabSettings,	IDD_SETTINGS);
-					CheckPrefs(g_hPrefTabAlerts,	IDD_ALERTS);
-
-					SavePrefs(0);
-					return FALSE;
-				}
-				break;
-			}
-		}
-		break;
-	case WM_DESTROY:
-		{
-			SendMessage(g_hPrefTabEvents,	WM_CLOSE, 0, 0);
-			SendMessage(g_hPrefTabSettings,	WM_CLOSE, 0, 0);
-			SendMessage(g_hPrefTabAbout,	WM_CLOSE, 0, 0);
-			SendMessage(g_hPrefTabAlerts,	WM_CLOSE, 0, 0);
-		}
-		break;
-	}
-
-	return FALSE;
-}
-
-/****************************************************/
-/****************************************************/
-/****************************************************/
-LRESULT CALLBACK AlertsProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	switch(msg)
-	{
-	case WM_CLOSE:
-		{
-			DestroyWindow(hWnd);
-			return TRUE;
-			break;
-		}
-		break;
-	case WM_COMMAND:
-		{
-			switch(LOWORD(wparam))
-			{
-			case PREF_AMAE:
-				{
-					SetToggle(hWnd, PREF_OSBWM,			PREF_AMAE, TRUE);
-					SetToggle(hWnd, PREF_UWIOB,			PREF_AMAE, TRUE);
-					SetToggle(hWnd, PREF_KAOI,			PREF_AMAE, TRUE);
-					
-					if(IsDlgButtonChecked(hWnd, PREF_AMAE))
-					{
-						SetToggle(hWnd, IDC_ALERT_HOTKEY,		PREF_UWIOB, TRUE);
-						SetToggle(hWnd, IDC_ALERT_HOTKEY_TEXT,	PREF_UWIOB, TRUE);
-						SetToggle(hWnd, IDC_ALERT_TIME,			PREF_KAOI, FALSE);
-						SetToggle(hWnd, IDC_ALERT_TIME_TEXT,	PREF_KAOI, FALSE);
-					}
-					else
-					{
-						SetToggle(hWnd, IDC_ALERT_HOTKEY,		PREF_AMAE, TRUE);
-						SetToggle(hWnd, IDC_ALERT_HOTKEY_TEXT,	PREF_AMAE, TRUE);
-						SetToggle(hWnd, IDC_ALERT_TIME,			PREF_AMAE, TRUE);
-						SetToggle(hWnd, IDC_ALERT_TIME_TEXT,	PREF_AMAE, TRUE);
-					}
-				}
-				break;
-			case PREF_UWIOB:
-				{
-					SetToggle(hWnd, IDC_ALERT_HOTKEY,		PREF_UWIOB, TRUE);
-					SetToggle(hWnd, IDC_ALERT_HOTKEY_TEXT,	PREF_UWIOB, TRUE);
-				}
-				break;
-			case PREF_KAOI:
-				{
-					SetToggle(hWnd, IDC_ALERT_TIME,			PREF_KAOI, FALSE);
-					SetToggle(hWnd, IDC_ALERT_TIME_TEXT,	PREF_KAOI, FALSE);
-				}
-				break;
-			}
-			break;
-		}
-	}
-
-	return FALSE;
-}
-
-/****************************************************/
-/****************************************************/
-/****************************************************/
-LRESULT CALLBACK AboutProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	if(msg == WM_CLOSE)
-	{
-		DestroyWindow(hWnd);
-		return true;
-	}
-
-	return FALSE;
-}
-
-/*****************************************************/
-/** Process the events for our event dialog **********/
-/*****************************************************/
-LRESULT CALLBACK EventsProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	if(msg == WM_CLOSE)
-	{
-		DestroyWindow(hWnd);
-		return true;
-	}
-
-	return FALSE;
-}
-
-/*****************************************************/
-/** Process the events for our settings dialog this **/
-/** is alot more complicated because options are	**/
-/** enabled/disabled based on the state of others   **/
-/*****************************************************/
-LRESULT CALLBACK SettingsProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	if(msg == WM_CLOSE)
-	{
-		DestroyWindow(hWnd);
-		return true;
-	}
-
-	return FALSE;
-}
-
-/*****************************************************/
-/** this is the hotkey message  processing function **/
-/** this window is always open and ready to be told **/
-/** if someone has hit the hotkey, if they did, we  **/
-/** need to close out all of the tray alerts, for   **/
-/** this I wrote sdCloseAlerts, more info there	 **/
-/*****************************************************/
-LRESULT CALLBACK HotKeyProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	if(msg == WM_CLOSE)
-	{
-		DestroyWindow(hWnd);
-		return true;
-	}
-	else if(msg == WM_HOTKEY)
-	{
-		sdCloseAlerts();
-	}
-
-	return FALSE;
-}
-

plugins/hextray/callbacks.h

@@ -1,37 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _H_CALLBACKS_H
-#define _H_CALLBACKS_H
-
-int					event_cb		(char *word[], void *userdata);
-int					command_cb		(char *word[], char *word_eol[], void *userdata);
-
-LRESULT CALLBACK	WindowProc		(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-BOOL	CALLBACK	EnumWindowsProc	(HWND hWnd, LPARAM lParam);
-LRESULT CALLBACK	sdTrayProc		(HWND hwnd, int msg);
-
-LRESULT CALLBACK	AlertProc		(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-LRESULT CALLBACK	HotKeyProc		(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-LRESULT CALLBACK	EventsProc		(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-LRESULT CALLBACK	AboutProc		(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-LRESULT CALLBACK	AlertsProc		(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-LRESULT CALLBACK	SettingsProc	(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-int		CALLBACK	PrefProc		(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam);
-
-#endif

plugins/hextray/hexchat.cpp

@@ -1,320 +0,0 @@
-/* X-Tray
- * Copyright (C) 1998, 2005 Peter Zelezny, Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <windows.h>
-#include <vector>
-#include <algorithm>
-#include <stdio.h>
-#include <tchar.h>
-
-#include "hexchat-plugin.h"
-#include "hextray.h"
-#include "resource.h"
-#include "hexchat.h"
-#include "utility.h"
-
-// from util.c of HexChat source code ( slightly modified to fit HexTray Syntax )
-char *hexchat_strip_color (char *text)
-{
-	int nc	= 0;
-	int i	= 0;
-	int col	= 0;
-	int len	= strlen(text);
-	char *new_str = (char *)malloc(len + 2);
-
-	while (len > 0)
-	{
-		if ((col && isdigit(*text) && (nc < 2)) || (col && isdigit(*(text+1)) && (nc < 3) && (*text == ',')))
-		{
-			nc++;
-
-			if(*text == ',')
-			{
-				nc = 0;
-			}
-		}
-		else
-		{
-			col = 0;
-
-			switch (*text)
-			{
-			case '\003':			  /*ATTR_COLOR: */
-				{
-					col = 1;
-					nc = 0;
-				}
-				break;
-			case '\007':			  /*ATTR_BEEP: */
-			case '\017':			  /*ATTR_RESET: */
-			case '\026':			  /*ATTR_REVERSE: */
-			case '\002':			  /*ATTR_BOLD: */
-			case '\037':			  /*ATTR_UNDERLINE: */
-				break;
-			default:
-				{
-					new_str[i] = *text;
-					i++;
-				}
-				break;
-			}
-		}
-
-		text++;
-		len--;
-	}
-
-	new_str[i] = 0;
-
-	return new_str;
-}
-
-void check_special_chars (char *cmd)
-{
-	int occur	= 0;
-	int len		= strlen (cmd);
-	int i = 0, j = 0;
-	char *buf;
-
-	if (!len)
-		return;
-
-	buf = (char *)malloc (len + 1);
-
-	if (buf)
-	{
-		while (cmd[j])
-		{
-			switch (cmd[j])
-			{
-			case '%':
-				{
-					occur++;
-
-					switch (cmd[j + 1])
-					{
-					case 'R':
-						buf[i] = '\026';
-						break;
-					case 'U':
-						buf[i] = '\037';
-						break;
-					case 'B':
-						buf[i] = '\002';
-						break;
-					case 'C':
-						buf[i] = '\003';
-						break;
-					case 'O':
-						buf[i] = '\017';
-						break;
-					case '%':
-						buf[i] = '%';
-						break;
-					default:
-						buf[i] = '%';
-						j--;
-						break;
-					}
-
-					j++;
-				}
-				break;
-			default:
-				{
-					buf[i] = cmd[j];
-				}
-				break;
-			}
-
-			j++;
-			i++;
-		}
-
-		buf[i] = 0;
-
-		if (occur)
-			strcpy (cmd, buf);
-
-		free (buf);
-	}
-}
-
-void hexchat_globally_away(TCHAR *tszAway)
-{
-	char szTemp[512];
-	char szAway[512];
-
-	ConvertString(tszAway, szAway, 512);
-	_snprintf(szTemp, 512, "ALLSERV AWAY %s\0", szAway);
-	check_special_chars(szTemp);
-	hexchat_exec(szTemp);
-}
-
-void hexchat_away(TCHAR *tszAway)
-{
-	char szTemp[512];
-	char szAway[512];
-
-	ConvertString(tszAway, szAway, 512);
-	_snprintf(szTemp, 512, szAway);
-	check_special_chars(szTemp);
-	hexchat_commandf(ph, "AWAY %s\0", szTemp);
-}
-
-void hexchat_globally_back()
-{
-	std::vector<int> xs;
-	std::vector<int>::iterator xsi;
-	hexchat_list *xl = hexchat_list_get(ph, "channels");
-
-	if(xl)
-	{
-		while(hexchat_list_next(ph, xl))
-		{
-			xsi = std::find(xs.begin(), xs.end(), hexchat_list_int(ph, xl, "id"));
-
-			if((xsi == xs.end()) &&
-				((strlen(hexchat_list_str(ph, xl, "server")) > 0) || 
-				(strlen(hexchat_list_str(ph, xl, "channel")) > 0)))
-			{
-				xs.push_back(hexchat_list_int(ph, xl, "id"));
-				hexchat_set_context(ph, (hexchat_context *)hexchat_list_str(ph, xl, "context"));
-				hexchat_back();
-			}
-		}
-
-		hexchat_list_free(ph, xl);
-	}
-}
-
-
-
-void hexchat_back()
-{
-	if(hexchat_get_info(ph, "away"))
-	{
-		hexchat_command(ph, "BACK");
-	}
-}
-
-HMENU setServerMenu()
-{
-	HMENU sTemp = CreateMenu();
-	TCHAR wszServer[128];
-	TCHAR wszNick[128];
-	TCHAR wszMenuEntry[256];
-
-	std::vector<int> xs;
-	std::vector<int>::iterator xsi;
-	hexchat_list *xl = hexchat_list_get(ph, "channels");
-
-	AppendMenu(sTemp, MF_STRING, ACT_AWAY, _T("Set Globally Away"));
-	AppendMenu(sTemp, MF_STRING, ACT_BACK, _T("Set Globally Back"));
-	AppendMenu(sTemp, MF_SEPARATOR, 0, NULL);
-
-	if(xl)
-	{
-		while(hexchat_list_next(ph, xl))
-		{
-			xsi = std::find(xs.begin(), xs.end(), hexchat_list_int(ph, xl, "id"));
-
-			if( (xsi == xs.end()) &&
-				((strlen(hexchat_list_str(ph, xl, "server")) > 0) || 
-				(strlen(hexchat_list_str(ph, xl, "channel")) > 0)))
-			{
-				hexchat_set_context(ph, (hexchat_context *)hexchat_list_str(ph, xl, "context"));
-				xs.push_back(hexchat_list_int(ph, xl, "id"));
-
-				char *network	= _strdup(hexchat_list_str(ph, xl, "network"));
-				char *server	= _strdup(hexchat_list_str(ph, xl, "server"));
-				char *nick		= _strdup(hexchat_get_info(ph, "nick"));
-
-				if(network != NULL)
-				{
-					ConvertString(network, wszServer, 128);
-				}
-				else
-				{
-					ConvertString(server, wszServer, 128);
-				}
-
-				if(server != NULL)
-				{
-					ConvertString(nick, wszNick, 128);
-					_sntprintf(wszMenuEntry, 256, _T("%s @ %s\0"), wszNick, wszServer);
-
-					if(!hexchat_get_info(ph, "away"))
-					{
-						AppendMenu(sTemp, MF_STRING, (hexchat_list_int(ph, xl, "id") + 1), wszMenuEntry);
-					}
-					else
-					{
-						AppendMenu(sTemp, (MF_CHECKED | MF_STRING), (hexchat_list_int(ph, xl, "id") + 1), wszMenuEntry);							
-					}
-				}
-
-				free(network);
-				free(server);
-				free(nick);
-			}
-		}
-
-		hexchat_list_free(ph, xl);
-	}
-
-	return sTemp;
-}
-
-struct _hexchat_context *hexchat_find_server(int find_id)
-{
-	hexchat_context *xc;
-	hexchat_list *xl = hexchat_list_get(ph, "channels");
-	int id;
-
-	if(!xl)
-		return NULL;
-
-	while(hexchat_list_next(ph, xl))
-	{
-		id = hexchat_list_int(ph, xl, "id");
-		
-		if(id == -1)
-		{
-			return NULL;
-		}
-		else if(id == find_id)
-		{
-			xc = (hexchat_context *)hexchat_list_str(ph, xl, "context");
-			
-			hexchat_list_free(ph, xl);
-
-			return xc;
-		}
-	}
-
-	hexchat_list_free(ph, xl);
-
-	return NULL;
-}
-
-void hexchat_exec(char *command)
-{
-	hexchat_set_context(ph, hexchat_find_context(ph, NULL, NULL));
-	hexchat_command(ph, command);
-}

plugins/hextray/hexchat.h

@@ -1,32 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _H_XCHAT_H
-#define _H_XCHAT_H
-
-void					hexchat_exec			(char *);
-char					*hexchat_strip_color	(char *);
-void					hexchat_parse			(char *);
-struct _hexchat_context	*hexchat_find_server	(int);
-void					hexchat_globally_away	(TCHAR *);
-void					hexchat_away			(TCHAR *);
-void					hexchat_globally_back	();
-void					hexchat_back			();
-HMENU					setServerMenu		();
-
-#endif

plugins/hextray/hextray-xp.vcxproj

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3024CF36-85E5-4E00-9608-7002E2C7EF14}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>hextray</RootNamespace>
-    <ProjectName>hextray</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-    <TargetName>hchextray</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-    <TargetName>hchextray</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XTRAY_EXPORTS;_STL70_;_STATIC_CPPLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>
-      <AdditionalDependencies>ntstc_msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;XTRAY_EXPORTS;_STL70_;_STATIC_CPPLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>
-      <AdditionalDependencies>ntstc_msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="bitmaps\sd.bmp" />
-    <None Include="icons\ban.ico" />
-    <None Include="icons\disconnect.ico" />
-    <None Include="icons\highlight.ico" />
-    <None Include="icons\kick.ico" />
-    <None Include="icons\message.ico" />
-    <None Include="icons\sd.ico" />
-    <None Include="icons\notice.ico" />
-    <None Include="icons\hexchat.ico" />
-    <None Include="hextray.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="callbacks.cpp" />
-    <ClCompile Include="sdAlerts.cpp" />
-    <ClCompile Include="sdTray.cpp" />
-    <ClCompile Include="utility.cpp" />
-    <ClCompile Include="hexchat.cpp" />
-    <ClCompile Include="hextray.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="callbacks.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="sdAlerts.h" />
-    <ClInclude Include="sdTray.h" />
-    <ClInclude Include="utility.h" />
-    <ClInclude Include="hexchat.h" />
-    <ClInclude Include="hextray.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/hextray/hextray-xp.vcxproj.filters

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Resource Files\bitmaps">
-      <UniqueIdentifier>{448b49a5-e68b-451e-bfbc-0855da024b2e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\icons">
-      <UniqueIdentifier>{8345128a-0635-43d6-9115-a85ad9c77ee2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="hextray.def">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="bitmaps\sd.bmp">
-      <Filter>Resource Files\bitmaps</Filter>
-    </None>
-    <None Include="icons\ban.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <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\kick.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <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\notice.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <None Include="icons\hexchat.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="callbacks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sdAlerts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sdTray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="utility.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hexchat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hextray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="callbacks.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sdAlerts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sdTray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="utility.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hexchat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hextray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

plugins/hextray/hextray.cpp

@@ -1,246 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#define _WIN32_IE 0x0601
-
-#include <windows.h>
-#include <list>
-#include <string>
-#include <shobjidl.h>
-
-#include "hexchat-plugin.h"
-#include "resource.h"
-#include "callbacks.h"
-#include "utility.h"
-#include "hextray.h"
-#include "sdTray.h"
-#include "sdAlerts.h"
-
-/*****************************************************/
-/**** Don't want to pollute the namespace do we? *****/
-/*****************************************************/
-std::list<hexchat_hook *> g_vHooks;
-
-/*****************************************************/
-/************ Global Identifiers *********************/
-/*****************************************************/
-WNDPROC g_hOldProc;
-hexchat_plugin *ph;
-
-/*****************************************************/
-/***************** Resources *************************/
-/*****************************************************/
-HWND	g_hXchatWnd;
-HWND	g_hHotkeyWnd;
-HWND	g_hPrefDlg;
-HMENU	g_hTrayMenu;
-HICON	g_hIcons[24];
-HANDLE	g_hInstance;
-/*****************************************************/
-/***************** Preferences ***********************/
-/*****************************************************/
-unsigned int g_dwPrefs;
-TCHAR	g_szAway[512];
-int		g_iTime;
-
-
-BOOL WINAPI DllMain(HANDLE hModule, DWORD fdwReason, LPVOID lpVoid)
-{
-	if((fdwReason == DLL_PROCESS_ATTACH) || (fdwReason == DLL_THREAD_ATTACH))
-	{
-		g_hInstance = hModule;
-	}
-
-	return TRUE;
-}
-
-int hexchat_plugin_init(hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg)
-{
-	ph = plugin_handle;
-
-	*plugin_name	= "HexTray";
-	*plugin_desc	= "Minimize HexChat to the Windows system tray";
-	*plugin_version = "1.3.0";
-
-	char buffer[256];
-
-	/***************************************************************************************************************************/
-	/************************* Initialize our preferences if they don't exist yet **********************************************/
-	/***************************************************************************************************************************/
-
-	if (hexchat_pluginpref_get_int (ph, "settings") == -1)
-	{
-		hexchat_pluginpref_set_int (ph, "settings", HT_DEF_SET);
-	}
-	if (hexchat_pluginpref_get_int (ph, "aot") == -1)
-	{
-		hexchat_pluginpref_set_int (ph, "aot", HT_DEF_AOT);
-	}
-	if (hexchat_pluginpref_get_int (ph, "key") == -1)
-	{
-		hexchat_pluginpref_set_int (ph, "key", HT_DEF_KEY);
-	}
-	if (hexchat_pluginpref_get_int (ph, "mod") == -1)
-	{
-		hexchat_pluginpref_set_int (ph, "mod", HT_DEF_MOD);
-	}
-	if (hexchat_pluginpref_get_str (ph, "away", buffer) == 0)
-	{
-		hexchat_pluginpref_set_str (ph, "away", "");
-	}
-
-	/***************************************************************************************************************************/
-	/************************* Load our preferences ****************************************************************************/
-	/***************************************************************************************************************************/
-	LoadPrefs();
-
-	/***************************************************************************************************************************/
-	/************************* Finds the HexChat window and saves it for later use *********************************************/
-	/***************************************************************************************************************************/
-	g_hXchatWnd = (HWND)hexchat_get_info(ph, "win_ptr");
-
-	if(g_hXchatWnd == NULL)
-	{
-		EnumThreadWindows(GetCurrentThreadId(), EnumWindowsProc, 0);
-	}
-
-	g_hOldProc	= (WNDPROC)GetWindowLongPtr(g_hXchatWnd, GWLP_WNDPROC);
-	SetWindowLongPtr(g_hXchatWnd, GWLP_WNDPROC, (LONG_PTR)WindowProc);
-
-	/***************************************************************************************************************************/	
-	/************************* Grab the HexChat Icon, Load our menu, create the window to receive the hotkey messages  *********/
-	/************************* and register the windows message so we know if explorer crashes                       ***********/
-	/***************************************************************************************************************************/
-	g_hTrayMenu		= GetSubMenu(LoadMenu((HINSTANCE)g_hInstance, MAKEINTRESOURCE(IDR_TRAY_MENU)), 0);
-	g_hHotkeyWnd	= CreateDialog((HINSTANCE)g_hInstance, MAKEINTRESOURCE(IDD_ALERT), NULL,		(DLGPROC)HotKeyProc);
-	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[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 ************************************************************************/
-	/***************************************************************************************************************************/
-	char szVersion[64];
-	_snprintf(szVersion, 64, "HexChat %s", hexchat_get_info(ph, "version"));
-	AddIcon(g_hXchatWnd, 1, g_hIcons[0], szVersion, (NIF_ICON | NIF_MESSAGE | NIF_TIP), WM_TRAYMSG);
-
-	/***************************************************************************************************************************/
-	/***************************************************************************************************************************/
-	/***************************************************************************************************************************/
-	if(g_dwPrefs & (1<<PREF_DNSIT))
-	{
-		DWORD dwStyle;
-		dwStyle = GetWindowLong(g_hXchatWnd, GWL_STYLE);
-		dwStyle |= (1<<WS_CHILD);
-		SetWindowLongPtr(g_hXchatWnd, GWL_STYLE, (LONG_PTR)dwStyle);
-		SetWindowLongPtr(g_hXchatWnd, GWL_HWNDPARENT, (LONG_PTR)g_hHotkeyWnd);
-	}
-
-	/***************************************************************************************************************************/
-	/************************* Set our hooks and save them for later so we can unhook them *************************************/
-	/***************************************************************************************************************************/
-	g_vHooks.push_back(hexchat_hook_print(ph, "Channel Msg Hilight",			HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_HILIGHT));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Channel Message",				HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_MESSAGE));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Topic Change",					HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_TOPIC_CHANGE));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Channel Action Hilight",		HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_HILIGHT));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Channel INVITE",				HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_INVITE));
-	g_vHooks.push_back(hexchat_hook_print(ph, "You Kicked",					HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_KICKED));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Banned",						HEXCHAT_PRI_NORM, event_cb,	(void *)CHAN_BANNED));
-	g_vHooks.push_back(hexchat_hook_print(ph, "CTCP Generic",					HEXCHAT_PRI_NORM, event_cb,	(void *)CTCP_GENERIC));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Private Message",				HEXCHAT_PRI_NORM, event_cb,	(void *)PMSG_RECEIVE));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Private Message to Dialog",	HEXCHAT_PRI_NORM, event_cb,	(void *)PMSG_RECEIVE));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Disconnected",					HEXCHAT_PRI_NORM, event_cb,	(void *)SERV_DISCONNECT));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Killed",						HEXCHAT_PRI_NORM, event_cb,	(void *)SERV_KILLED));
-	g_vHooks.push_back(hexchat_hook_print(ph, "Notice",						HEXCHAT_PRI_NORM, event_cb,	(void *)SERV_NOTICE));
-	g_vHooks.push_back(hexchat_hook_command(ph, "tray_alert",					HEXCHAT_PRI_NORM, command_cb,	"Create an Alert", NULL));
-
-	return 1;
-}
-
-int hexchat_plugin_deinit(hexchat_plugin *plugin_handle)
-{
-	/******************************************/
-	/****** Remove the Icon from the tray *****/
-	/******************************************/
-	StopBlink(g_hXchatWnd, 1, g_hIcons[0]);
-	RemoveIcon(g_hXchatWnd, 1);
-	
-	/*******************************************/
-	/*******************************************/
-	/*******************************************/
-	if(g_dwPrefs & (1<<PREF_DNSIT))
-	{
-		DWORD dwStyle;
-		dwStyle = GetWindowLong(g_hXchatWnd, GWL_STYLE);
-		dwStyle &= ~(1<<WS_CHILD);
-		SetWindowLongPtr(g_hXchatWnd, GWL_STYLE, (LONG_PTR)dwStyle);
-		SetWindowLongPtr(g_hXchatWnd, GWL_HWNDPARENT, NULL);
-	}
-
-	/******************************************/
-	/****** Unload our resources **************/
-	/******************************************/
-	DestroyMenu(g_hTrayMenu);
-
-	for(int i = 0; i <= 11; i++)
-	{
-		DestroyIcon(g_hIcons[i]);
-	}
-
-	/******************************************/
-	/****** Remove our window hook ************/
-	/******************************************/
-	SetWindowLongPtr(g_hXchatWnd, GWLP_WNDPROC, (LONG_PTR)g_hOldProc);
-
-	/******************************************/
-	/****** Remove our hotkey, and destroy ****/
-	/****** the window that receives its   ****/
-	/****** messages                       ****/
-	/******************************************/
-	UnregisterHotKey(g_hHotkeyWnd, 1);
-	DestroyWindow(g_hHotkeyWnd);
-	DestroyWindow(g_hPrefDlg);
-
-	/******************************************/
-	/************* Clean up Isle 7 ************/
-	/******************************************/
-	if(sdAlertNum())
-	{
-		sdCloseAlerts();
-	}
-	/******************************************/
-	/****** remove our hexchat_hook_*s **********/
-	/******************************************/
-	while(!g_vHooks.empty())
-	{
-		if(g_vHooks.back() != NULL)
-		{
-			hexchat_unhook(ph, g_vHooks.back());
-		}
-		g_vHooks.pop_back();
-	}
-
-	return 1;
-}

plugins/hextray/hextray.def

@@ -1,3 +0,0 @@
-EXPORTS 
-hexchat_plugin_init 
-hexchat_plugin_deinit 

plugins/hextray/hextray.h

@@ -1,83 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _XTRAY_H
-#define _XTRAY_H
-
-/******************** Default settings*****************/
-#define HT_DEF_SET		13814
-#define HT_DEF_AOT		5
-#define HT_DEF_KEY		84
-#define HT_DEF_MOD		6
-
-/******************** Globals *************************/
-extern HWND				g_hXchatWnd;
-extern HWND				g_hHotkeyWnd;
-extern HWND				g_hPrefDlg;
-extern HMENU			g_hTrayMenu;
-extern HICON			g_hIcons[24];
-extern HANDLE			g_hInstance;
-extern unsigned int		g_dwPrefs;
-extern TCHAR			g_szAway[512];
-extern int				g_iTime;
-extern WNDPROC			g_hOldProc;
-extern struct _hexchat_plugin *ph;
-/******************************************************/
-
-/******************** Messages ************************/
-#define WM_TRAYMSG WM_APP
-/******************************************************/
-
-/********************* Events *************************/
-#define CHAN_HILIGHT			1
-#define CHAN_INVITE				2
-#define CHAN_TOPIC_CHANGE		3
-#define CHAN_BANNED				4
-#define CHAN_KICKED				5
-
-#define CTCP_GENERIC			6
-#define PMSG_RECEIVE			7
-
-#define SERV_KILLED				8
-#define SERV_NOTICE				9
-#define SERV_DISCONNECT			10
-
-/* new events */
-#define CHAN_MESSAGE			21
-
-#define PREF_AOM				11 // away on minimize
-#define PREF_TOT				12 // Tray on Taskbar
-#define PREF_AMAE				13 // alert me about events
-#define PREF_OSBWM				14 // Only Show Balloon When Minimized
-#define PREF_UWIOB				15 // Use Window Instead of Balloon
-#define PREF_KAOI				16 // Keep alerts open indefinitely
-#define PREF_MIOC				17 // Minimize instead of close
-#define PREF_BLINK				18 // blink icon
-#define PREF_CICO				19 // change icon - not implemented
-#define PREF_DNSIT				20 // Do not show in taskbar
-/******************************************************/
-#endif
-
-#ifdef _WIN64
-/* use replacement with the same value, and use SetWindowLongPtr instead
-   of SetWindowLong. more info:
-
-   http://msdn.microsoft.com/en-us/library/ms633591.aspx
-   http://msdn.microsoft.com/en-us/library/ms644898.aspx */
-#define GWL_HWNDPARENT GWLP_HWNDPARENT
-#endif

plugins/hextray/hextray.vcxproj

@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3024CF36-85E5-4E00-9608-7002E2C7EF14}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>hextray</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-    <TargetName>hchextray</TargetName>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-    <TargetName>hchextray</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XTRAY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;XTRAY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>hextray.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="bitmaps\sd.bmp" />
-    <None Include="icons\ban.ico" />
-    <None Include="icons\disconnect.ico" />
-    <None Include="icons\highlight.ico" />
-    <None Include="icons\kick.ico" />
-    <None Include="icons\message.ico" />
-    <None Include="icons\sd.ico" />
-    <None Include="icons\notice.ico" />
-    <None Include="icons\hexchat.ico" />
-    <None Include="hextray.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="callbacks.cpp" />
-    <ClCompile Include="sdAlerts.cpp" />
-    <ClCompile Include="sdTray.cpp" />
-    <ClCompile Include="utility.cpp" />
-    <ClCompile Include="hexchat.cpp" />
-    <ClCompile Include="hextray.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="callbacks.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="sdAlerts.h" />
-    <ClInclude Include="sdTray.h" />
-    <ClInclude Include="utility.h" />
-    <ClInclude Include="hexchat.h" />
-    <ClInclude Include="hextray.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/hextray/hextray.vcxproj.filters

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Resource Files\bitmaps">
-      <UniqueIdentifier>{448b49a5-e68b-451e-bfbc-0855da024b2e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resource Files\icons">
-      <UniqueIdentifier>{8345128a-0635-43d6-9115-a85ad9c77ee2}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="hextray.def">
-      <Filter>Resource Files</Filter>
-    </None>
-    <None Include="bitmaps\sd.bmp">
-      <Filter>Resource Files\bitmaps</Filter>
-    </None>
-    <None Include="icons\ban.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <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\kick.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <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\notice.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-    <None Include="icons\hexchat.ico">
-      <Filter>Resource Files\icons</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="callbacks.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sdAlerts.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="sdTray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="utility.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hexchat.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hextray.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="callbacks.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sdAlerts.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="sdTray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="utility.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hexchat.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="hextray.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

plugins/hextray/resource.h

@@ -1,47 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by resource.rc
-//
-#define IDD_ALERTS                      104
-#define IDD_EVENTS                      105
-#define IDD_SETTINGS                    106
-#define IDD_ALERT                       107
-#define IDD_PREF                        108
-#define IDD_ABOUT                       109
-#define IDR_TRAY_MENU                   110
-#define ICO_XCHAT                       111
-#define ICO_BANNED                      112
-#define ICO_CHANMSG                     113
-#define ICO_DISCONNECTED                114
-#define ICO_HIGHLIGHT                   115
-#define ICO_KICKED                      116
-#define ICO_PMSG                        117
-#define ICO_SNOTICE                     118
-#define IDB_SD_LOGO                     119
-#define IDC_PREF_OK                     1014
-#define IDC_PREF_CANCEL                 1015
-#define IDC_PREF_APPLY                  1016
-#define IDC_AWAY_MSG                    1017
-#define IDC_ALERT_TIME                  1018
-#define IDC_TAB_CONTROL                 1019
-#define IDC_ALERT_HOTKEY                1020
-#define IDC_ALERT_MSG                   1021
-#define IDC_ALERT_HOTKEY_TEXT           1022
-#define IDC_ALERT_TIME_TEXT             1023
-#define ACT_EXIT                        40001
-#define ACT_SETTINGS                    40002
-#define ACT_AWAY                        40003
-#define ACT_BACK                        40004
-#define ACT_RESTORE                     40005
-#define IDC_STATIC                      -1
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        120
-#define _APS_NEXT_COMMAND_VALUE         40006
-#define _APS_NEXT_CONTROL_VALUE         1024
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif

plugins/hextray/resource.rc

@@ -1,309 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_EVENTS DIALOGEX 8, 20, 216, 143
-STYLE DS_SETFONT | DS_SETFOREGROUND | WS_CHILD
-FONT 8, "Tahoma", 0, 0, 0x0
-BEGIN
-    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
-    CONTROL         "Disconnect",10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,60,49,10
-    CONTROL         "Private Message",7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,18,69,10
-    CONTROL         "Channel Message",21,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,32,69,10
-    CONTROL         "Highlight",1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,46,69,10
-    CONTROL         "CTCP",6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,60,69,10
-    CONTROL         "Topic Change",3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,18,55,10
-    CONTROL         "Server Notice",9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,32,55,10
-    CONTROL         "Invite",2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,46,55,10
-END
-
-IDD_SETTINGS DIALOGEX 8, 20, 216, 143
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "Tahoma", 0, 0, 0x0
-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 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 HexChat from the taskbar (only show in tray)",
-                    20,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,46,191,9
-END
-
-IDD_ALERT DIALOGEX 0, 0, 151, 28
-STYLE DS_LOCALEDIT | DS_SETFONT | DS_NOIDLEMSG | DS_CENTER | WS_CAPTION | 
-    WS_SYSMENU
-EXSTYLE WS_EX_NOPARENTNOTIFY | WS_EX_ACCEPTFILES | WS_EX_TOOLWINDOW
-CAPTION "Event Name"
-FONT 8, "Tahoma", 0, 0, 0x1
-BEGIN
-    LTEXT           "Event Text",IDC_ALERT_MSG,3,0,147,27
-END
-
-IDD_PREF DIALOGEX 0, 0, 233, 190
-STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 
-    WS_SYSMENU
-CAPTION "HexTray Preferences"
-FONT 8, "Tahoma", 0, 0, 0x0
-BEGIN
-    DEFPUSHBUTTON   "Ok",IDC_PREF_OK,57,173,50,14
-    PUSHBUTTON      "Cancel",IDC_PREF_CANCEL,115,173,50,14
-    PUSHBUTTON      "Apply",IDC_PREF_APPLY,175,173,50,14
-    CONTROL         "Tab1",IDC_TAB_CONTROL,"SysTabControl32",0x0,7,7,218,159
-END
-
-IDD_ABOUT DIALOGEX 8, 20, 216, 143
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "Tahoma", 0, 0, 0x0
-BEGIN
-    CONTROL         119,IDC_STATIC,"Static",SS_BITMAP | SS_SUNKEN | 
-                    WS_BORDER,3,6,88,81
-    CTEXT           "HexTray\r\nBy: Michael Hotaling\r\n www.SinisterDevelopments.com",
-                    IDC_STATIC,95,33,118,30
-    LTEXT           "Folken\r\nBasket\r\nDonatzsky\r\nDaemon404",IDC_STATIC,
-                    15,103,64,33
-    GROUPBOX        "Special Thanks To:",IDC_STATIC,3,91,89,50
-    GROUPBOX        "Version Information:",IDC_STATIC,101,92,109,49
-    LTEXT           "1.3.0",IDC_STATIC,170,105,33,8,0,WS_EX_RIGHT
-    LTEXT           "Compiled In: ",IDC_STATIC,110,117,54,8
-    LTEXT           "2012",IDC_STATIC,170,117,33,8,0,WS_EX_RIGHT
-    LTEXT           "Version Number:",IDC_STATIC,110,105,54,8
-END
-
-IDD_ALERTS DIALOGEX 8, 20, 216, 143
-STYLE DS_SETFONT | WS_CHILD
-FONT 8, "Tahoma", 0, 0, 0x0
-BEGIN
-    GROUPBOX        "Alerts",IDC_STATIC,5,5,205,117
-    CONTROL         "Only show alerts while minimized",14,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,27,46,117,10
-    CONTROL         "Use tray alerts to notify me about events",13,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,32,152,10
-    CONTROL         "Use window instead of balloons",15,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,27,60,141,11
-    EDITTEXT        IDC_ALERT_TIME,137,101,61,12,ES_AUTOHSCROLL | ES_NUMBER,
-                    WS_EX_RIGHT
-    LTEXT           "Show alert for x seconds:",IDC_ALERT_TIME_TEXT,40,103,
-                    83,9
-    CONTROL         "Alert Hotkey",IDC_ALERT_HOTKEY,"msctls_hotkey32",
-                    WS_BORDER | WS_TABSTOP,137,74,61,13
-    LTEXT           "Close all alerts hotkey:",IDC_ALERT_HOTKEY_TEXT,39,75,
-                    76,10
-    CONTROL         "Leave alerts open indefinitely",16,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,27,88,115,11
-    CONTROL         "Blink Icon to alert me about events",18,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,16,18,127,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_EVENTS, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 56
-    END
-
-    IDD_SETTINGS, DIALOG
-    BEGIN
-        BOTTOMMARGIN, 66
-    END
-
-    IDD_ALERT, DIALOG
-    BEGIN
-        RIGHTMARGIN, 150
-        BOTTOMMARGIN, 26
-    END
-
-    IDD_PREF, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 232
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 176
-    END
-
-    IDD_ABOUT, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 209
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 136
-    END
-
-    IDD_ALERTS, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 208
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 136
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""windows.h""\r\n"
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "hextray.h\0"
-END
-
-4 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,3,0,0
- PRODUCTVERSION 1,3,0,0
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "CompanyName", "SinisterDevelopments"
-            VALUE "FileDescription", "HexTray"
-            VALUE "FileVersion", "1,3,0,0"
-            VALUE "InternalName", "HexTray"
-            VALUE "LegalCopyright", "Copyright <20> 2005"
-            VALUE "OriginalFilename", "hchextray.dll"
-            VALUE "ProductName", "HexTray - HexChat Win32 System Tray Plugin"
-            VALUE "ProductVersion", "1,3,0,0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TRAY_MENU MENU 
-BEGIN
-    POPUP "TRAY"
-    BEGIN
-        MENUITEM "Restore",                     ACT_RESTORE
-        MENUITEM SEPARATOR
-        MENUITEM "Away",                        65535
-        MENUITEM "Settings",                    ACT_SETTINGS
-        MENUITEM SEPARATOR
-        MENUITEM "Exit",                        ACT_EXIT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// 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\\ban.ico"
-ICO_CHANMSG             ICON                    "icons\\message.ico"
-ICO_HIGHLIGHT           ICON                    "icons\\highlight.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"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDB_SD_LOGO             BITMAP                  "bitmaps\\sd.bmp"
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-hextray.h
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-

plugins/hextray/sdAlerts.cpp

@@ -1,109 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <windows.h>
-#include <winuser.h>
-#include <stdio.h>
-#include "utility.h"
-#include "resource.h"
-#include "sdAlerts.h"
-
-int g_iAlerts = 0;
-
-void sdSystemAlert(HINSTANCE hModule, UINT uiDialog, char *szMsg, char *szName, unsigned int iTime)
-{
-	TCHAR wszMsg[256];
-	TCHAR wszName[64];
-
-	HWND hDialog;
-	RECT rcWorkArea, rcDlg;
-	int ixPos, iyPos;
-	int iNumPerCol;
-	
-	hDialog = CreateDialog(hModule, MAKEINTRESOURCE(uiDialog), NULL, (DLGPROC)sdAlertProc);
-
-	SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, 0);
-	GetWindowRect(hDialog, &rcDlg);
-
-	iNumPerCol = ((rcWorkArea.bottom - rcWorkArea.top) / (rcDlg.bottom - rcDlg.top));
-	ixPos = rcWorkArea.right - (rcDlg.right - rcDlg.left) + 1;
-	iyPos = rcWorkArea.bottom - (rcDlg.bottom - rcDlg.top);
-
-	if((g_iAlerts >= iNumPerCol) && (iNumPerCol > 0))
-	{
-		ixPos -= ((g_iAlerts / iNumPerCol) * (rcDlg.right - rcDlg.left));
-		iyPos -= ((g_iAlerts - (iNumPerCol * (g_iAlerts / iNumPerCol))) * (rcDlg.bottom - rcDlg.top));
-	}
-	else
-	{
-		iyPos -= (g_iAlerts * (rcDlg.bottom - rcDlg.top));
-	}
-	SetWindowPos(hDialog, HWND_TOPMOST, ixPos, iyPos, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE);
-	
-	ConvertString(szName, wszName, 64);
-	ConvertString(szMsg, wszMsg, 256);
-
-	SetWindowText(hDialog, wszName);
-	SetDlgItemText(hDialog, IDC_ALERT_MSG, wszMsg);
-	ShowWindow(hDialog, SW_SHOWNA);
-
-	if(iTime > 0)
-	{
-		SetTimer(hDialog, 1, iTime, NULL);
-	}
-
-	g_iAlerts++;
-}
-
-void sdCloseAlerts()
-{
-	PostMessage(HWND_BROADCAST, RegisterWindowMessage(TEXT("xTray:CloseAllAlertWindows")), 0, 0);
-}
-
-LRESULT CALLBACK sdAlertProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
-{
-	switch(msg)
-	{
-	case WM_CLOSE:
-		if(g_iAlerts > 0){ g_iAlerts--; }
-		DestroyWindow(hwnd);
-		return TRUE;
-		break;
-	case WM_TIMER:
-		if(g_iAlerts > 0){ g_iAlerts--; }
-		AnimateWindow(hwnd, 600, AW_SLIDE | AW_HIDE | AW_VER_POSITIVE);
-		DestroyWindow(hwnd);
-		return TRUE;
-		break;
-	default:
-		if(msg == RegisterWindowMessage(TEXT("xTray:CloseAllAlertWindows")))
-		{
-			if(g_iAlerts > 0){ g_iAlerts--; }
-			DestroyWindow(hwnd);
-			return TRUE;
-		}
-		break;
-	}
-
-	return FALSE;
-}
-
-int sdAlertNum()
-{
-	return g_iAlerts;
-}

plugins/hextray/sdAlerts.h

@@ -1,26 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _H_SDALERTS_H
-#define _H_SDALERTS_H
-
-void				sdSystemAlert	(HINSTANCE, UINT, char *, char *, UINT);
-LRESULT CALLBACK	sdAlertProc		(HWND, UINT, WPARAM, LPARAM);
-int					sdAlertNum		();
-void				sdCloseAlerts	();
-#endif

plugins/hextray/sdTray.cpp

@@ -1,207 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#define _WIN32_IE 0x601
-#include <windows.h>
-#include <stdio.h>
-#include <tchar.h>
-#include "sdTray.h"
-#include "utility.h"
-
-HANDLE hThread;
-iBlink *tData	= NULL;
-
-int AddIcon(HWND hwnd, UINT id, HICON hicon, char *szTip, unsigned short flags, unsigned int cbMsg)
-{
-	NOTIFYICONDATA nidata;
-
-	nidata.cbSize			= NOTIFYICONDATA_V2_SIZE;
-	nidata.hIcon			= hicon;
-	nidata.hWnd				= hwnd;
-	nidata.uCallbackMessage = cbMsg;
-	nidata.uFlags			= flags;
-	nidata.uID				= id;
-
-	if(szTip != NULL)
-	{
-		TCHAR *szTemp = new TCHAR[64];
-
-		ConvertString(szTip, szTemp, 64);
-		_tcsncpy(nidata.szTip, szTemp, 64);
-
-		delete[] szTemp;
-	}
-
-	return Shell_NotifyIcon(NIM_ADD, &nidata);
-}
-
-int RemoveIcon(HWND hwnd, UINT id)
-{
-	if(hThread != NULL)
-	{
-		TerminateThread(hThread, 0);
-		hThread = NULL;
-
-		delete tData;
-	}
-
-	NOTIFYICONDATA nidata;
-
-	nidata.cbSize = NOTIFYICONDATA_V2_SIZE;
-	nidata.hWnd   = hwnd;
-	nidata.uID    = id;
-
-	return Shell_NotifyIcon(NIM_DELETE, &nidata);
-}
-
-int SetIcon(HWND hwnd, UINT id, HICON hicon)
-{
-	NOTIFYICONDATA nidata;
-
-	nidata.cbSize = NOTIFYICONDATA_V2_SIZE;
-	nidata.hWnd   = hwnd;
-	nidata.uID    = id;
-	nidata.hIcon  = hicon;
-	nidata.uFlags = NIF_ICON;
-
-	return Shell_NotifyIcon(NIM_MODIFY, &nidata);
-}
-
-int SetTooltip(HWND hwnd, UINT id, char *szTip)
-{
-	NOTIFYICONDATA nidata;
-
-	nidata.cbSize = NOTIFYICONDATA_V2_SIZE;
-	nidata.hWnd   = hwnd;
-	nidata.uID    = id;
-	nidata.uFlags = NIF_TIP;
-
-	if(szTip != NULL)
-	{
-		TCHAR *szTemp = new TCHAR[64];
-		ConvertString(szTip, szTemp, 64);
-		_tcsncpy(nidata.szTip, szTemp, 64);
-		delete[] szTemp;
-	}
-
-	return Shell_NotifyIcon(NIM_MODIFY, &nidata);
-}
-
-int ShowBalloon(HWND hwnd, UINT id, char *szInfo, char *szTitle, UINT time, UINT infoFlags)
-{
-	NOTIFYICONDATA nidata;
-
-	nidata.cbSize	= NOTIFYICONDATA_V2_SIZE;
-	nidata.hWnd		= hwnd;
-	nidata.uID		= id;
-	nidata.uFlags	= NIF_INFO;
-	nidata.dwInfoFlags = infoFlags;
-
-	if(time > 0)
-		nidata.uTimeout = time;
-	else
-		nidata.uTimeout = 500000;
-
-	if(szInfo != NULL)
-	{
-		TCHAR *szTemp = new TCHAR[255];
-
-		ConvertString(szInfo, szTemp, 251);
-		szTemp[250] = 0;
-		
-		if(strlen(szInfo) > 255)
-		{
-			_sntprintf(szTemp, 255, _T("%s..."), szTemp);
-		}
-		_tcsncpy(nidata.szInfo, szTemp, 255);
-
-		delete[] szTemp;
-	}
-	if(szTitle != NULL)
-	{
-		TCHAR *wszTitle = new TCHAR[64];
-		ConvertString(szTitle, wszTitle, 64);
-		_tcsncpy(nidata.szInfoTitle, wszTitle, 64);
-		delete[] wszTitle;
-	}
-
-	return Shell_NotifyIcon(NIM_MODIFY, &nidata);
-}
-
-
-DWORD WINAPI BlinkThread(LPVOID lpParam)
-{
-	NOTIFYICONDATA nidata;
-
-	nidata.cbSize = NOTIFYICONDATA_V2_SIZE;
-	nidata.hWnd   = tData->hwnd;
-	nidata.uID    = tData->id;
-	nidata.uFlags = NIF_ICON;
-
-	for(UINT i = 0; i < tData->num; i++)
-	{
-		nidata.hIcon = tData->hBlink;
-		Shell_NotifyIcon(NIM_MODIFY, &nidata);
-
-		Sleep(tData->time);
-
-		nidata.hIcon = tData->hBase;
-		Shell_NotifyIcon(NIM_MODIFY, &nidata);
-
-		Sleep(tData->time);
-	}
-
-	delete tData;
-	hThread = NULL;
-
-	return 0;
-}
-
-int BlinkIcon(HWND hwnd, UINT id, HICON hBase, HICON hBlink, UINT time, UINT num)
-{
-	if(hThread != NULL)
-	{
-		StopBlink(hwnd, id, hBase);
-	}
-
-	DWORD dwThreadID;
-	tData = new iBlink;
-
-	tData->hwnd		= hwnd;
-	tData->id		= id;
-	tData->hBase	= hBase;
-	tData->hBlink	= hBlink;
-	tData->time		= time;
-	tData->num		= num;
-
-	hThread = CreateThread(NULL, 0, BlinkThread, tData, 0, &dwThreadID);
-
-	return 0;
-}
-
-void StopBlink(HWND hwnd, UINT id, HICON hBase)
-{
-	if(hThread != NULL)
-	{
-		TerminateThread(hThread, 0);
-		hThread = NULL;
-
-		delete tData;
-	}
-
-	SetIcon(hwnd, id, hBase);
-}

plugins/hextray/sdTray.h

@@ -1,39 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _H_SDTRAY_H
-#define _H_SDTRAY_H
-
-int				AddIcon		(HWND, UINT, HICON, char *, unsigned short, UINT);
-int				ShowBalloon	(HWND, UINT, char *, char *, UINT, UINT);
-int				BlinkIcon	(HWND, UINT, HICON, HICON, UINT, UINT);
-int				SetTooltip	(HWND, UINT, char *);
-int				SetIcon		(HWND, UINT, HICON);
-void			StopBlink	(HWND, UINT, HICON);
-int				RemoveIcon	(HWND, UINT);
-
-typedef struct IBLINK
-{
-	HICON hBase;
-	HICON hBlink;
-	HWND hwnd;
-	UINT id;
-	UINT time;
-	UINT num;
-}iBlink;
-#endif

plugins/hextray/utility.cpp

@@ -1,410 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <windows.h>
-#include <stdio.h>
-#include <commctrl.h>
-#include <tchar.h>
-
-#include "hexchat-plugin.h"
-#include "utility.h"
-#include "hextray.h"
-#include "callbacks.h"
-#include "resource.h"
-
-struct HOTKEY g_hHotKey;
-
-/* we need to convert ALT and SHIFT modifiers
-// from <winuser.h>
-#define MOD_ALT         0x0001
-#define MOD_CONTROL     0x0002
-#define MOD_SHIFT       0x0004
-// from <commctrl.h>
-#define HOTKEYF_SHIFT           0x01
-#define HOTKEYF_CONTROL         0x02
-#define HOTKEYF_ALT             0x04
-*/
-
-WORD HotkeyfToMod(WORD modifiers)
-{
-	WORD newmods = 0;
-
-	if (modifiers & HOTKEYF_SHIFT)
-		newmods |= MOD_SHIFT;
-
-	if (modifiers & HOTKEYF_CONTROL)
-		newmods |= MOD_CONTROL;
-
-	if (modifiers & HOTKEYF_ALT)
-		newmods |= MOD_ALT;
-
-	return newmods;
-}
-
-WORD ModToHotkeyf(WORD modifiers)
-{
-	WORD newmods = 0;
-
-	if (modifiers & MOD_SHIFT)
-		newmods |= HOTKEYF_SHIFT;
-
-	if (modifiers & MOD_CONTROL)
-		newmods |= HOTKEYF_CONTROL;
-
-	if (modifiers & MOD_ALT)
-		newmods |= HOTKEYF_ALT;
-
-	return newmods;
-}
-
-void SavePrefs(int iDlg)
-{
-	hexchat_pluginpref_set_int (ph, "settings", g_dwPrefs);
-	hexchat_pluginpref_set_int (ph, "aot", g_iTime);
-	hexchat_pluginpref_set_int (ph, "key", g_hHotKey.key);
-	hexchat_pluginpref_set_int (ph, "mod", g_hHotKey.mod);
-	hexchat_pluginpref_set_str (ph, "away", (const char*) g_szAway);
-}
-
-void LoadPrefs()
-{
-	/**************************************************************************************************/
-	/*********************** Our Settings Section *****************************************************/
-	/**************************************************************************************************/
-
-	/**************************************************************************************************/
-	/*************************** Get the value for each of our preferances ****************************/
-	/**************************************************************************************************/
-
-	g_dwPrefs = hexchat_pluginpref_get_int (ph, "settings");
-	g_iTime = hexchat_pluginpref_get_int (ph, "aot");
-	g_hHotKey.key = hexchat_pluginpref_get_int (ph, "key");
-	g_hHotKey.mod = hexchat_pluginpref_get_int (ph, "mod");
-	hexchat_pluginpref_get_str (ph, "away", (char *) g_szAway);
-
-	/**************************************************************************************************/
-	/******************************** Register our hotkey with windows ********************************/
-	/**************************************************************************************************/
-	if(g_dwPrefs & (1<<PREF_UWIOB))
-	{
-		RegisterHotKey(g_hHotkeyWnd, 1, g_hHotKey.mod, g_hHotKey.key);
-	}
-}
-
-void CheckPrefs(HWND hwnd, int iDlg)
-{
-	/**************************************************************************************************/
-	/**************** save the preferances based on the checkmarks/options ****************************/
-	/**************************************************************************************************/
-	switch(iDlg)
-	{
-	case IDD_EVENTS:
-		{
-			SetOption(hwnd, CHAN_HILIGHT,		CHAN_HILIGHT);
-			SetOption(hwnd, CHAN_INVITE,		CHAN_INVITE);
-			SetOption(hwnd, CHAN_TOPIC_CHANGE,	CHAN_TOPIC_CHANGE);
-			SetOption(hwnd, CHAN_BANNED,		CHAN_BANNED);
-			SetOption(hwnd, CHAN_KICKED,		CHAN_KICKED);
-			SetOption(hwnd, CTCP_GENERIC,		CTCP_GENERIC);
-			SetOption(hwnd, PMSG_RECEIVE,		PMSG_RECEIVE);
-			SetOption(hwnd, SERV_KILLED,		SERV_KILLED);
-			SetOption(hwnd, SERV_NOTICE,		SERV_NOTICE);
-			SetOption(hwnd, SERV_DISCONNECT,	SERV_DISCONNECT);
-			SetOption(hwnd, CHAN_MESSAGE,		CHAN_MESSAGE);
-		}
-		break;
-	case IDD_ALERTS:
-		{
-			SetOption(hwnd, PREF_AMAE,	PREF_AMAE);
-			SetOption(hwnd, PREF_OSBWM,	PREF_OSBWM);
-			SetOption(hwnd, PREF_UWIOB,	PREF_UWIOB);
-			SetOption(hwnd, PREF_KAOI,	PREF_KAOI);
-			SetOption(hwnd, PREF_BLINK,	PREF_BLINK);
-
-			/**************************************************************************/
-			/**************************************************************************/
-			/**************************************************************************/
-			TCHAR tTime[512];
-
-			GetWindowText(GetDlgItem(hwnd, IDC_ALERT_TIME), tTime, 511);
-			
-			g_iTime = _tstoi(tTime);
-			
-			/**************************************************************************/
-			/**************** Get our Hotkey and save it                     **********/
-			/**************** then remove the old hotkey and add the new one **********/
-			/**************************************************************************/
-			DWORD hHotkey;
-			hHotkey = SendDlgItemMessage(hwnd, IDC_ALERT_HOTKEY, HKM_GETHOTKEY, 0, 0);
-			
-			g_hHotKey.key = LOBYTE(hHotkey);
-			g_hHotKey.mod = HotkeyfToMod(HIBYTE(hHotkey));
-			
-			if(IsDlgButtonChecked(hwnd, PREF_UWIOB) == BST_CHECKED)
-			{
-				UnregisterHotKey(g_hHotkeyWnd, 1);
-				RegisterHotKey(g_hHotkeyWnd, 1, g_hHotKey.mod, g_hHotKey.key);
-			}
-			else
-			{
-				UnregisterHotKey(g_hHotkeyWnd, 1);
-			}
-
-			/*************************************************************************/
-			/*********** Get and save the away msg and alert time ********************/
-			/*************************************************************************/
-		}
-		break;
-	case IDD_SETTINGS:
-		{
-			SetOption(hwnd, PREF_AOM, PREF_AOM);
-			SetOption(hwnd, PREF_TOT, PREF_TOT);
-			SetOption(hwnd, PREF_MIOC, PREF_MIOC);
-			SetOption(hwnd, PREF_DNSIT, PREF_DNSIT);
-
-			GetDlgItemText(hwnd, IDC_AWAY_MSG, g_szAway, 511);
-
-			if(g_dwPrefs & (1<<PREF_DNSIT))
-			{
-				DWORD dwStyle;
-				dwStyle = GetWindowLong(g_hXchatWnd, GWL_STYLE);
-				dwStyle |= (1<<WS_CHILD);
-				SetWindowLongPtr(g_hXchatWnd, GWL_STYLE, (LONG_PTR)dwStyle);
-				SetWindowLongPtr(g_hXchatWnd, GWL_HWNDPARENT, (LONG_PTR)g_hHotkeyWnd);
-			}
-			else
-			{
-				DWORD dwStyle;
-				dwStyle = GetWindowLong(g_hXchatWnd, GWL_STYLE);
-				dwStyle &= ~(1<<WS_CHILD);
-				SetWindowLongPtr(g_hXchatWnd, GWL_STYLE, (LONG_PTR)dwStyle);
-				SetWindowLongPtr(g_hXchatWnd, GWL_HWNDPARENT, NULL);
-			}
-		}
-		break;
-	} 
-}
-
-void SetDialog(HWND hwnd, int iDlg)
-{
-	switch(iDlg)
-	{
-	case IDD_EVENTS:
-		{
-			SetCheck(hwnd, CHAN_HILIGHT,		CHAN_HILIGHT);
-			SetCheck(hwnd, CHAN_INVITE,			CHAN_INVITE);
-			SetCheck(hwnd, CHAN_TOPIC_CHANGE,	CHAN_TOPIC_CHANGE);
-			SetCheck(hwnd, CHAN_BANNED,			CHAN_BANNED);
-			SetCheck(hwnd, CHAN_KICKED,			CHAN_KICKED);
-			SetCheck(hwnd, CTCP_GENERIC,		CTCP_GENERIC);
-			SetCheck(hwnd, PMSG_RECEIVE,		PMSG_RECEIVE);
-			SetCheck(hwnd, SERV_KILLED,			SERV_KILLED);
-			SetCheck(hwnd, SERV_NOTICE,			SERV_NOTICE);
-			SetCheck(hwnd, SERV_DISCONNECT,		SERV_DISCONNECT);
-			SetCheck(hwnd, CHAN_MESSAGE,		CHAN_MESSAGE);
-		}
-		break;
-	case IDD_SETTINGS:
-		{
-			SetCheck(hwnd, PREF_TOT,	PREF_TOT);
-			SetCheck(hwnd, PREF_MIOC,	PREF_MIOC);
-			SetCheck(hwnd, PREF_AOM,	PREF_AOM);
-			SetCheck(hwnd, PREF_DNSIT,	PREF_DNSIT);
-
-			SetDlgItemText(hwnd, IDC_AWAY_MSG, g_szAway);
-		}
-		break;
-	case IDD_ALERTS:
-		{
-			
-			SetCheck(hwnd, PREF_BLINK,	PREF_BLINK);
-			SetCheck(hwnd, PREF_OSBWM,	PREF_OSBWM);
-			SetCheck(hwnd, PREF_UWIOB,	PREF_UWIOB);
-			SetCheck(hwnd, PREF_KAOI,	PREF_KAOI);
-
-			/**********************************************************/
-			/**********************************************************/
-			/**********************************************************/
-			if(SetCheck(hwnd, PREF_AMAE, PREF_AMAE) == false)
-			{
-				SetToggle(hwnd, PREF_OSBWM,				PREF_AMAE, TRUE);
-				SetToggle(hwnd, PREF_UWIOB,				PREF_AMAE, TRUE);
-				SetToggle(hwnd, PREF_KAOI,				PREF_AMAE, TRUE);
-				SetToggle(hwnd, IDC_ALERT_TIME,			PREF_AMAE, TRUE);
-				SetToggle(hwnd, IDC_ALERT_TIME_TEXT,	PREF_AMAE, TRUE);
-				SetToggle(hwnd, IDC_ALERT_HOTKEY,		PREF_AMAE, TRUE);
-				SetToggle(hwnd, IDC_ALERT_HOTKEY_TEXT,	PREF_AMAE, TRUE);
-			}
-			else
-			{
-
-				SetToggle(hwnd, IDC_ALERT_HOTKEY,		PREF_UWIOB, TRUE);
-				SetToggle(hwnd, IDC_ALERT_HOTKEY_TEXT,	PREF_UWIOB, TRUE);
-				SetToggle(hwnd, IDC_ALERT_TIME,			PREF_KAOI, FALSE);
-				SetToggle(hwnd, IDC_ALERT_TIME_TEXT,	PREF_KAOI, FALSE);
-			}
-
-			/**********************************************************/
-			/**********************************************************/
-			/**********************************************************/
-			TCHAR tTime[255];
-			SendDlgItemMessage(hwnd, IDC_ALERT_TIME,	WM_SETTEXT, 0, (LPARAM)_itot(g_iTime, tTime, 10));
-			SendDlgItemMessage(hwnd, IDC_ALERT_HOTKEY,	HKM_SETHOTKEY, MAKEWORD(g_hHotKey.key, ModToHotkeyf(g_hHotKey.mod)), 0);
-		}
-		break;
-	}
-}
-
-int SetCheck(HWND hDialog, unsigned int uiCheckBox, unsigned int uiPref)
-{
-	if((g_dwPrefs & (1<<uiPref)))
-	{
-		CheckDlgButton(hDialog, uiCheckBox, BST_CHECKED);
-		return 1;
-	}
-	else
-	{
-		CheckDlgButton(hDialog, uiCheckBox, BST_UNCHECKED);
-		return 0;
-	}
-
-	return 0;
-}
-
-int SetToggle(HWND hDialog, unsigned int uiCheckBox, unsigned int uiTestbox, bool offeqoff)
-{
-	/**************************************************************************************************/
-	/*********************** if(true) then if option is off turn toggle off ***************************/
-	/*********************** if(false) then if option is off turn toggle on ***************************/
-	/**************************************************************************************************/
-	if(offeqoff)
-	{
-		if(IsDlgButtonChecked(hDialog, uiTestbox) == BST_CHECKED)
-		{
-			EnableWindow(GetDlgItem(hDialog, uiCheckBox), TRUE);
-			return 1;
-		}
-		else
-		{
-			EnableWindow(GetDlgItem(hDialog, uiCheckBox), FALSE);
-			return 0;
-		}
-	}
-	else
-	{
-		if(IsDlgButtonChecked(hDialog, uiTestbox) == BST_CHECKED)
-		{
-			EnableWindow(GetDlgItem(hDialog, uiCheckBox), FALSE);
-			return 1;
-		}
-		else
-		{
-			EnableWindow(GetDlgItem(hDialog, uiCheckBox), TRUE);
-			return 0;
-		}
-	}
-
-	return 0;
-}
-
-int SetOption(HWND hDialog, unsigned int uiCheckBox, unsigned int uiPref)
-{
-	if(IsDlgButtonChecked(hDialog, uiCheckBox) == BST_CHECKED)
-	{
-		g_dwPrefs |= (1<<uiPref);
-	}
-	else
-	{
-		g_dwPrefs &= ~(1<<uiPref);
-	}
-
-	return (g_dwPrefs & (1<<uiPref));
-}
-
-// For cleanup ( Closing windows and the such )
-void HoldClose()
-{
-	HANDLE hcThread;
-	DWORD dwThreadID;
-	hcThread = CreateThread(NULL, 0, HoldCloseThread, 0, 0, &dwThreadID);
-}
-
-DWORD WINAPI HoldCloseThread(LPVOID lpParam)
-{
-	Sleep(1000);
-	PostMessage(g_hXchatWnd, WM_CLOSE, 0, 0);
-	return 0;
-}
-
-bool FileExists(TCHAR *file)
-{
-	HANDLE hTemp = CreateFile(file, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-	int nRet = GetLastError();
-	CloseHandle(hTemp);
-
-	if(nRet == 0)
-	{
-		return true;
-	}
-	else
-	{
-		return false;
-	}
-
-	return false;
-}
-
-void ConvertString(const char *in, wchar_t *out, int size)
-{
-	MultiByteToWideChar(CP_UTF8, 0, in,  -1, out, size);
-}
-
-void ConvertString(const wchar_t *in, char *out, int size)
-{
-	WideCharToMultiByte(CP_UTF8, 0, in, (size - 1), out, size, NULL, NULL);
-}
-
-void ConvertString(const char *in, char *out, int size)
-{
-	strncpy(out, in, size);
-}
-
-void ErrorDebug(LPTSTR lpszFunction)
-{ 
-    TCHAR szBuf[80]; 
-    LPVOID lpMsgBuf;
-    DWORD dw = GetLastError(); 
-
-    FormatMessage(
-        FORMAT_MESSAGE_ALLOCATE_BUFFER | 
-        FORMAT_MESSAGE_FROM_SYSTEM,
-        NULL,
-        dw,
-        MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        (LPTSTR) &lpMsgBuf,
-        0, NULL );
-
-    _stprintf(szBuf, 
-        _T("%s failed with error %d: %s"), 
-        lpszFunction, dw, lpMsgBuf); 
- 
-    MessageBox(NULL, szBuf, _T("Error"), MB_OK); 
-
-    LocalFree(lpMsgBuf);
-}
-

plugins/hextray/utility.h

@@ -1,46 +0,0 @@
-/* X-Tray
- * Copyright (C) 2005 Michael Hotaling <Mike.Hotaling@SinisterDevelopments.com>
- *
- * X-Tray is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * X-Tray is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with X-Tray; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _H_UTILITY_H
-#define _H_UTILITY_H
-
-WORD					HotkeyfToMod	(WORD);
-WORD					ModToHotkeyf	(WORD);
-
-int						SetOption		(HWND, unsigned int, unsigned int);
-int						SetCheck		(HWND, unsigned int, unsigned int);
-int						SetToggle		(HWND, unsigned int, unsigned int, bool);
-void					ErrorDebug		(LPTSTR lpszFunction);
-void					SetDialog		(HWND, int);
-void					CheckPrefs		(HWND, int);
-bool					FileExists		(TCHAR *);
-DWORD WINAPI			HoldCloseThread	(LPVOID);
-void					SavePrefs		(int);
-void					LoadPrefs		();
-void					HoldClose		();
-
-void ConvertString(const char *in,		wchar_t *out,	int size);
-void ConvertString(const wchar_t *in,	char *out,		int size);
-void ConvertString(const char *in,		char *out,		int size);
-
-struct HOTKEY
-{
-	WORD key;
-	WORD mod;
-};
-#endif

plugins/lua/lua-xp.vcxproj

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{646B4316-C8B8-4DB6-B6AE-E586929E5729}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>lua</RootNamespace>
-    <ProjectName>lua</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(LuaOutput)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(LuaOutput)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>"$(LuaLib).lib";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>"$(LuaLib).lib";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <AdditionalDependencies>"$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <AdditionalDependencies>"$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);snprintf=g_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>lua.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);snprintf=g_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>lua.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="lua.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="lua.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/lua/lua-xp.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="lua.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="lua.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

plugins/lua/lua.def

@@ -1,3 +0,0 @@
-EXPORTS 
-hexchat_plugin_init 
-hexchat_plugin_deinit 

plugins/lua/lua.vcxproj

@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{646B4316-C8B8-4DB6-B6AE-E586929E5729}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>lua</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(LuaOutput)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(LuaOutput)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>"$(LuaLib).lib";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LUA_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>"$(LuaLib).lib";%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Link>
-      <AdditionalDependencies>"$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Link>
-      <AdditionalDependencies>"$(LuaLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);snprintf=g_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>lua.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;$(OwnFlags);snprintf=g_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <ModuleDefinitionFile>lua.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="lua.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="lua.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/lua/lua.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="lua.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="lua.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

plugins/mpcinfo/functions.c

@@ -11,7 +11,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 /*

plugins/mpcinfo/mp3Info.c

@@ -11,7 +11,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 //#include <stdio.h>

plugins/mpcinfo/mpcInfo.c

@@ -11,7 +11,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 //static int DEBUG=0;
@@ -46,7 +46,7 @@ static int mpc_tell(char *word[], char *word_eol[], void *userdata){
        char *tTitle, *zero, *oggLine, *line;
 	   struct tagInfo info;
 	   HWND hwnd = FindWindow("MediaPlayerClassicW",NULL);
-       if (hwnd==0) {hexchat_command(ph, randomLine(notRunTheme));return HEXCHAT_EAT_ALL;}
+       if (hwnd==0) {hexchat_print(ph, randomLine(notRunTheme));return HEXCHAT_EAT_ALL;}
        
        tTitle=(char*)malloc(sizeof(char)*1024);
        GetWindowText(hwnd, tTitle, 1024);
@@ -131,11 +131,11 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle, char **plugin_name, char
 	hexchat_hook_command(ph, "mpc", HEXCHAT_PRI_NORM, mpc_tell,"no help text", 0);
 	hexchat_hook_command(ph, "mpc_themes", HEXCHAT_PRI_NORM, print_themes,"no help text", 0);
 	hexchat_hook_command(ph, "mpc_reloadthemes", HEXCHAT_PRI_NORM, mpc_themeReload,"no help text", 0);
-	hexchat_command (ph, "MENU -ietc\\music.png ADD \"Window/Display Current Song (MPC)\" \"MPC\"");
+	hexchat_command (ph, "MENU -ishare\\music.png ADD \"Window/Display Current Song (MPC)\" \"MPC\"");
 
 	themeInit();
 	loadThemes();
-	hexchat_printf(ph, "%s %s plugin loaded\n",*plugin_name, VERSION);
+	hexchat_printf(ph, "%s plugin loaded\n", *plugin_name);
 
 	return 1;
 }

plugins/mpcinfo/mpcinfo-xp.vcxproj

@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B0E36D93-CA2A-49FE-9EB9-9C96C6016EEC}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>mpcinfo</RootNamespace>
-    <ProjectName>mpcinfo</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcmpcinfo</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>hcmpcinfo</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>mpcinfo.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <ModuleDefinitionFile>mpcinfo.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="mpcinfo.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="mpcInfo.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/mpcinfo/mpcinfo-xp.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="mpcinfo.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="mpcInfo.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

plugins/mpcinfo/mpcinfo.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -56,7 +59,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -75,7 +77,6 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

plugins/mpcinfo/oggInfo.c

@@ -11,7 +11,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 static int getOggInt(char *buff, int beg, int bytes){

plugins/mpcinfo/theme.c

@@ -11,7 +11,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <time.h>
@@ -120,7 +120,7 @@ void loadThemes(){
 		fclose(f);
 		hexchat_print(ph, "theme loaded successfull\n");
 	}
-	if (notRunTheme.size==0) notRunTheme=themeAdd(notRunTheme,"say Media Player Classic not running");
+	if (notRunTheme.size==0) notRunTheme=themeAdd(notRunTheme,"Media Player Classic not running");
 	if (titleTheme.size==0) titleTheme=themeAdd(titleTheme,"say Playing %title in Media Player Classic");
 	if (mp3Theme.size==0) mp3Theme=themeAdd(mp3Theme,"me listens to %art with %tit from %alb [%gen|%br kbps|%frq kHz|%mode] in Media Player Classic ");
 	if (oggTheme.size==0) oggTheme=themeAdd(oggTheme,"me listens to %art with %tit from %alb [%gen|%br kbps|%frq kHz|%chan channels] in Media Player Classic ");

plugins/perl/Makefile.am

@@ -2,7 +2,7 @@
 EXTRA_DIST=alt_completion.pl generate_header lib/Xchat.pm lib/Xchat/Embed.pm lib/Xchat/List/Network.pm \
 	lib/Xchat/List/Network/Entry.pm lib/Xchat/List/Network/AutoJoin.pm lib/IRC.pm
 
-libdir = $(hexchatlibdir)/plugins
+libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = perl.la
 perl_la_SOURCES = perl.c

plugins/perl/lib/Xchat/List/Network.pm

@@ -6,7 +6,7 @@ my $last_modified;
 my @servers;
 
 sub get {
-	my $server_file = Xchat::get_info( "configdir" ) . "/servlist_.conf";
+	my $server_file = Xchat::get_info( "configdir" ) . "/servlist.conf";
 
 	# recreate the list only if the server list file has changed
 	if( -f $server_file && 

plugins/perl/lib/Xchat/List/Network/AutoJoin.pm

@@ -10,28 +10,26 @@ use overload
 
 sub new {
 	my $class = shift;
-	my $line = shift;
 
 	my @autojoins;
 
-	if ( $line ) {
-		my ( $channels, $keys ) = split / /, $line, 2;
-		my @channels = split /,/, $channels;
-		my @keys     = split /,/, ($keys || '');
-
-		for my $channel ( @channels ) {
-			my $key = shift @keys;
-			$key = '' unless defined $key;
-
-			push @autojoins, {
-				channel => $channel,
-				key     => $key,
-				};
-		}
-	}
 	return bless \@autojoins, $class;
 }
 
+sub add {
+	my $self = shift;
+
+	my $line = shift;
+
+	my ( $channel, $key ) = split /,/, $line, 2;
+	$key = $key || '';
+
+	push @$self, {
+		channel => $channel,
+		key     => $key,
+		};
+}
+
 sub channels {
 	my $self = shift;
 

plugins/perl/lib/Xchat/List/Network/Entry.pm

@@ -39,6 +39,8 @@ sub parse {
 	my @fields = split /\n/, $data;
 	chomp @fields;
 
+	$entry->{ autojoins } = Xchat::List::Network::AutoJoin->new();
+
 	for my $field ( @fields ) {
 	SWITCH: for ( $field ) {
 			/^($letter_key_re)=(.*)/ && do {
@@ -47,8 +49,7 @@ sub parse {
 			};
 
 			/^J.(.*)/ && do {
-				$entry->{ autojoins } =
+				$entry->{ autojoins }->add( $1 );
-					Xchat::List::Network::AutoJoin->new( $1 );
 			};
 
 			/^F.(.*)/ && do {

plugins/perl/perl-512-xp.vcxproj

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{987E9374-98A1-44BA-946F-D3472D7A7055}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>perl512</RootNamespace>
-    <ProjectName>perl-512</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl512Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl512Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(Perl512Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl512Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl512Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl512Path)\perl\bin\$(Perl512Lib).dll"
-move $(Perl512Lib).def "$(IntDir)"
-lib /nologo /machine:x86 "/def:$(IntDir)$(Perl512Lib).def" "/out:$(OutDir)\$(Perl512Lib).lib"
-"$(Perl512Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(Perl512Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl512Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl512Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl512Path)\perl\bin\$(Perl512Lib).dll"
-move $(Perl512Lib).def "$(IntDir)"
-lib /nologo /machine:x64 "/def:$(IntDir)$(Perl512Lib).def" "/out:$(OutDir)\$(Perl512Lib).lib"
-"$(Perl512Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/perl/perl-512-xp.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

plugins/perl/perl-512.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

plugins/perl/perl-514-xp.vcxproj

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>perl514</RootNamespace>
-    <ProjectName>perl-514</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl514Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl514Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl514Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl514Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl514Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl514Path)\perl\bin\$(Perl514Lib).dll"
-move $(Perl514Lib).def "$(IntDir)"
-lib /nologo /machine:x86 "/def:$(IntDir)$(Perl514Lib).def" "/out:$(OutDir)\$(Perl514Lib).lib"
-"$(Perl514Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl514Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl514Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl514Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl514Path)\perl\bin\$(Perl514Lib).dll"
-move $(Perl514Lib).def "$(IntDir)"
-lib /nologo /machine:x64 "/def:$(IntDir)$(Perl514Lib).def" "/out:$(OutDir)\$(Perl514Lib).lib"
-"$(Perl514Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/perl/perl-514-xp.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

plugins/perl/perl-514.vcxproj

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C4C9FA6F-F990-4C7B-85F6-CD8F4F5728F0}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>perl514</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl514Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl514Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl514Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl514Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl514Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl514Path)\perl\bin\$(Perl514Lib).dll"
-move $(Perl514Lib).def "$(IntDir)"
-lib /nologo /machine:x86 "/def:$(IntDir)$(Perl514Lib).def" "/out:$(OutDir)\$(Perl514Lib).lib"
-"$(Perl514Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL514_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl514Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl514Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl514Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl514Path)\perl\bin\$(Perl514Lib).dll"
-move $(Perl514Lib).def "$(IntDir)"
-lib /nologo /machine:x64 "/def:$(IntDir)$(Perl514Lib).def" "/out:$(OutDir)\$(Perl514Lib).lib"
-"$(Perl514Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/perl/perl-514.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

plugins/perl/perl-516-xp.vcxproj

@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{58654438-F674-42F7-88FA-73EF90AD80B1}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>perl516</RootNamespace>
-    <ProjectName>perl-516</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>WDK7</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat-xp.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl516Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl516Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl516Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl516Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\perl\bin\$(Perl516Lib).dll"
-move $(Perl516Lib).def "$(IntDir)"
-lib /nologo /machine:x86 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib"
-"$(Perl516Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl516Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl516Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\perl\bin\$(Perl516Lib).dll"
-move $(Perl516Lib).def "$(IntDir)"
-lib /nologo /machine:x64 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib"
-"$(Perl516Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="perl.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/perl/perl-516.vcxproj

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{58654438-F674-42F7-88FA-73EF90AD80B1}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>perl516</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\win32\hexchat.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl516Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl516Output)</TargetName>
-    <OutDir>$(HexChatBin)</OutDir>
-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl516Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl516Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\perl\bin\$(Perl516Lib).dll"
-move $(Perl516Lib).def "$(IntDir)"
-lib /nologo /machine:x86 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib"
-"$(Perl516Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL516_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Perl516Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl516Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl516Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-    </Link>
-    <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl516Path)\perl\bin\$(Perl516Lib).dll"
-move $(Perl516Lib).def "$(IntDir)"
-lib /nologo /machine:x64 "/def:$(IntDir)$(Perl516Lib).def" "/out:$(OutDir)\$(Perl516Lib).lib"
-"$(Perl516Path)\perl\bin\perl.exe" generate_header
-move irc.pm.h "$(IntDir)"
-move xchat.pm.h "$(IntDir)"</Command>
-    </PreBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="perl.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

plugins/perl/perl-516.vcxproj.filters

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="perl.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="perl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

plugins/perl/perl.c

@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdlib.h>
@@ -296,7 +296,7 @@ list_item_to_sv ( hexchat_list *list, const char *const *fields )
 		default:
 			field_value = &PL_sv_undef;
 		}
-		hv_store (hash, field_name, name_len, field_value, 0);
+		(void)hv_store (hash, field_name, name_len, field_value, 0);
 		field_index++;
 	}
 	return sv_2mortal (newRV_noinc ((SV *) hash));
@@ -1042,7 +1042,7 @@ XS (XS_Xchat_hook_fd)
 
 	dXSARGS;
 
-	if (items != 4) {
+	if (items != 5) {
 		hexchat_print (ph,
 						 "Usage: Xchat::Internal::hook_fd(fd, callback, flags, userdata)");
 	} else {
@@ -1420,20 +1420,19 @@ perl_load_file (char *filename)
 				if (lib) {
 					FreeLibrary (lib);
 					lib = NULL;
-					thread_mbox ("Cannot open " PERL_DLL "\n\n"
+					thread_mbox ("Cannot open " PERL_DLL "!\n\n"
-									 "You must have either ActivePerl or Straberry Perl"
+									 "You must have a Visual C++ build of Perl "
-									 PERL_REQUIRED_VERSION
+									 PERL_REQUIRED_VERSION " installed in order to\n"
-									 " installed in order to\n"
+									 "run Perl scripts. A reboot may be required.\n\n"
-									 "run perl scripts.\n\n"
+									 "http://hexchat.org/downloads.html\n\n"
 									 "I have found Perl 5.6, but that is too old.");
 				} else {
-					thread_mbox ("Cannot open " PERL_DLL "\n\n"
+					thread_mbox ("Cannot open " PERL_DLL "!\n\n"
-									 "You must have either ActivePerl or Strawberry Perl "
+									 "You must have a Visual C++ build of Perl "
 									 PERL_REQUIRED_VERSION " installed in order to\n"
-									 "run perl scripts.\n\n"
+									 "run Perl scripts. A reboot may be required.\n\n"
-									 "http://www.activestate.com/ActivePerl/\n"
+									 "http://hexchat.org/downloads.html\n\n"
-									 "http://strawberryperl.com/\n"
+									 "Make sure Perl's bin directory is in your PATH.");
-									 "Make sure perl's bin directory is in your PATH.");
 				}
 			}
 			/* failure */
@@ -1521,7 +1520,7 @@ perl_command_unload (char *word[], char *word_eol[], void *userdata)
 }
 
 static int
-perl_command_reload (char *word[], char *word_eol[], void *userdata)
+perl_command_reload (char *word[], char *word_eol[], void *eat)
 {
 	char *file = get_filename (word, word_eol);
 	
@@ -1530,7 +1529,10 @@ perl_command_reload (char *word[], char *word_eol[], void *userdata)
 		return HEXCHAT_EAT_HEXCHAT;
 	}
 	
-	return HEXCHAT_EAT_HEXCHAT;
+	if (eat)
+		return HEXCHAT_EAT_HEXCHAT;
+	else
+		return HEXCHAT_EAT_NONE;
 }
 
 void
@@ -1571,7 +1573,7 @@ hexchat_plugin_init (hexchat_plugin * plugin_handle, char **plugin_name,
 	hexchat_hook_command (ph, "reload", HEXCHAT_PRI_NORM, perl_command_reload, 0,
 							  0);
 	hexchat_hook_command (ph, "pl_reload", HEXCHAT_PRI_NORM, perl_command_reload, 0,
-							  0);
+							  (int*)1);
 	hexchat_hook_command (ph, "unloadall", HEXCHAT_PRI_NORM,
 							  perl_command_unloadall, 0, 0);
 	hexchat_hook_command (ph, "reloadall", HEXCHAT_PRI_NORM,

plugins/perl/perl.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -11,9 +14,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{987E9374-98A1-44BA-946F-D3472D7A7055}</ProjectGuid>
+    <ProjectGuid>{D90BC3E3-1341-4849-9354-5F40489D39D1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>perl512</RootNamespace>
+    <RootNamespace>perl518</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -42,13 +45,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl512Output)</TargetName>
+    <TargetName>$(PerlOutput)</TargetName>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(Perl512Output)</TargetName>
+    <TargetName>$(PerlOutput)</TargetName>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
   </PropertyGroup>
@@ -56,12 +59,11 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(Perl512Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -69,15 +71,15 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl512Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(PerlLib).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl512Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>$(PerlLib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl512Path)\perl\bin\$(Perl512Lib).dll"
+      <Command>"$(GendefPath)\gendef" "$(PerlPath)\bin\$(PerlLib).dll"
-move $(Perl512Lib).def "$(IntDir)"
+move $(PerlLib).def "$(IntDir)"
-lib /nologo /machine:x86 "/def:$(IntDir)$(Perl512Lib).def" "/out:$(OutDir)\$(Perl512Lib).lib"
+lib /nologo /machine:x86 "/def:$(IntDir)$(PerlLib).def" "/out:$(OutDir)\$(PerlLib).lib"
-"$(Perl512Path)\perl\bin\perl.exe" generate_header
+"$(PerlPath)\bin\perl.exe" generate_header
 move irc.pm.h "$(IntDir)"
 move xchat.pm.h "$(IntDir)"</Command>
     </PreBuildEvent>
@@ -86,12 +88,11 @@ move xchat.pm.h "$(IntDir)"</Command>
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL512_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL518_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>$(Perl512Path)\perl\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -99,24 +100,24 @@ move xchat.pm.h "$(IntDir)"</Command>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(Perl512Lib).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(PerlLib).lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
-      <DelayLoadDLLs>$(Perl512Lib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>$(PerlLib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
     <PreBuildEvent>
-      <Command>"$(GendefPath)\gendef" "$(Perl512Path)\perl\bin\$(Perl512Lib).dll"
+      <Command>"$(GendefPath)\gendef" "$(PerlPath)\bin\$(PerlLib).dll"
-move $(Perl512Lib).def "$(IntDir)"
+move $(PerlLib).def "$(IntDir)"
-lib /nologo /machine:x64 "/def:$(IntDir)$(Perl512Lib).def" "/out:$(OutDir)\$(Perl512Lib).lib"
+lib /nologo /machine:x64 "/def:$(IntDir)$(PerlLib).def" "/out:$(OutDir)\$(PerlLib).lib"
-"$(Perl512Path)\perl\bin\perl.exe" generate_header
+"$(PerlPath)\bin\perl.exe" generate_header
 move irc.pm.h "$(IntDir)"
 move xchat.pm.h "$(IntDir)"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="perl.c" />
+    <None Include="perl.def" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="perl.def" />
+    <ClCompile Include="perl.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

plugins/python/Makefile.am

@@ -1,6 +1,6 @@
 EXTRA_DIST = 
 
-libdir = $(hexchatlibdir)/plugins
+libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c

plugins/python/python2.vcxproj

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Configuration">
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
@@ -13,7 +16,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{19C52A0A-A790-409E-A28A-9745FF990F5C}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>python</RootNamespace>
+    <RootNamespace>python2</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -42,13 +45,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(PythonOutput)</TargetName>
+    <TargetName>$(Python2Output)</TargetName>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <TargetName>$(PythonOutput)</TargetName>
+    <TargetName>$(Python2Output)</TargetName>
     <OutDir>$(HexChatBin)</OutDir>
     <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
   </PropertyGroup>
@@ -56,11 +59,10 @@
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Glib);$(PythonPath)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -69,19 +71,18 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <ModuleDefinitionFile>python.def</ModuleDefinitionFile>
-      <AdditionalDependencies>"$(PythonLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>"$(Python2Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);$(PythonPath)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);$(Python2Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PYTHON_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(Glib);$(PythonPath)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(Glib);$(Python2Path)\include;..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -90,8 +91,8 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <ModuleDefinitionFile>python.def</ModuleDefinitionFile>
-      <AdditionalDependencies>"$(PythonLib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>"$(Python2Lib).lib";$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);$(PythonPath)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;$(OutDir);$(Python2Path)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>