Initial work using Gio for server connections

Previously a child process was used on Unix and
a thread on Windows and they each communicated
with the main thread via pipes which includeded
platform specific code and upon closure on Windows
could result in crash.

Now a thread is used on all platforms with safer
ways of cancellation.

Little behavior should have been changed though timing
of print events are now after connecting finished which
might be a minor issue.

.gitignore

@@ -69,6 +69,7 @@ stamp-h1
 *.po~
 *.pot
 *.patch
+src/**/*.plist
 # Win32 generated files
 plugins/wmpa/wmpa_h.h
 plugins/wmpa/wmpa_i.c
@@ -85,6 +86,7 @@ resource.h
 *.sdf
 *.suo
 *.user
+*.exe
 #OSX
 osx/HexChat.app
 osx/.HexChat.app

.travis.yml

@@ -1,14 +1,17 @@
 language: c
-compiler: gcc
+compiler: clang
 before_script:
+    - sudo apt-get update
     - sudo apt-get build-dep -qq xchat
     - sudo apt-get install -qq libnotify-dev libproxy-dev libpci-dev libcanberra-dev monodevelop gnome-common
 script: 
     - ./autogen.sh
-    - ./configure --enable-textfe --with-theme-manager
-    - make V=1
+    - ./configure --enable-textfe --with-theme-manager --enable-static-analysis
+    - make V=1 -j$(nproc)
 notifications:
     irc:
         channels: "chat.freenode.net#hexchat-devel"
-        template: "Build #%{build_number} (%{commit}) by %{author}: %{message}"
+        template: "Build %{build_url} (%{commit} in %{branch}) by %{author}: %{message}"
         on_success: change
+matrix:
+     fast_finish: true

configure.ac

@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([HexChat],[2.10.2])
+AC_INIT([HexChat],[2.11.0])
 
 AC_PREREQ([2.60])
 AC_COPYRIGHT([Copyright (C) 1998-2010 Peter Zelezny])
@@ -38,14 +38,10 @@ AH_VERBATIM([OLD_PERL],[#undef OLD_PERL])
 AH_VERBATIM([PREFIX],[#undef PREFIX])
 AH_VERBATIM([HEXCHATLIBDIR],[#undef HEXCHATLIBDIR])
 AH_VERBATIM([HEXCHATSHAREDIR],[#undef HEXCHATSHAREDIR])
-AH_VERBATIM([SOCKS],[#undef SOCKS])
-AH_VERBATIM([USE_MSPROXY],[#undef USE_MSPROXY])
-AH_VERBATIM([USE_LIBPROXY],[#undef USE_LIBPROXY])
 AH_VERBATIM([HAVE_ISO_CODES],[#undef HAVE_ISO_CODES])
 AH_VERBATIM([HAVE_GTK_MAC],[#undef HAVE_GTK_MAC])
 AH_VERBATIM([USE_LIBNOTIFY],[#undef USE_LIBNOTIFY])
 AH_VERBATIM([USE_LIBCANBERRA],[#undef USE_LIBCANBERRA])
-AH_VERBATIM([USE_IPV6],[#undef USE_IPV6])
 AH_VERBATIM([USE_OPENSSL],[#undef USE_OPENSSL])
 AH_VERBATIM([USE_PLUGIN],[#undef USE_PLUGIN])
 AH_VERBATIM([USE_SIGACTION],[#undef USE_SIGACTION])
@@ -74,18 +70,17 @@ else
 	fi
 fi
 
+platform_win32=no
+case $host_os in
+	*mingw*|*cygwin*|*msys*)
+		platform_win32=yes;;
+	*);;
+esac
+
 dnl *********************************************************************
 dnl ** configure switches ***********************************************
 dnl *********************************************************************
 
-AC_ARG_ENABLE(socks,
-	[AS_HELP_STRING([--enable-socks],[link with SOCKS5 library (default: no)])],
-        socks=$enableval, socks=no)
-
-AC_ARG_ENABLE(ipv6,
-	[AS_HELP_STRING([--disable-ipv6],[disable IPv6])],
-        ipv6=$enableval, ipv6=yes)
-
 AC_ARG_ENABLE(openssl,
 	[AS_HELP_STRING([--enable-openssl[=PATH]],[enable use of openSSL])],
         openssl=$enableval, openssl=yes)
@@ -143,14 +138,6 @@ AC_ARG_ENABLE(libcanberra,
 	[AS_HELP_STRING([--disable-libcanberra],[disable libcanberra support])],
 		libcanberra=$enableval, libcanberra=yes)
 
-AC_ARG_ENABLE(ntlm,
-	[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(isocodes,
 	[AS_HELP_STRING([--disable-isocodes],[disable iso-codes with spell-check])],
         isocodes=$enableval, isocodes=yes)
@@ -159,6 +146,10 @@ AC_ARG_ENABLE(minimal-flags,
 	[AS_HELP_STRING([--enable-minimal-flags],[only add those CFLAGS that are really needed or not intrusive (default: no)])],
         minimalflags=$enableval, minimalflags=no)
 
+AC_ARG_ENABLE(static-analysis,
+	[AS_HELP_STRING([--enable-static-analysis],[if using clang run static analysis during build (default: no)])],
+        analyze=$enableval, analyze=no)
+
 AC_ARG_WITH(theme-manager,
 	[AS_HELP_STRING([--with-theme-manager],[compile theme manager (needs monodevelop, default: off)])],
 		theme_manager=$withval, theme_manager=no)
@@ -179,17 +170,11 @@ dnl *********************************************************************
 dnl ** GLIB *************************************************************
 dnl *********************************************************************
 
-AM_PATH_GLIB_2_0(2.28.0, glib=yes, glib=no)
-if test "$glib" = no; then
-	AC_MSG_ERROR(Cannot find GLib!)
-fi
-
-PKG_CHECK_MODULES([GOBJECT], [gobject-2.0], [], [AC_MSG_ERROR(Cannot find gobject-2.0!)])
-PKG_CHECK_MODULES([GIO], [gio-2.0], [], [AC_MSG_ERROR(Cannot find gio-2.0!)])
-PKG_CHECK_MODULES([GMODULE], [gmodule-2.0], [], [AC_MSG_ERROR(Cannot find gmodule-2.0!)])
-
-COMMON_CFLAGS="$GLIB_CFLAGS $GIO_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-COMMON_LIBS="$GLIB_LIBS $GIO_LIBS $GOBJECT_LIBS $GMODULE_LIBS"
+AM_PATH_GLIB_2_0([2.36.0], [], [AC_MSG_ERROR([Glib not found!])], [gmodule gobject gio])
+COMMON_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
+COMMON_LIBS="$GLIB_LIBS"
+AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], [Dont warn using older APIs])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], [Prevents using newer APIs])
 
 dnl *********************************************************************
 dnl ** GTK **************************************************************
@@ -216,7 +201,7 @@ dnl *********************************************************************
 
 _gdk_tgt=`$PKG_CONFIG --variable=target gdk-2.0`
 if test "x$_gdk_tgt" = xquartz; then
-		PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration, [
+		PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk2, [
 			GUI_LIBS="$GUI_LIBS $GTK_MAC_LIBS"
 			GUI_CFLAGS="$GUI_CFLAGS $GTK_MAC_CFLAGS"
 			AC_DEFINE(HAVE_GTK_MAC)
@@ -354,16 +339,13 @@ AC_CHECK_FUNC(select, ,
 						AC_MSG_WARN(i can not find select.  you might need to help me)))))))
 AC_CHECK_LIB(socket, select)
 
-if test "$ipv6" = yes; then
-	AC_CHECK_FUNCS(getaddrinfo, have_getaddrinfo=yes)
-	AC_MSG_CHECKING(whether to enable IPv6 support)
-	if test "$have_getaddrinfo" = yes; then
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(USE_IPV6)
-	else
-		ipv6=no
-		AC_MSG_RESULT(no)
-	fi
+AC_CHECK_FUNCS(getaddrinfo, have_getaddrinfo=yes)
+AC_MSG_CHECKING(whether IPv6 is supported)
+if test "$have_getaddrinfo" = yes; then
+	AC_MSG_RESULT(yes)
+else
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR(ipv6 support not found!)
 fi
 
 dnl *********************************************************************
@@ -372,17 +354,14 @@ dnl *********************************************************************
 
 retry=no
 if test "$openssl" != no; then
-	AC_MSG_CHECKING(for openssl through pkg-config)
-	if $PKG_CONFIG openssl --exists; then
-		CPPFLAGS="$CPPFLAGS `$PKG_CONFIG openssl --cflags`"
-		LIBS="$LIBS `$PKG_CONFIG openssl --libs`"
+	PKG_CHECK_MODULES(OPENSSL, [openssl], [
 		AC_DEFINE(USE_OPENSSL)
-		AC_MSG_RESULT(yes)
 		openssl=yes
-	else
-		AC_MSG_RESULT(no)
+		COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
+		COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS"
+	], [
 		retry=yes
-	fi
+	])
 fi
 
 if test "$retry" = "yes"; then
@@ -391,50 +370,29 @@ if test "$retry" = "yes"; then
 		openssl_path=$openssl
 	fi
 	openssl=no
-	SAVED_LIBS=$LIBS
-	LIBS="$LIBS -lcrypto"
+	OPENSSL_LIBS="-lcrypto"
 	if test -n "$openssl_path"; then
-		LIBS="-L$openssl_path/lib $LIBS"
+		OPENSSL_LIBS="-L$openssl_path/lib $OPENSSL_LIBS"
 	fi
-	AC_CHECK_LIB(ssl, SSL_new, have_openssl=yes)
-	LIBS=$SAVED_LIBS
-	if test "$have_openssl" = yes; then
-		SAVED_CPPFLAGS=$CPPFLAGS
+	SAVED_LIBS=$LIBS
+	LIBS="$LIBS $OPENSSL_LIBS"
+	AC_CHECK_LIB(ssl, SSL_new, [
 		if test -n "$openssl_path"; then
-			CPPFLAGS="-I$openssl_path/include $CPPFLAGS"
+			OPENSSL_CFLAGS="-I$openssl_path/include"
 		fi
-		AC_CHECK_HEADERS(openssl/ssl.h, have_openssl_h=yes)
-		if test "$have_openssl_h" = yes; then
+		SAVED_CFLAGS=$CFLAGS
+		CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+		AC_CHECK_HEADERS(openssl/ssl.h, [
 			openssl=yes
 			AC_DEFINE(USE_OPENSSL)
-			LIBS="$LIBS -lssl -lcrypto"
-			if test -n "$openssl_path"; then
-				LIBS="-L$openssl_path/lib $LIBS"
-			fi
-		else
-			CPPFLAGS=$SAVED_CPPFLAGS
-		fi
-	fi
-fi
+			OPENSSL_LIBS="$OPENSSL_LIBS -lssl"
 
-dnl *********************************************************************
-dnl ** LIBPROXY *********************************************************
-dnl *********************************************************************
-
-if test "x$libproxy" = "xyes" -o "x$libproxy" = "xauto" ; then
-	PKG_CHECK_MODULES([LIBPROXY], [libproxy-1.0], [
-		COMMON_LIBS="$COMMON_LIBS $LIBPROXY_LIBS"
-		COMMON_CFLAGS="$COMMON_CFLAGS $LIBPROXY_CFLAGS"
-		AC_DEFINE(USE_LIBPROXY)
-		libproxy=yes
-	], [
-		if test "x$libproxy" = "xyes" ; then
-			AC_MSG_ERROR(Cannot find libproxy!)
-		fi
-		libproxy=no
+			COMMON_LIBS="$COMMON_LIBS $OPENSSL_LIBS"
+			COMMON_CFLAGS="$COMMON_CFLAGS $OPENSSL_CFLAGS"
+		])
+		CFLAGS=$SAVED_CFLAGS
 	])
-else
-	libproxy=no
+	LIBS=$SAVED_LIBS
 fi
 
 dnl *********************************************************************
@@ -443,6 +401,10 @@ dnl *********************************************************************
 
 if test "$plugin" = yes; then
 	AC_DEFINE(USE_PLUGIN)
+	PLUGIN_LDFLAGS="-avoid-version"
+	if test "$platform_win32" = yes; then
+		PLUGIN_LDFLAGS="$PLUGIN_LDFLAGS -no-undefined"
+	fi
 fi
 
 dnl *********************************************************************
@@ -453,14 +415,8 @@ if test "$checksum" != "no"; then
 	checksum=no
 	AC_MSG_CHECKING(for plugin interface used by Checksum)
 	if test "$plugin" = yes; then
+		checksum=yes
 		AC_MSG_RESULT([yes])
-		AC_MSG_CHECKING(for OpenSSL used by Checksum)
-		if test "$openssl" = yes; then
-			checksum=yes
-			AC_MSG_RESULT([yes])
-		else
-			AC_MSG_RESULT([OpenSSL cannot be found, use the --enable-openssl option])
-		fi
 	else
 		AC_MSG_RESULT([plugins are disabled, use the --enable-plugin option])
 	fi
@@ -526,8 +482,7 @@ if test "x$dbus" = "xyes" ; then
 		dbus=no
 	])
 	AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool, no)
-	AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no)
-	if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$GLIB_GENMARSHAL" = "xno" || test "x$dbus" = "xno" ; then
+	if test "x$DBUS_BINDING_TOOL" = "xno" || test "x$dbus" = "xno" ; then
 		dbus="no"
 	else
 		COMMON_LIBS="$COMMON_LIBS $DBUS_LIBS"
@@ -587,6 +542,17 @@ if test "x$isocodes" = "xyes" ; then
     ])
 fi
 
+dnl *********************************************************************
+dnl ** Static Analysis **************************************************
+dnl *********************************************************************
+
+if test "x$analyze" = "xyes"; then
+	if test "$CC" != "clang"; then
+		AC_MSG_WARN(CC is not clang for static analysis)
+		analyze=no
+	fi
+fi
+
 dnl *********************************************************************
 dnl ** CONDITIONALS *****************************************************
 dnl *********************************************************************
@@ -594,7 +560,6 @@ dnl *********************************************************************
 AM_CONDITIONAL(USE_OPENSSL, test "x$openssl" = "xyes")
 AM_CONDITIONAL(USE_LIBNOTIFY, test "x$libnotify" = "xyes")
 AM_CONDITIONAL(USE_LIBCANBERRA, test "x$libcanberra" = "xyes")
-AM_CONDITIONAL(USE_MSPROXY, test "x$ntlm" = "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")
@@ -604,41 +569,11 @@ AM_CONDITIONAL(DO_CHECKSUM, test "x$checksum" = "xyes")
 AM_CONDITIONAL(DO_DOAT, test "x$doat" = "xyes")
 AM_CONDITIONAL(DO_FISHLIM, test "x$fishlim" = "xyes")
 AM_CONDITIONAL(DO_SYSINFO, test "x$sysinfo" = "xyes")
+AM_CONDITIONAL(DO_STATIC_ANALYSIS, test "x$analyze" = "xyes")
 AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
 AM_CONDITIONAL(HAVE_ISO_CODES, test "x$isocodes" = "xyes")
 AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno")
 
-dnl *********************************************************************
-dnl ** SOCKS5 ***********************************************************
-dnl *********************************************************************
-
-if test "$socks" = yes; then
-	socks=no
-	AC_CHECK_LIB(socks5, SOCKSconnect, have_socks=yes)
-	if test "$have_socks" = yes; then
-		AC_CHECK_HEADERS(socks.h, have_socks_h=yes)
-		if test "$have_socks_h" = yes; then
-			socks=yes
-			AC_DEFINE(SOCKS)
-			LIBS="$LIBS -lsocks5"
-		fi
-	fi
-fi
-
-dnl *********************************************************************
-dnl ** MS PROXY *********************************************************
-dnl *********************************************************************
-
-have_ntlm="no"
-if test "x$ntlm" = "xyes" ; then
-	have_ntlm="no"
-	AC_CHECK_LIB(ntlm, ntlm_smb_encrypt, have_ntlm=yes)
-	if test "$have_ntlm" = yes; then
-		LIBS="$LIBS -lntlm"
-		AC_DEFINE(USE_MSPROXY)
-	fi
-fi
-
 dnl *********************************************************************
 dnl ** GCC FLAGS ********************************************************
 dnl *********************************************************************
@@ -745,8 +680,7 @@ AC_TRY_COMPILE(
 	],
 	AC_MSG_RESULT(no))
 
-dnl if we don\'t have this, use g_snprintf instead
-AC_CHECK_FUNCS(snprintf vsnprintf memrchr strtoull)
+AC_CHECK_FUNCS(memrchr)
 
 AC_CHECK_FUNC(gethostbyname, ,
 	AC_CHECK_LIB(resolv, gethostbyname, ,
@@ -795,12 +729,12 @@ AC_SUBST(PY_CFLAGS)
 AC_SUBST(PY_LIBS)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
+AC_SUBST(OPENSSL_LIBS)
+AC_SUBST(OPENSSL_CFLAGS)
+AC_SUBST(PLUGIN_LDFLAGS)
 
 m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], AC_SUBST([pkgconfigdir], ${libdir}/pkgconfig))
 
-PLUGIN_INCLUDES='-I$(top_srcdir)/plugins'
-AC_SUBST(PLUGIN_INCLUDES)
-
 dnl for plugin.c and pixmaps.c
 test "x$prefix" = xNONE && prefix="$ac_default_prefix"
 test "x$exec_prefix" = xNONE && exec_prefix="$prefix"
@@ -858,10 +792,6 @@ echo D-Bus support ......... : $dbus
 echo libnotify support ..... : $libnotify
 echo libcanberra support ... : $libcanberra
 echo Plugin interface ...... : $plugin
-echo NLS/gettext ........... : $USE_NLS
-echo IPv6 support .......... : $ipv6
-echo MS Proxy NTLM \(ISA\) ... : $have_ntlm
-echo libproxy support ...... : $libproxy
 echo
 echo Perl .................. : $perl
 echo Python ................ : $python

m4/clang-analyze.am

@@ -0,0 +1,8 @@
+analysis_verbose = $(analysis_verbose_$(V))
+analysis_verbose_ = $(analysis_verbose_$(AM_DEFAULT_VERBOSITY))
+analysis_verbose_0 = @echo "  CCSA    " $@; $(COMPILE) --analyze $< -o $@;
+analysis_verbose_1 = $(COMPILE) --analyze $< -o $@;
+
+%.plist: %.c
+	$(analysis_verbose)
+

osx/hexchat.bundle

@@ -2,7 +2,8 @@
 <app-bundle>
 
   <meta>
-    <prefix name="default">${env:JHBUILD_PREFIX}</prefix>
+    <prefix name="default">/usr/local</prefix>
+    <prefix name="enchant">/usr/local/opt/enchant-applespell</prefix>
     <destination overwrite="yes">${project}</destination>
 
     <run-install-name-tool/>
@@ -21,25 +22,12 @@
   </binary>
 
   <binary>
-    ${prefix}/lib/libenchant.dylib
+    ${prefix:enchant}/lib/libenchant.dylib
   </binary>
   <binary>
-    ${prefix}/lib/enchant/libenchant_applespell.so
+    ${prefix:enchant}/lib/enchant/libenchant_applespell.so
   </binary>
 
-  <binary dest="${bundle}/Contents/MacOS">
-    ${prefix}/bin/python
-  </binary>
-  <binary>
-    ${prefix}/lib/libpython2.7.dylib
-  </binary>
-  <data>
-    ${prefix}/lib/python2.7/
-  </data>
-  <data>
-    ${prefix}/include/python2.7/pyconfig.h
-  </data>
-
   <binary>
     ${prefix}/lib/${gtkdir}/modules/*.so
   </binary>
@@ -59,7 +47,7 @@
     ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/
   </binary>
   <data>
-    ${prefix}/share/themes/Mac/
+    ${prefix}/share/themes/Mac/gtk-2.0-key/gtkrc
   </data>
 
   <translations name="gtk20">
@@ -77,7 +65,4 @@
     ${project}/hexchat.icns
   </data>
 
-  <!-- icon-theme icons="none">
-  </icon-theme -->
-
 </app-bundle>

osx/launcher.sh

@@ -36,10 +36,6 @@ export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders"
 export PANGO_LIBDIR="$bundle_lib"
 export PANGO_SYSCONFDIR="$bundle_etc"
 
-export PYTHON="$bundle_contents/MacOS/python"
-export PYTHONHOME="$bundle_res"
-export PYTHONPATH="$bundle_lib/python2.7:$bundle_lib/python2.7/site-packages"
-
 export OPENSSL_CONF="/System/Library/OpenSSL/openssl.cnf"
 
 export HEXCHAT_LIBDIR="$bundle_lib/hexchat/plugins"

osx/makebundle.sh

@@ -1,24 +1,9 @@
 #!/bin/sh
 
-if [ -z "$JHBUILD_PREFIX" ]; then
-	echo "You must run this within a jhbuild shell."
-	exit 1
-fi
-
-if [ ! -f $JHBUILD_PREFIX/bin/python ]; then
-	echo "You must install python with jhbuild."
-	exit 1
-fi
-
 rm -rf HexChat.app
 rm -f *.app.zip
 
-$JHBUILD_PREFIX/bin/python $HOME/.local/bin/gtk-mac-bundler hexchat.bundle
-
-# These take up a lot of space in the bundle
-echo "Cleaning up python files"
-find ./HexChat.app/Contents/Resources/lib/python2.7 -name "*.pyc" -delete
-find ./HexChat.app/Contents/Resources/lib/python2.7 -name "*.pyo" -delete
+python $HOME/.local/bin/gtk-mac-bundler hexchat.bundle
 
 echo "Compressing bundle"
 #hdiutil create -format UDBZ -srcdir HexChat.app -quiet HexChat-2.9.6.1-$(git rev-parse --short master).dmg

plugins/checksum/Makefile.am

@@ -2,6 +2,6 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = checksum.la
 checksum_la_SOURCES = checksum.c
-checksum_la_LDFLAGS = -avoid-version -module 
-checksum_la_LIBADD = 
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+checksum_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+checksum_la_LIBADD = $(GLIB_LIBS)
+checksum_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common

plugins/checksum/checksum.c

@@ -20,131 +20,40 @@
  * THE SOFTWARE.
  */
 
-#ifdef __APPLE__
-#define __AVAILABILITYMACROS__
-#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
-#endif
+#include "config.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <openssl/sha.h>
 #include <glib.h>
-
-#ifdef WIN32
-#ifndef snprintf
-#define snprintf _snprintf
-#endif
-#define stat _stat64
-#else
-/* for INT_MAX */
-#include <limits.h>
-#define __USE_LARGEFILE64
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-#endif
+#include <glib/gstdio.h>
+#include <gio/gio.h>
 
 #include "hexchat-plugin.h"
 
 #define BUFSIZE 32768
 #define DEFAULT_LIMIT 256									/* default size is 256 MiB */
+#define SHA256_DIGEST_LENGTH 32
+#define SHA256_BUFFER_LENGTH 65
 
 static hexchat_plugin *ph;									/* plugin handle */
 static char name[] = "Checksum";
 static char desc[] = "Calculate checksum for DCC file transfers";
 static char version[] = "3.1";
 
-/* Use of OpenSSL SHA256 interface: http://adamlamers.com/?p=5 */
 static void
-sha256_hash_string (unsigned char hash[SHA256_DIGEST_LENGTH], char outputBuffer[65])
+set_limit (char *size)
 {
-	int i;
-	for (i = 0; i < SHA256_DIGEST_LENGTH; i++)
+	int limit = atoi (size);
+
+	if (limit > 0 && limit < INT_MAX)
 	{
-		sprintf (outputBuffer + (i * 2), "%02x", hash[i]);
-	}
-	outputBuffer[64] = 0;
-}
-
-#if 0
-static void
-sha256 (char *string, char outputBuffer[65])
-{
-	int i;
-	unsigned char hash[SHA256_DIGEST_LENGTH];
-	SHA256_CTX sha256;
-
-	SHA256_Init (&sha256);
-	SHA256_Update (&sha256, string, strlen (string));
-	SHA256_Final (hash, &sha256);
-
-	for (i = 0; i < SHA256_DIGEST_LENGTH; i++)
-	{
-		sprintf (outputBuffer + (i * 2), "%02x", hash[i]);
-	}
-	outputBuffer[64] = 0;
-}
-#endif
-
-static int
-sha256_file (char *path, char outputBuffer[65])
-{
-	int bytesRead;
-	unsigned char *buffer;
-	unsigned char hash[SHA256_DIGEST_LENGTH];
-	SHA256_CTX sha256;
-
-	FILE *file = fopen (path, "rb");
-	if (!file)
-	{
-		return -534;
-	}
-
-	SHA256_Init (&sha256);
-	buffer = malloc (BUFSIZE);
-	bytesRead = 0;
-
-	if (!buffer)
-	{
-		fclose (file);
-		return ENOMEM;
-	}
-
-	while ((bytesRead = fread (buffer, 1, BUFSIZE, file)))
-	{
-		SHA256_Update (&sha256, buffer, bytesRead);
-	}
-
-	SHA256_Final (hash, &sha256);
-	sha256_hash_string (hash, outputBuffer);
-
-	fclose (file);
-	free (buffer);
-	return 0;
-}
-
-static void
-set_limit (char* size)
-{
-	int buffer = atoi (size);
-
-	if (buffer > 0 && buffer < INT_MAX)
-	{
-		if (hexchat_pluginpref_set_int (ph, "limit", buffer))
-		{
-			hexchat_printf (ph, "File size limit has successfully been set to: %d MiB\n", buffer);
-		}
+		if (hexchat_pluginpref_set_int (ph, "limit", limit))
+			hexchat_printf (ph, "Checksum: File size limit has successfully been set to: %d MiB\n", limit);
 		else
-		{
-			hexchat_printf (ph, "File access error while saving!\n");
-		}
+			hexchat_printf (ph, "Checksum: File access error while saving!\n");
 	}
 	else
 	{
-		hexchat_printf (ph, "Invalid input!\n");
+		hexchat_printf (ph, "Checksum: Invalid input!\n");
 	}
 }
 
@@ -153,89 +62,152 @@ get_limit ()
 {
 	int size = hexchat_pluginpref_get_int (ph, "limit");
 
-	if (size <= -1 || size >= INT_MAX)
-	{
+	if (size <= 0 || size >= INT_MAX)
 		return DEFAULT_LIMIT;
-	}
 	else
-	{
 		return size;
-	}
 }
 
-static void
-print_limit ()
+static gboolean
+check_limit (GFile *file)
 {
-	hexchat_printf (ph, "File size limit for checksums: %d MiB", get_limit ());
+	GFileInfo *file_info;
+	goffset file_size;
+
+	file_info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE,
+									NULL, NULL);
+
+	if (!file_info)
+		return FALSE;
+
+	file_size = g_file_info_get_size (file_info);
+	g_object_unref (file_info);
+
+	if (file_size > get_limit () * 1048576ll)
+		return FALSE;
+
+	return TRUE;
+}
+
+static gboolean
+sha256_from_stream (GFileInputStream *file_stream, char out_buf[])
+{
+	GChecksum *checksum;
+	gssize bytes_read;
+	guint8 digest[SHA256_DIGEST_LENGTH];
+	gsize digest_len = sizeof(digest);
+	guchar buffer[BUFSIZE];
+	gsize i;
+
+	checksum = g_checksum_new (G_CHECKSUM_SHA256);
+
+	while ((bytes_read = g_input_stream_read (G_INPUT_STREAM (file_stream), buffer, sizeof (buffer), NULL, NULL)))
+	{
+		if (bytes_read == -1)
+		{
+			g_checksum_free (checksum);
+			return FALSE;
+		}
+
+		g_checksum_update (checksum, buffer, bytes_read);
+	}
+
+	g_checksum_get_digest (checksum, digest, &digest_len);
+	g_checksum_free (checksum);
+
+	for (i = 0; i < SHA256_DIGEST_LENGTH; i++)
+	{
+		/* out_buf will be exactly SHA256_BUFFER_LENGTH including null */
+		g_sprintf (out_buf + (i * 2), "%02x", digest[i]);
+	}
+
+	return TRUE;
+}
+
+static gboolean
+sha256_from_file (char *filename, char out_buf[])
+{
+	GFileInputStream *file_stream;
+	char *filename_fs;
+	GFile *file;
+
+	filename_fs = g_filename_from_utf8 (filename, -1, NULL, NULL, NULL);
+	if (!filename_fs)
+	{
+		hexchat_printf (ph, "Checksum: Invalid filename (%s)\n", filename);
+		return FALSE;
+	}
+
+	file = g_file_new_for_path (filename_fs);
+	g_free (filename_fs);
+	if (!file)
+	{
+		hexchat_printf (ph, "Checksum: Failed to open %s\n", filename);
+		return FALSE;
+	}
+
+	if (!check_limit (file))
+	{
+		hexchat_printf (ph, "Checksum: %s is larger than size limit. You can increase it with /CHECKSUM SET.\n", filename);
+		g_object_unref (file);
+		return FALSE;
+	}
+
+	file_stream = g_file_read (file, NULL, NULL);
+	if (!file_stream)
+	{
+		hexchat_printf (ph, "Checksum: Failed to read file %s\n", filename);
+		g_object_unref (file);
+		return FALSE;
+	}
+
+	if (!sha256_from_stream (file_stream, out_buf))
+	{
+		hexchat_printf (ph, "Checksum: Failed to generate checksum for %s\n", filename);
+		g_object_unref (file_stream);
+		g_object_unref (file);
+		return FALSE;
+	}
+
+	g_object_unref (file_stream);
+	g_object_unref (file);
+	return TRUE;
 }
 
 static int
 dccrecv_cb (char *word[], void *userdata)
 {
-	int result;
-	struct stat buffer;									/* buffer for storing file info */
-	char sum[65];											/* buffer for checksum */
-	const char *file;
-	char *cfile;
+	const char *dcc_completed_dir;
+	char *filename, checksum[SHA256_BUFFER_LENGTH];
 
-	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);
-	}
+	/* Print in the privmsg tab of the sender */
+	hexchat_set_context (ph, hexchat_find_context (ph, NULL, word[3]));
+
+	if (hexchat_get_prefs (ph, "dcc_completed_dir", &dcc_completed_dir, NULL) == 1 && dcc_completed_dir[0] != '\0')
+		filename = g_build_filename (dcc_completed_dir, word[1], NULL);
 	else
+		filename = g_strdup (word[2]);
+
+	if (sha256_from_file (filename, checksum))
 	{
-		cfile = g_strdup(word[2]);
+		hexchat_printf (ph, "SHA-256 checksum for %s (local): %s\n", word[1], checksum);
 	}
 
-	result = stat (cfile, &buffer);
-	if (result == 0)										/* stat returns 0 on success */
-	{
-		if (buffer.st_size <= (unsigned long long) get_limit () * 1048576)
-		{
-			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);
-		}
-		else
-		{
-			hexchat_set_context (ph, hexchat_find_context (ph, NULL, word[3]));
-			hexchat_printf (ph, "SHA-256 checksum for %s (local):  (size limit reached, no checksum calculated, you can increase it with /CHECKSUM INC)\n", word[1]);
-		}
-	}
-	else
-	{
-		hexchat_printf (ph, "File access error!\n");
-	}
-
-	g_free (cfile);
+	g_free (filename);
 	return HEXCHAT_EAT_NONE;
 }
 
 static int
 dccoffer_cb (char *word[], void *userdata)
 {
-	int result;
-	struct stat buffer;									/* buffer for storing file info */
-	char sum[65];											/* buffer for checksum */
+	char checksum[SHA256_BUFFER_LENGTH];
 
-	result = stat (word[3], &buffer);
-	if (result == 0)										/* stat returns 0 on success */
+	/* Print in the privmsg tab of the receiver */
+	hexchat_set_context (ph, hexchat_find_context (ph, NULL, word[3]));
+
+	if (sha256_from_file (word[3], checksum))
 	{
-		if (buffer.st_size <= (unsigned long long) get_limit () * 1048576)
-		{
-			sha256_file (word[3], sum);						/* word[3] is the full filename */
-			hexchat_commandf (ph, "quote PRIVMSG %s :SHA-256 checksum for %s (remote): %s", word[2], word[1], sum);
-		}
-		else
-		{
-			hexchat_set_context (ph, hexchat_find_context (ph, NULL, word[3]));
-			hexchat_printf (ph, "quote PRIVMSG %s :SHA-256 checksum for %s (remote): (size limit reached, no checksum calculated)", word[2], word[1]);
-		}
-	}
-	else
-	{
-		hexchat_printf (ph, "File access error!\n");
+		hexchat_commandf (ph, "quote PRIVMSG %s :SHA-256 checksum for %s (remote): %s", word[2], word[1], checksum);
 	}
 
 	return HEXCHAT_EAT_NONE;
@@ -246,7 +218,7 @@ checksum (char *word[], char *word_eol[], void *userdata)
 {
 	if (!g_ascii_strcasecmp ("GET", word[2]))
 	{
-		print_limit ();
+		hexchat_printf (ph, "File size limit for checksums: %d MiB", get_limit ());
 	}
 	else if (!g_ascii_strcasecmp ("SET", word[2]))
 	{
@@ -259,7 +231,7 @@ checksum (char *word[], char *word_eol[], void *userdata)
 		hexchat_printf (ph, "  SET <filesize> - set the maximum file size (in MiB) to be hashed\n");
 	}
 
-	return HEXCHAT_EAT_NONE;
+	return HEXCHAT_EAT_ALL;
 }
 
 int
@@ -277,7 +249,7 @@ hexchat_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **p
 		hexchat_pluginpref_set_int (ph, "limit", DEFAULT_LIMIT);
 	}
 
-	hexchat_hook_command (ph, "CHECKSUM", HEXCHAT_PRI_NORM, checksum, "Usage: /CHECKSUM GET|SET", 0);
+	hexchat_hook_command (ph, "CHECKSUM", HEXCHAT_PRI_NORM, checksum, "Usage: /CHECKSUM GET|SET", NULL);
 	hexchat_hook_print (ph, "DCC RECV Complete", HEXCHAT_PRI_NORM, dccrecv_cb, NULL);
 	hexchat_hook_print (ph, "DCC Offer", HEXCHAT_PRI_NORM, dccoffer_cb, NULL);
 

plugins/doat/Makefile.am

@@ -2,7 +2,7 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = doat.la
 doat_la_SOURCES = doat.c
-doat_la_LDFLAGS = -avoid-version -module 
-doat_la_LIBADD = 
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+doat_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+doat_la_LIBADD = $(GLIB_LIBS)
+doat_la_CFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
 

plugins/doat/doat.c

@@ -5,9 +5,12 @@
  * http://sam.zoy.org/wtfpl/COPYING or http://lwsitu.com/xchat/COPYING
  * for more details. */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <glib.h>
 #include "hexchat-plugin.h"
 
 static hexchat_plugin *ph;
@@ -31,7 +34,7 @@ parse_command( char *word[], char *word_eol[], void *userdata ) {
 				break;
 			}
 
-			channel = strdup( token );
+			channel = g_strdup( token );
 				
 			delimiter = strchr( channel, '/' );
 
@@ -40,13 +43,13 @@ parse_command( char *word[], char *word_eol[], void *userdata ) {
 				*delimiter = '\0';
 
 				if( strlen( delimiter + 1 ) > 0 ) {
-					server = strdup( delimiter + 1 );
+					server = g_strdup( delimiter + 1 );
 				}
 			}
 
 			/* /Network form */
 			if( strlen( channel ) == 0 ) {
-				free( channel );
+				g_free( channel );
 				channel = NULL;
 			}
 
@@ -58,13 +61,8 @@ parse_command( char *word[], char *word_eol[], void *userdata ) {
 				}
 			}
 
-			if( channel != NULL ) {
-				free( channel );
-			}
-
-			if( server != NULL ) {
-				free( server );
-			}
+			g_free( channel );
+			g_free( server );
 		}
 	}
 	return HEXCHAT_EAT_HEXCHAT;

plugins/doat/doat.vcxproj

@@ -62,7 +62,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -70,6 +70,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>doat.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
@@ -80,7 +82,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DOAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -88,6 +90,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>doat.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>

plugins/fishlim/Makefile.am

@@ -3,7 +3,7 @@ EXTRA_DIST = INSTALL LICENSE
 libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = fishlim.la
-fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_hexchat.c
-fishlim_la_LDFLAGS = -avoid-version -module 
-fishlim_la_LIBADD = 
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+fishlim_la_SOURCES = fish.c irc.c keystore.c plugin_hexchat.c
+fishlim_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+fishlim_la_LIBADD = $(GLIB_LIBS) $(OPENSSL_LIBS)
+fishlim_la_CFLAGS = $(GLIB_CFLAGS) $(OPENSSL_CFLAGS) -I$(top_srcdir)/src/common

plugins/fishlim/fish.c

@@ -39,17 +39,17 @@ static const char fish_base64[64] = "./0123456789abcdefghijklmnopqrstuvwxyzABCDE
 static const signed char fish_unbase64[256] = {
     IB,IB,IB,IB,IB,IB,IB,IB,  IB,IB,IB,IB,IB,IB,IB,IB,
     IB,IB,IB,IB,IB,IB,IB,IB,  IB,IB,IB,IB,IB,IB,IB,IB,
-//      !  "  #  $  %  &  '  (    )  *  +  ,  -  .  /
+/*      !  "  #  $  %  &  '  (    )  *  +  ,  -  .  / */
     IB,IB,IB,IB,IB,IB,IB,IB,  IB,IB,IB,IB,IB,IB, 0, 1,
-//   0  1  2  3  4  5  6  7    8  9  :  ;  <  =  >  ?
+/*   0  1  2  3  4  5  6  7    8  9  :  ;  <  =  >  ? */
      2, 3, 4, 5, 6, 7, 8, 9,  10,11,IB,IB,IB,IB,IB,IB,
-//   @  A  B  C  D  E  F  G    H  I  J  K  L  M  N  O
+/*   @  A  B  C  D  E  F  G    H  I  J  K  L  M  N  O */
     IB,38,39,40,41,42,43,44,  45,46,47,48,49,50,51,52,
-//   P  Q  R  S  T  U  V  W    X  Y  Z  [  \  ]  ^  _
+/*   P  Q  R  S  T  U  V  W    X  Y  Z  [  \  ]  ^  _*/
     53,54,55,56,57,58,59,60,  61,62,63,IB,IB,IB,IB,IB,
-//   `  a  b  c  d  e  f  g    h  i  j  k  l  m  n  o
+/*   `  a  b  c  d  e  f  g    h  i  j  k  l  m  n  o */
     IB,12,13,14,15,16,17,18,  19,20,21,22,23,24,25,26,
-//   p  q  r  s  t  u  v  w    x  y  z  {  |  }  ~  <del>
+/*   p  q  r  s  t  u  v  w    x  y  z  {  |  }  ~  <del> */
     27,28,29,30,31,32,33,34,  35,36,37,IB,IB,IB,IB,IB,
 };
 
@@ -75,12 +75,11 @@ char *fish_encrypt(const char *key, size_t keylen, const char *message) {
     
     messagelen = strlen(message);
     if (messagelen == 0) return NULL;
-    encrypted = malloc(((messagelen-1)/8)*12 + 12 + 1); // each 8-byte block becomes 12 bytes
+    encrypted = g_malloc(((messagelen - 1) / 8) * 12 + 12 + 1); /* each 8-byte block becomes 12 bytes */
     end = encrypted;
-    if (!encrypted) return NULL;
      
     while (*message) {
-        // Read 8 bytes (a Blowfish block)
+        /* Read 8 bytes (a Blowfish block) */
         BF_LONG binary[2] = { 0, 0 };
         unsigned char c;
         for (i = 0; i < 8; i++) {
@@ -90,10 +89,10 @@ char *fish_encrypt(const char *key, size_t keylen, const char *message) {
         }
         message += 8;
         
-        // Encrypt block
+        /* Encrypt block */
         BF_encrypt(binary, &bfkey);
         
-        // Emit FiSH-BASE64
+        /* Emit FiSH-BASE64 */
         bit = 0;
         word = 1;
         for (j = 0; j < 12; j++) {
@@ -106,7 +105,7 @@ char *fish_encrypt(const char *key, size_t keylen, const char *message) {
             }
         }
         
-        // Stop if a null terminator was found
+        /* Stop if a null terminator was found */
         if (c == '\0') break;
     }
     *end = '\0';
@@ -124,12 +123,11 @@ char *fish_decrypt(const char *key, size_t keylen, const char *data) {
     unsigned char d;
     BF_set_key(&bfkey, keylen, (const unsigned char*)key);
     
-    decrypted = malloc(strlen(data)+1);
+    decrypted = g_malloc(strlen(data) + 1);
     end = decrypted;
-    if (!decrypted) return NULL;
     
     while (*data) {
-        // Convert from FiSH-BASE64
+        /* Convert from FiSH-BASE64 */
         BF_LONG binary[2] = { 0, 0 };
         bit = 0;
         word = 1;
@@ -144,10 +142,10 @@ char *fish_decrypt(const char *key, size_t keylen, const char *data) {
             }
         }
         
-        // Decrypt block
+        /* Decrypt block */
         BF_decrypt(binary, &bfkey);
         
-        // Copy to buffer
+        /* Copy to buffer */
         GET_BYTES(end, binary[0]);
         GET_BYTES(end, binary[1]);
     }
@@ -165,14 +163,14 @@ char *fish_encrypt_for_nick(const char *nick, const char *data) {
     char *key;
     char *encrypted;
 
-    // Look for key
+    /* Look for key */
     key = keystore_get_key(nick);
     if (!key) return NULL;
     
-    // Encrypt
+    /* Encrypt */
     encrypted = fish_encrypt(key, strlen(key), data);
     
-    free(key);
+    g_free(key);
     return encrypted;
 }
 
@@ -183,14 +181,14 @@ char *fish_encrypt_for_nick(const char *nick, const char *data) {
 char *fish_decrypt_from_nick(const char *nick, const char *data) {
     char *key;
     char *decrypted;
-    // Look for key
+    /* Look for key */
     key = keystore_get_key(nick);
     if (!key) return NULL;
     
-    // Decrypt
+    /* Decrypt */
     decrypted = fish_decrypt(key, strlen(key), data);
     
-    free(key);
+    g_free(key);
     return decrypted;
 }
 

plugins/fishlim/fish.h

@@ -25,9 +25,10 @@
 #ifndef FISH_H
 #define FISH_H
 
-#include <stdbool.h>
 #include <stddef.h>
 
+#include <glib.h>
+
 char *fish_encrypt(const char *key, size_t keylen, const char *message);
 char *fish_decrypt(const char *key, size_t keylen, const char *data);
 char *fish_encrypt_for_nick(const char *nick, const char *data);

plugins/fishlim/fishlim.vcxproj

@@ -103,14 +103,12 @@
     <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" />

plugins/fishlim/fishlim.vcxproj.filters

@@ -32,9 +32,6 @@
     <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>
@@ -49,9 +46,6 @@
     <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>

plugins/fishlim/irc.c

@@ -22,8 +22,9 @@
 
 */
 
-#include <stdlib.h>
-#include <string.h>
+#include "config.h"
+
+#include <glib.h>
 #include "irc.h"
 
 /**
@@ -31,26 +32,26 @@
  * at spaces. The prefix and command is extracted from the message, and
  * parameters_offset is set to the index of the first parameter.
  */
-bool irc_parse_message(const char *words[],
+gboolean irc_parse_message(const char *words[],
                        const char **prefix, const char **command,
                        size_t *parameters_offset) {
     size_t w = 1;
     if (prefix) *prefix = NULL;
     if (command) *command = NULL;
     
-    // See if the message starts with a prefix (sender user)
+    /* See if the message starts with a prefix (sender user) */
     if (words[w][0] == ':') {
         if (prefix) *prefix = &words[w][1];
         w++;
     }
     
-    // Check command
-    if (words[w][0] == '\0') return false;
+    /* Check command */
+    if (words[w][0] == '\0') return FALSE;
     if (command) *command = words[w];
     w++;
     
     *parameters_offset = w;
-    return true;
+    return TRUE;
 }
 
 
@@ -65,48 +66,15 @@ bool irc_parse_message(const char *words[],
  */
 char *irc_prefix_get_nick(const char *prefix) {
     const char *end;
-    char *nick;
     size_t length;
     
     if (!prefix) return NULL;
     
-    // Find end of nick
+    /* Find end of nick */
     end = prefix;
     while (*end != '\0' && *end != '!' && *end != '@') end++;
     
-    // Allocate string
+    /* Allocate string */
     length = end - prefix;
-    nick = malloc(length+1);
-    if (!nick) return NULL;
-    
-    // Copy to string
-    memcpy(nick, prefix, length);
-    nick[length] = '\0';
-    return nick;
+    return g_strndup (prefix, length);
 }
-
-
-/**
- * Compares two nick names. Return 0 if equal. Otherwise the return value is
- * less than zero if a is less than b or greater than zero if a is greater
- * than b.
- */
-int irc_nick_cmp(const char *a, const char *b) {
-    char ac;
-    char bc;
-    char diff;
-    for (;;) {
-        ac = *(a++);
-        bc = *(b++);
-        
-        // Change into IRC uppercase (see RFC 2812 section 2.2)
-        if (ac >= 'a' && ac <= '~') ac &= ~0x20;
-        if (bc >= 'a' && bc <= '~') bc &= ~0x20;
-        
-        diff = ac - bc;
-        if (diff) return diff;
-        if (!ac) return 0;
-    }
-}
-
-

plugins/fishlim/irc.h

@@ -25,14 +25,13 @@
 #ifndef IRC_H
 #define IRC_H
 
-#include <stdbool.h>
 #include <stddef.h>
+#include <glib.h>
 
-bool irc_parse_message(const char *words[],
+gboolean irc_parse_message(const char *words[],
                        const char **prefix, const char **command,
                        size_t *parameters_offset);
 char *irc_prefix_get_nick(const char *prefix);
-int irc_nick_cmp(const char *a, const char *b);
 
 #endif
 

plugins/fishlim/keystore.c

@@ -22,12 +22,13 @@
 
 */
 
+#include "config.h"
+
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include "irc.h"
 #include "fish.h"
-#include "misc.h"
 #include "keystore.h"
 #include "plugin_hexchat.h"
 
@@ -57,7 +58,7 @@ static GKeyFile *getConfigFile() {
 static const char *get_keystore_password() {
     return (keystore_password != NULL ?
         keystore_password :
-        // Silly default value...
+        /* Silly default value... */
         "blowinikey");
 }
 
@@ -87,17 +88,17 @@ static gchar *get_nick_value(GKeyFile *keyfile, const char *nick, const char *it
  * Extracts a key from the key store file.
  */
 char *keystore_get_key(const char *nick) {
-    // Get the key
+    /* Get the key */
     GKeyFile *keyfile = getConfigFile();
     gchar *value = get_nick_value(keyfile, nick, "key");
     g_key_file_free(keyfile);
     if (!value) return NULL;
     
     if (strncmp(value, "+OK ", 4) != 0) {
-        // Key is stored in plaintext
-        return import_glib_string(value);
+        /* Key is stored in plaintext */
+        return value;
     } else {
-        // Key is encrypted
+        /* Key is encrypted */
         const char *encrypted = value+4;
         const char *password = get_keystore_password();
         char *decrypted = fish_decrypt(password, strlen(password), encrypted);
@@ -109,10 +110,10 @@ char *keystore_get_key(const char *nick) {
 /**
  * Deletes a nick and the associated key in the key store file.
  */
-static bool delete_nick(GKeyFile *keyfile, const char *nick) {
+static gboolean delete_nick(GKeyFile *keyfile, const char *nick) {
     gchar **group;
     gchar **groups = g_key_file_get_groups(keyfile, NULL);
-    bool ok = false;
+    gboolean ok = FALSE;
     
     for (group = groups; *group != NULL; group++) {
         if (!irc_nick_cmp(*group, nick)) {
@@ -125,58 +126,77 @@ static bool delete_nick(GKeyFile *keyfile, const char *nick) {
     return ok;
 }
 
+#if !GLIB_CHECK_VERSION(2,40,0)
 /**
  * Writes the key store file to disk.
  */
-static bool save_keystore(GKeyFile *keyfile) {
-    char *filename;
-    bool ok;
-    // Serialize
+static gboolean keyfile_save_to_file (GKeyFile *keyfile, char *filename) {
+    gboolean ok;
+
+    /* Serialize */
     gsize file_length;
     gchar *file_data = g_key_file_to_data(keyfile, &file_length, NULL);
-    if (!file_data) return false;
-    
-    // Write to file
-    filename = get_config_filename();
-    ok = g_file_set_contents(filename, file_data, file_length, NULL);
-    g_free(filename);
+    if (!file_data)
+        return FALSE;
+
+    /* Write to file */
+    ok = g_file_set_contents (filename, file_data, file_length, NULL);
     g_free(file_data);
     return ok;
 }
+#endif
+
+/**
+ * Writes the key store file to disk.
+ */
+static gboolean save_keystore(GKeyFile *keyfile) {
+    char *filename;
+    gboolean ok;
+
+    filename = get_config_filename();
+#if !GLIB_CHECK_VERSION(2,40,0)
+    ok = keyfile_save_to_file (keyfile, filename);
+#else
+    ok = g_key_file_save_to_file (keyfile, filename, NULL);
+#endif
+    g_free (filename);
+
+    return ok;
+}
 
 /**
  * Sets a key in the key store file.
  */
-bool keystore_store_key(const char *nick, const char *key) {
+gboolean keystore_store_key(const char *nick, const char *key) {
     const char *password;
     char *encrypted;
     char *wrapped;
-    bool ok = false;
+    gboolean ok = FALSE;
     GKeyFile *keyfile = getConfigFile();
     
-    // Remove old key
+    /* Remove old key */
     delete_nick(keyfile, nick);
     
-    // Add new key
+    /* Add new key */
     password = get_keystore_password();
     if (password) {
-        // Encrypt the password
+        /* Encrypt the password */
         encrypted = fish_encrypt(password, strlen(password), key);
         if (!encrypted) goto end;
         
-        // Prepend "+OK "
+        /* Prepend "+OK " */
         wrapped = g_strconcat("+OK ", encrypted, NULL);
         g_free(encrypted);
         
-        // Store encrypted in file
+        /* Store encrypted in file */
         g_key_file_set_string(keyfile, nick, "key", wrapped);
-        free(wrapped);
+        g_free(wrapped);
     } else {
-        // Store unencrypted in file
+        /* Store unencrypted in file */
         g_key_file_set_string(keyfile, nick, "key", key);
     }
     
-    // Save key store file
+    /* Save key store file */
     ok = save_keystore(keyfile);
     
   end:
@@ -187,23 +207,15 @@ bool keystore_store_key(const char *nick, const char *key) {
 /**
  * Deletes a nick from the key store.
  */
-bool keystore_delete_nick(const char *nick) {
+gboolean keystore_delete_nick(const char *nick) {
     GKeyFile *keyfile = getConfigFile();
     
-    // Delete entry
-    bool ok = delete_nick(keyfile, nick);
+    /* Delete entry */
+    gboolean ok = delete_nick(keyfile, nick);
     
-    // Save
+    /* Save */
     if (ok) save_keystore(keyfile);
     
     g_key_file_free(keyfile);
     return ok;
 }
-
-
-void keystore_secure_free(void *ptr, size_t size) {
-    secure_erase(ptr, size);
-    free(ptr);
-}
-
-

plugins/fishlim/keystore.h

@@ -25,14 +25,13 @@
 #ifndef KEYSTORE_H
 #define KEYSTORE_H
 
-#include <stdbool.h>
 #include <stddef.h>
 
-char *keystore_get_key(const char *nick);
-bool keystore_store_key(const char *nick, const char *key);
-bool keystore_delete_nick(const char *nick);
+#include <glib.h>
 
-void keystore_secure_free(void *ptr, size_t size);
+char *keystore_get_key(const char *nick);
+gboolean keystore_store_key(const char *nick, const char *key);
+gboolean keystore_delete_nick(const char *nick);
 
 #endif
 

plugins/fishlim/misc.c

@@ -1,54 +0,0 @@
-/*
-
-  Copyright (c) 2010 Samuel Lidén Borell <samuel@kodafritt.se>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-*/
-
-#include <glib.h>
-#include <stdlib.h>
-#include <string.h>
-#include "misc.h"
-
-
-void secure_erase(void *ptr, size_t size) {
-    // "volatile" prevents this code from being optimized away
-    volatile char* volptr = ptr;
-    while (size--) *volptr++ = 0;
-}
-
-/**
- * Re-allocates a string with the native allocator.
- */
-char *import_glib_string(gchar *gstr) {
-    size_t size;
-    char *native;
-    if (g_mem_is_system_malloc()) return gstr;
-    
-    size = strlen(gstr)+1;
-    native = malloc(size);
-    memcpy(native, gstr, size);
-    
-    secure_erase(gstr, size);
-    g_free(gstr);
-    return native;
-}
-
-

plugins/fishlim/misc.h

@@ -1,36 +0,0 @@
-/*
-
-  Copyright (c) 2010 Samuel Lidén Borell <samuel@kodafritt.se>
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-*/
-
-#ifndef MISC_H
-#define MISC_H
-
-void secure_erase(void *ptr, size_t size);
-
-#ifdef __G_LIB_H__
-char *import_glib_string(gchar *gstr);
-#endif
-
-#endif
-
-

plugins/fishlim/plugin_hexchat.c

@@ -22,17 +22,14 @@
 
 */
 
+#include "config.h"
+
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 
-// #pragma GCC visibility push(default)
 #include "hexchat-plugin.h"
 #define HEXCHAT_MAX_WORDS 32
-// #pragma GCC visibility pop
-
-//#define EXPORT __attribute((visibility("default")))
-//#define EXPORT
 
 #include "fish.h"
 #include "keystore.h"
@@ -52,27 +49,19 @@ static hexchat_plugin *ph;
  * Returns the path to the key store file.
  */
 gchar *get_config_filename() {
-    return g_build_filename(hexchat_get_info(ph, "configdir"), "addon_fishlim.conf", NULL);
+    char *filename_fs, *filename_utf8;
+
+    filename_utf8 = g_build_filename(hexchat_get_info(ph, "configdir"), "addon_fishlim.conf", NULL);
+    filename_fs = g_filename_from_utf8 (filename_utf8, -1, NULL, NULL, NULL);
+
+    g_free (filename_utf8);
+    return filename_fs;
 }
 
-/**
- * Appends data to a string. Returns true if there was sufficient memory.
- * Frees *s and returns false if an error occurs.
- */
-static bool append(char **s, size_t *length, const char *data) {
-    size_t datalen = strlen(data);
-    char *extended = realloc(*s, *length + datalen + 1);
-    if (!extended) {
-        free(*s);
-        return false;
-    }
-    memcpy(extended + *length, data, datalen + 1);
-    *s = extended;
-    *length += datalen;
-    return true;
+int irc_nick_cmp(const char *a, const char *b) {
+	return hexchat_nickcmp (ph, a, b);
 }
 
-
 /*static int handle_debug(char *word[], char *word_eol[], void *userdata) {
     hexchat_printf(ph, "debug incoming: ");
     for (size_t i = 1; word[i] != NULL && word[i][0] != '\0'; i++) {
@@ -87,26 +76,26 @@ static bool append(char **s, size_t *length, const char *data) {
  */
 static int handle_outgoing(char *word[], char *word_eol[], void *userdata) {
     const char *own_nick;
-    // Encrypt the message if possible
+    /* Encrypt the message if possible */
     const char *channel = hexchat_get_info(ph, "channel");
     char *encrypted = fish_encrypt_for_nick(channel, word_eol[1]);
     if (!encrypted) return HEXCHAT_EAT_NONE;
     
-    // Display message
+    /* Display message */
     own_nick = hexchat_get_info(ph, "nick");
     hexchat_emit_print(ph, "Your Message", own_nick, word_eol[1], NULL);
     
-    // Send message
+    /* Send message */
     hexchat_commandf(ph, "PRIVMSG %s :+OK %s", channel, encrypted);
     
-    free(encrypted);
+    g_free(encrypted);
     return HEXCHAT_EAT_HEXCHAT;
 }
 
 /**
  * Called when a channel message or private message is received.
  */
-static int handle_incoming(char *word[], char *word_eol[], void *userdata) {
+static int handle_incoming(char *word[], char *word_eol[], hexchat_event_attrs *attrs, void *userdata) {
     const char *prefix;
     const char *command;
     const char *recipient;
@@ -114,20 +103,19 @@ static int handle_incoming(char *word[], char *word_eol[], void *userdata) {
     const char *peice;
     char *sender_nick;
     char *decrypted;
-    char *message;
     size_t w;
     size_t ew;
     size_t uw;
-    size_t length;
     char prefix_char = 0;
+    GString *message;
 
     if (!irc_parse_message((const char **)word, &prefix, &command, &w))
         return HEXCHAT_EAT_NONE;
     
-    // Topic (command 332) has an extra parameter
+    /* Topic (command 332) has an extra parameter */
     if (!strcmp(command, "332")) w++;
     
-    // Look for encrypted data
+    /* Look for encrypted data */
     for (ew = w+1; ew < HEXCHAT_MAX_WORDS-1; ew++) {
         const char *s = (ew == w+1 ? word[ew]+1 : word[ew]);
         if (*s && (s[1] == '+' || s[1] == 'm')) { prefix_char = *(s++); }
@@ -136,61 +124,70 @@ static int handle_incoming(char *word[], char *word_eol[], void *userdata) {
     }
     return HEXCHAT_EAT_NONE;
   has_encrypted_data: ;
-    // Extract sender nick and recipient nick/channel
+    /* Extract sender nick and recipient nick/channel */
     sender_nick = irc_prefix_get_nick(prefix);
     recipient = word[w];
     
-    // Try to decrypt with these (the keys are searched for in the key store)
+    /* Try to decrypt with these (the keys are searched for in the key store) */
     encrypted = word[ew+1];
     decrypted = fish_decrypt_from_nick(recipient, encrypted);
     if (!decrypted) decrypted = fish_decrypt_from_nick(sender_nick, encrypted);
     
-    // Check for error
+    /* Check for error */
     if (!decrypted) goto decrypt_error;
     
-    // Build unecrypted message
-    message = NULL;
-    length = 0;
-    if (!append(&message, &length, "RECV")) goto decrypt_error;
-    
+    /* Build unecrypted message */
+    message = g_string_sized_new (100); /* TODO: more accurate estimation of size */
+    g_string_append (message, "RECV");
+
+    if (attrs->server_time_utc)
+    {
+        GTimeVal tv = { (glong)attrs->server_time_utc, 0 };
+        char *timestamp = g_time_val_to_iso8601 (&tv);
+
+       g_string_append (message, " @time=");
+       g_string_append (message, timestamp);
+       g_free (timestamp);
+    }
+
     for (uw = 1; uw < HEXCHAT_MAX_WORDS; uw++) {
-        if (word[uw][0] != '\0' && !append(&message, &length, " ")) goto decrypt_error;
+        if (word[uw][0] != '\0')
+            g_string_append_c (message, ' ');
         
         if (uw == ew) {
-            // Add the encrypted data
+            /* Add the encrypted data */
             peice = decrypted;
-            uw++; // Skip "OK+"
+            uw++; /* Skip "OK+" */
             
             if (ew == w+1) {
-                // Prefix with colon, which gets stripped out otherwise
-                if (!append(&message, &length, ":")) goto decrypt_error;
+                /* Prefix with colon, which gets stripped out otherwise */
+                g_string_append_c (message, ':');
             }
             
             if (prefix_char) {
-                char prefix_str[2] = { prefix_char, '\0' };
-                if (!append(&message, &length, prefix_str)) goto decrypt_error;
+                g_string_append_c (message, prefix_char);
             }
             
         } else {
-            // Add unencrypted data (for example, a prefix from a bouncer or bot)
+            /* Add unencrypted data (for example, a prefix from a bouncer or bot) */
             peice = word[uw];
         }
-        
-        if (!append(&message, &length, peice)) goto decrypt_error;
+
+        g_string_append (message, peice);
     }
-    free(decrypted);
+    g_free(decrypted);
     
-    // Simulate unencrypted message
-    //hexchat_printf(ph, "simulating: %s\n", message);
-    hexchat_command(ph, message);
-    
-    free(message);
-    free(sender_nick);
+    /* Simulate unencrypted message */
+    /* hexchat_printf(ph, "simulating: %s\n", message->str); */
+    hexchat_command(ph, message->str);
+
+    g_string_free (message, TRUE);
+    g_free(sender_nick);
     return HEXCHAT_EAT_HEXCHAT;
   
   decrypt_error:
-    free(decrypted);
-    free(sender_nick);
+    g_free(decrypted);
+    g_free(sender_nick);
     return HEXCHAT_EAT_NONE;
 }
 
@@ -201,27 +198,27 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
     const char *nick;
     const char *key;
     
-    // Check syntax
+    /* Check syntax */
     if (*word[2] == '\0') {
         hexchat_printf(ph, "%s\n", usage_setkey);
         return HEXCHAT_EAT_HEXCHAT;
     }
     
     if (*word[3] == '\0') {
-        // /setkey password
+        /* /setkey password */
         nick = hexchat_get_info(ph, "channel");
         key = word_eol[2];
     } else {
-        // /setkey #channel password
+        /* /setkey #channel password */
         nick = word[2];
         key = word_eol[3];
     }
     
-    // Set password
+    /* Set password */
     if (keystore_store_key(nick, key)) {
         hexchat_printf(ph, "Stored key for %s\n", nick);
     } else {
-        hexchat_printf(ph, "\00305Failed to store key in addon_fishlim.conf\n", nick, key);
+        hexchat_printf(ph, "\00305Failed to store key in addon_fishlim.conf\n");
     }
     
     return HEXCHAT_EAT_HEXCHAT;
@@ -233,19 +230,19 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
 static int handle_delkey(char *word[], char *word_eol[], void *userdata) {
     const char *nick;
     
-    // Check syntax
+    /* Check syntax */
     if (*word[2] == '\0' || *word[3] != '\0') {
         hexchat_printf(ph, "%s\n", usage_delkey);
         return HEXCHAT_EAT_HEXCHAT;
     }
     
-    nick = word_eol[2];
+    nick = g_strstrip (word_eol[2]);
     
-    // Delete the given nick from the key store
+    /* Delete the given nick from the key store */
     if (keystore_delete_nick(nick)) {
         hexchat_printf(ph, "Deleted key for %s\n", nick);
     } else {
-        hexchat_printf(ph, "\00305Failed to delete key in addon_fishlim.conf!\n", nick);
+        hexchat_printf(ph, "\00305Failed to delete key in addon_fishlim.conf!\n");
     }
     
     return HEXCHAT_EAT_HEXCHAT;
@@ -282,11 +279,11 @@ int hexchat_plugin_init(hexchat_plugin *plugin_handle,
     
     /* Add handlers */
     hexchat_hook_command(ph, "", HEXCHAT_PRI_NORM, handle_outgoing, NULL, NULL);
-    hexchat_hook_server(ph, "NOTICE", HEXCHAT_PRI_NORM, handle_incoming, NULL);
-    hexchat_hook_server(ph, "PRIVMSG", HEXCHAT_PRI_NORM, handle_incoming, NULL);
-    //hexchat_hook_server(ph, "RAW LINE", HEXCHAT_PRI_NORM, handle_debug, NULL);
-    hexchat_hook_server(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
-    hexchat_hook_server(ph, "332", HEXCHAT_PRI_NORM, handle_incoming, NULL);
+    hexchat_hook_server_attrs(ph, "NOTICE", HEXCHAT_PRI_NORM, handle_incoming, NULL);
+    hexchat_hook_server_attrs(ph, "PRIVMSG", HEXCHAT_PRI_NORM, handle_incoming, NULL);
+    /* hexchat_hook_server(ph, "RAW LINE", HEXCHAT_PRI_NORM, handle_debug, NULL); */
+    hexchat_hook_server_attrs(ph, "TOPIC", HEXCHAT_PRI_NORM, handle_incoming, NULL);
+    hexchat_hook_server_attrs(ph, "332", HEXCHAT_PRI_NORM, handle_incoming, NULL);
     
     hexchat_printf(ph, "%s plugin loaded\n", plugin_name);
     /* Return success */

plugins/fishlim/plugin_hexchat.h

@@ -26,6 +26,7 @@
 #define PLUGIN_HEXCHAT_H
 
 gchar *get_config_filename();
+int irc_nick_cmp (const char *, const char *);
 
 #endif
 

plugins/fishlim/test.c

@@ -47,7 +47,7 @@ static int decrypt(int nick_count, char *nicks[]) {
         return 1;
       success:
         fprintf(stderr, "Decrypted text >>>%s<<<\n", msg);
-        free(msg);
+        g_free(msg);
     }
     return 0;
 }
@@ -64,7 +64,7 @@ static int encrypt(int nick_count, char *nicks[]) {
             char *encrypted = fish_encrypt_for_nick(nicks[i], message);
             if (encrypted) {
                 fprintf(stderr, "Encrypted [%s]:  >>>%s<<<\n", nicks[i], encrypted);
-                free(encrypted);
+                g_free(encrypted);
             } else {
                 error = true;
             }

plugins/mpcinfo/functions.c

@@ -14,54 +14,27 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/*
-typedef int (*MYPROC)(HWND,HWND,char*,char*,BOOL,BOOL); 
+#include <glib.h>
 
-int dllProc(char *name, char *data){
-    HINSTANCE hinstLib; 
-    hinstLib = LoadLibrary("mpcinfo");
-    //MYPROC proc;
-    int res;
-    if (hinstLib != NULL){
-       //proc = ;
-       if ((MYPROC) GetProcAddress(hinstLib, name)!=NULL){
-          res=(MYPROC)(NULL,NULL,data,NULL,TRUE,TRUE);
-       }
-       else{fprintf(stderr,"can't get proc: %s\n",name);res=-2;}
-    }
-    else{fprintf(stderr,"can't access dll\n");return -1;}
-    FreeLibrary(hinstLib);
-    return res;
-}
-*/
-
-/*
-int dllProc(char *name, char *data)
+char *split(char *text, char separator)
 {
-	static HMODULE lib = NULL;
-	if (!lib)
+	int pos = -1;
+	size_t i;
+	for (i = 0; i < strlen(text); i++)
 	{
-		lib = LoadLibraryA ("mpcinfo");
-		if (!lib)
-		{
-			return FALSE;
+		if (text[i] == separator) {
+			pos = i;
+			i = strlen(text) + 1;
 		}
-		FreeLibrary (lib);
 	}
 
-	return TRUE;
-}
-*/
+	if (pos == -1)
+	{
+		return text;
+	}
 
-char *split(char *text, char seperator){
-     //if (DEBUG==1) putlog("splitting");
-     int i;int pos=-1;
-     for (i=0;i<strlen(text);i++){
-         if (text[i]==seperator){pos=i;i=strlen(text)+1;}
-     }
-     if (pos==-1) return text;
-     text[pos]=0;
-     return &(text[pos+1]);
+	text[pos] = 0;
+	return &(text[pos + 1]);
 }
 
 int endsWith(char *text, char *suffix){
@@ -71,21 +44,32 @@ int endsWith(char *text, char *suffix){
     return 0;
 }
 
-int inStr(char *s1, int sl1, char *s2){
-    //if (DEBUG==1) putlog("checking instr");
-	int i;int j;
-	for(i=0;i<sl1-strlen(s2);i++){
-		for (j=0;j<strlen(s2);j++){
-			if (s1[i+j]!=s2[j]) j=strlen(s2)+2;
+int inStr(char *s1, size_t sl1, char *s2)
+{
+	size_t i;
+	for (i = 0; i < sl1 - strlen(s2); i++)
+	{
+		size_t j;
+		for (j = 0; j < strlen(s2); j++)
+		{
+			if (s1[i + j] != s2[j])
+			{
+				j = strlen(s2) + 2;
+			}
+		}
+
+		if (j == strlen(s2))
+		{
+			return i;
 		}
-		if (j==strlen(s2)) return i;
 	}
+
 	return -1;
 }
 
 static char *subString(char *text, int first, int length, int spcKill){
 //if (DEBUG==1) putlog("creating substring");
-	char *ret=(char*) calloc (length+1,sizeof(char)); //malloc(sizeof(char)*(length+1));
+	char *ret = g_new (char, length + 1);
 	int i;
 	ret[length]=0;
 	for (i=0;i<length;i++){
@@ -107,7 +91,7 @@ static char *substring(char *text, int first, int length){return subString(text,
 
 char *readLine(FILE *f){
      //if (DEBUG==1) putlog("reading line from file");
-     char *buffer=(char*)calloc(1024,sizeof(char)); //malloc(sizeof(char)*1024);
+     char *buffer = g_new (char, 1024);
      int pos=0;
      int cc=0;
      while((cc!=EOF)&&(pos<1024)&&(cc!=10)){
@@ -121,14 +105,19 @@ char *readLine(FILE *f){
      return buffer;
 }
 
-char *toUpper(char *text){
-     //if (DEBUG==1) putlog("converting text to upper case");
-     char *ret=(char*) calloc(strlen(text)+1,sizeof(char));
-     int i;
-     for (i=0;i<strlen(text);i++) ret[i]=toupper(text[i]);
-     ret[strlen(text)]=0;
-     //if (DEBUG==1) putlog("uc done");
-     return ret;
+char *toUpper(char *text)
+{
+	char *ret = (char*) calloc(strlen(text) + 1, sizeof(char));
+
+	size_t i;
+	for (i = 0; i < strlen(text); i++)
+	{
+		ret[i] = toupper(text[i]);
+	}
+
+	ret[strlen(text)] = 0;
+
+	return ret;
 }
 
 static char *str3cat(char *s1, char *s2, char *s3){

plugins/mpcinfo/mp3Info.c

@@ -75,62 +75,25 @@ static char MODES [][13]={"Stereo","Joint-Stereo","Dual-Channel","Mono"};
 
 int iPow(int x, int y){return (int)(pow((double)x,(double) y));}
 
-int str2int(char *text){
-    //if (DEBUG==1) putlog("converting string to int");
-    int i;
-    int ret=0;
-    for (i=1;i<=strlen(text);i++){
-        if ((text[strlen(text)-i]>57)||(text[strlen(text)-i]<48)){
-           hexchat_printf(ph,"invalid char in string: %i",text[strlen(text)-i]);
-           return 255;
-        }
-        ret+=((int)text[strlen(text)-i]-48)*iPow(10,i-1);
-    }
-    //hexchat_printf(ph, "str2int(%s)=%i",text,ret);
-    //if (DEBUG==1) putlog("int converted");
-    return ret;
-}
-/*
-static int getSize(char *file){
-    //if (DEBUG==1) putlog("reading filesize");
-	struct stat info;
-	if (stat(file,&info)!=0) return -1;
-	return info.st_size;
-}*/
-/*
-int inStr(char *s1, int sl1, char *s2){
-    //if (DEBUG==1) putlog("checking instr");
-	int i;int j;
-	for(i=0;i<sl1-strlen(s2);i++){
-		for (j=0;j<strlen(s2);j++){
-			if (s1[i+j]!=s2[j]) j=strlen(s2)+2;
-		}
-		if (j==strlen(s2)) return i;
-	}
-	return -1;
-}
+int str2int(char *text)
+{
+	int ret = 0;
 
-static char *subString(char *text, int first, int length, int spcKill){
-//if (DEBUG==1) putlog("creating substring");
-	char *ret=(char*) calloc (length+1,sizeof(char)); //malloc(sizeof(char)*(length+1));
-	ret[length]=0;int i;
-	for (i=0;i<length;i++){
-		ret[i]=text[i+first];
-		//if (ret[i]==0) ret[i]='0';
+	size_t i;
+	for (i = 1; i <= strlen(text); i++)
+	{
+		if ((text[strlen(text) - i] > 57) || (text[strlen(text) - i] < 48))
+		{
+			hexchat_printf(ph, "invalid char in string: %i", (int) text[strlen(text) - i]);
+			return 255;
+		}
+
+		ret += ((int) text[strlen(text) - i] - 48)*iPow(10, i - 1);
 	}
-	if (spcKill==1){
-	   for (i=length-1;i>=0;i--){
-           if (ret[i]==32) ret[i]=0;
-           else i=-1;
-       }
-    }
-    //if (DEBUG==1) putlog("substring created");
+
 	return ret;
 }
 
-static char *substring(char *text, int first, int length){return subString(text,first,length,0);} //1
-*/
-
 static char *tagExtract(char *tag, int tagLen, char* info){
 //if (DEBUG==1) putlog("extracting tag");
 	int pos, len, i;
@@ -204,23 +167,28 @@ struct tagInfo readID3V1(char *file){
 	return ret;
 }
 
-char *extractID3Genre(char *tag){
-     //if (DEBUG==1) putlog("extracting id3 genre");
-     if (tag[strlen(tag)-1]==')'){
-        tag[strlen(tag)-1]=0;
-        tag=&tag[1];
-        return GENRES[str2int(tag)];
-        //return tag;
-     }
-     else{
-          int i;
-          //hexchat_print(ph, "Using 2 criteria");
-          for (i=0;i<strlen(tag);i++){
-              if (tag[i]==')'){ tag=&tag[i]+1;return tag;}
-          //return tag;
-          }
-     }
-     return "[152] failed";
+char *extractID3Genre(char *tag)
+{
+	if (tag[strlen(tag) - 1] == ')')
+	{
+		tag[strlen(tag) - 1] = 0;
+		tag = &tag[1];
+		return GENRES[str2int(tag)];
+	}
+	else
+	{
+		size_t i;
+		for (i = 0; i < strlen(tag); i++)
+		{
+			if (tag[i] == ')')
+			{
+				tag = &tag[i] + 1;
+				return tag;
+			}
+		}
+	}
+
+	return "[152] failed";
 }
 
 struct tagInfo readID3V2(char *file){

plugins/mpcinfo/mpcInfo.c

@@ -48,12 +48,20 @@ static int mpc_tell(char *word[], char *word_eol[], void *userdata){
 	   HWND hwnd = FindWindow("MediaPlayerClassicW",NULL);
        if (hwnd==0) {hexchat_print(ph, randomLine(notRunTheme));return HEXCHAT_EAT_ALL;}
        
-       tTitle=(char*)malloc(sizeof(char)*1024);
+       tTitle = g_new(char, 1024);
        GetWindowText(hwnd, tTitle, 1024);
-       zero=strstr(tTitle," - Media Player Classic");
-       if (zero!=NULL) zero[0]=0;
-       else hexchat_print(ph,"pattern not found");
-       
+       zero = strstr (tTitle, " - Media Player Classic");
+	   if (zero != NULL)
+	   {
+		   zero[0] = 0;
+	   }
+	   else
+	   {
+		   g_free(tTitle);
+		   hexchat_print(ph, "pattern not found");
+		   return HEXCHAT_EAT_ALL;
+	   }
+
        if ((tTitle[1]==':')&&(tTitle[2]=='\\')){
           //hexchat_print(ph,"seams to be full path");
           if (endsWith(tTitle,".mp3")==1){
@@ -82,7 +90,8 @@ static int mpc_tell(char *word[], char *word_eol[], void *userdata){
                 //mp3Line=intReplace(mp3Line,"%perc",perc);
                 //mp3Line=replace(mp3Line,"%plTitle",title);
                 mp3Line=replace(mp3Line,"%file",tTitle);
-                hexchat_command(ph, mp3Line);
+				g_free(tTitle);
+				hexchat_command(ph, mp3Line);
                 return HEXCHAT_EAT_ALL;
              }
           }
@@ -111,14 +120,16 @@ static int mpc_tell(char *word[], char *word_eol[], void *userdata){
                 //oggLine=intReplace(oggLine,"%perc",perc);
                 //oggLine=replace(oggLine,"%plTitle",title);
                 oggLine=replace(oggLine,"%file",tTitle);
-                hexchat_command(ph, oggLine);
+				g_free(tTitle);
+				hexchat_command(ph, oggLine);
                 return HEXCHAT_EAT_ALL;
              }
           }
        }
        line=randomLine(titleTheme);
        line=replace(line,"%title", tTitle);
-       hexchat_command(ph,line); 
+	   g_free(tTitle);
+	   hexchat_command(ph, line);
        return HEXCHAT_EAT_ALL;
 }
 

plugins/mpcinfo/mpcinfo.vcxproj

@@ -63,13 +63,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>mpcinfo.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
@@ -81,13 +83,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;MPCINFO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>mpcinfo.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>

plugins/mpcinfo/oggInfo.c

@@ -25,14 +25,18 @@ static int getOggInt(char *buff, int beg, int bytes){
 	return ret;
 }
 
-static char *upperStr(char *text){
-//if (DEBUG==1) putlog("converting text to uc");
-    //printf("upperStr(%s)\n",text);
-	int i;
-	char *ret=(char*) malloc(sizeof(char)*(strlen(text)+1));
-	ret[strlen(text)]=0;
-	for (i=0;i<strlen(text);i++) ret[i]=toupper(text[i]);
-	//printf("Result: %s\n",ret);
+static char *upperStr(char *text)
+{
+	char *ret = (char*) malloc(sizeof(char)*(strlen(text) + 1));
+
+	size_t i;
+	for (i = 0; i < strlen(text); i++)
+	{
+		ret[i] = toupper(text[i]);
+	}
+
+	ret[strlen(text)] = 0;
+
 	return ret;
 }
 

plugins/mpcinfo/theme.c

@@ -49,24 +49,32 @@ void printThemes(){
      hexchat_printf(ph,"\nTitle-Theme:\n");printTheme(titleTheme);
 }
 
-void cbFix(char *line){
-     //if (DEBUG==1) putlog("cbfix");
-     int i, j;
-     for (i=0;i<strlen(line);i++){
-         if (line[i]=='%'){
-            if ((line[i+1]=='C')||(line[i+1]=='B')||(line[i+1]=='U')||(line[i+1]=='O')||(line[i+1]=='R')){
-               if(line[i+1]=='C') line[i]=3;
-               if(line[i+1]=='B') line[i]=2;
-               if(line[i+1]=='U') line[i]=37;
-               if(line[i+1]=='O') line[i]=17;
-               if(line[i+1]=='R') line[i]=26;
+void cbFix(char *line)
+{
+	size_t i;
+	for (i = 0; i < strlen(line); i++)
+	{
+		size_t j;
 
-               for (j=i+1;j<strlen(line)-1;j++) line[j]=line[j+1];
-               line[strlen(line)-1]=0;
-            }
-         }
-     }
-     //if (DEBUG==1) putlog("cbfix done");
+		if (line[i] == '%')
+		{
+			if ((line[i + 1] == 'C') || (line[i + 1] == 'B') || (line[i + 1] == 'U') || (line[i + 1] == 'O') || (line[i + 1] == 'R'))
+			{
+				if (line[i + 1] == 'C') line[i] = 3;
+				if (line[i + 1] == 'B') line[i] = 2;
+				if (line[i + 1] == 'U') line[i] = 37;
+				if (line[i + 1] == 'O') line[i] = 17;
+				if (line[i + 1] == 'R') line[i] = 26;
+
+				for (j = i + 1; j < strlen(line) - 1; j++)
+				{
+					line[j] = line[j + 1];
+				}
+
+				line[strlen(line) - 1] = 0;
+			}
+		}
+	}
 }
 
 struct theme themeAdd(struct theme data, char *info){

plugins/perl/Makefile.am

@@ -6,13 +6,14 @@ libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = perl.la
 perl_la_SOURCES = perl.c
-perl_la_LDFLAGS = -avoid-version -module 
-perl_la_LIBADD = $(PERL_LDFLAGS)
+perl_la_LDFLAGS = $(PERL_LDFLAGS) $(PLUGIN_LDFLAGS) -module
+perl_la_LIBADD = $(PERL_LIBS) $(GLIB_LIBS)
+perl_la_CFLAGS = $(PERL_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
+
 BUILT_SOURCES = hexchat.pm.h irc.pm.h
-#CFLAGS = @CFLAGS@ -Wno-unused
-AM_CPPFLAGS = $(PERL_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
-CLEANFILES = hexchat.pm.h irc.pm.h
+CLEANFILES = $(BUILT_SOURCES)
+
 hexchat.pm.h irc.pm.h: lib/HexChat.pm lib/Xchat.pm lib/HexChat/Embed.pm \
 	lib/HexChat/List/Network.pm lib/HexChat/List/Network/Entry.pm \
 	lib/HexChat/List/Network/AutoJoin.pm lib/IRC.pm
-	perl generate_header
+	cd $(srcdir); perl generate_header

plugins/perl/perl.c

@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -31,12 +33,10 @@
 #include <dirent.h>
 #endif
 
+#include <glib.h>
+
 #undef PACKAGE
-#ifdef WIN32
-#include "../../config-win32.h"		  /* for #define OLD_PERL */
-#else
-#include "../../config.h"
-#endif
+
 #include "hexchat-plugin.h"
 
 static hexchat_plugin *ph;		  /* plugin handle */
@@ -78,37 +78,26 @@ thread_mbox (char *str)
 static void
 perl_auto_load_from_path (const char *path)
 {
-	WIN32_FIND_DATA find_data;
-	HANDLE find_handle;
-	char *search_path;
-	int path_len = strlen (path);
-
-	/* +6 for \*.pl and \0 */
-	search_path = malloc(path_len + 6);
-	sprintf (search_path, "%s\\*.pl", path);
-
-	find_handle = FindFirstFile (search_path, &find_data);
+	char *search_path = g_build_filename (path, "*.pl", NULL);
+	WIN32_FIND_DATAA find_data;
+	HANDLE find_handle = FindFirstFileA (search_path, &find_data);
 
 	if (find_handle != INVALID_HANDLE_VALUE)
 	{
 		do
 		{
-			if (!(find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY
-				||find_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN))
+			if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0 && (find_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0)
 			{
-				char *full_path =
-					malloc (path_len + strlen (find_data.cFileName) + 2);
-				sprintf (full_path, "%s\\%s", path, find_data.cFileName);
-
+				char *full_path = g_build_filename (path, find_data.cFileName, NULL);
 				perl_load_file (full_path);
-				free (full_path);
+				g_free (full_path);
 			}
 		}
-		while (FindNextFile (find_handle, &find_data) != 0);
+		while (FindNextFileA (find_handle, &find_data) != 0);
 		FindClose (find_handle);
 	}
 
-	free (search_path);
+	g_free (search_path);
 }
 #else
 static void
@@ -118,14 +107,16 @@ perl_auto_load_from_path (const char *path)
 	struct dirent *ent;
 
 	dir = opendir (path);
-	if (dir) {
-		while ((ent = readdir (dir))) {
+	if (dir)
+	{
+		while ((ent = readdir (dir)))
+		{
 			int len = strlen (ent->d_name);
-			if (len > 3 && strcasecmp (".pl", ent->d_name + len - 3) == 0) {
-				char *file = malloc (len + strlen (path) + 2);
-				sprintf (file, "%s/%s", path, ent->d_name);
+			if (len > 3 && strcasecmp (".pl", ent->d_name + len - 3) == 0)
+			{
+				char *file = g_build_filename (path, ent->d_name, NULL);
 				perl_load_file (file);
-				free (file);
+				g_free (file);
 			}
 		}
 		closedir (dir);
@@ -148,31 +139,10 @@ perl_auto_load (void *unused)
 
 	/* don't pollute the filesystem with script files, this only causes misuse of the folders
 	 * only use ~/.config/hexchat/addons/ and %APPDATA%\HexChat\addons */
-#if 0
-	/* autoload from ~/.config/hexchat/ or %APPDATA%\HexChat\ on win32 */
-	perl_auto_load_from_path (xdir);
-#endif
-
-	sub_dir = malloc (strlen (xdir) + 8);
-	strcpy (sub_dir, xdir);
-	strcat (sub_dir, "/addons");
+	sub_dir = g_build_filename (xdir, "addons", NULL);
 	perl_auto_load_from_path (sub_dir);
-	free (sub_dir);
+	g_free (sub_dir);
 
-#if 0
-#ifdef WIN32
-	/* autoload from  C:\Program Files\HexChat\plugins\ */
-	sub_dir = malloc (1025 + 9);
-	copied = GetModuleFileName( 0, sub_dir, 1024 );
-	sub_dir[copied] = '\0';
-	slash = strrchr( sub_dir, '\\' );
-	if( slash != NULL ) {
-		*slash = '\0';
-	}
-	perl_auto_load_from_path ( strncat (sub_dir, "\\plugins", 9));
-	free (sub_dir);
-#endif
-#endif
 	return 0;
 }
 
@@ -291,7 +261,19 @@ list_item_to_sv ( hexchat_list *list, const char *const *fields )
 			field_value = newSVuv (hexchat_list_int (ph, list, field_name));
 			break;
 		case 't':
-			field_value = newSVnv (hexchat_list_time (ph, list, field_name));
+			/* From perldoc for Perl's own timelocal() and timegm():
+			 * <quote>
+			 * On perl versions older than 5.12.0, the range of dates that can be actually be handled depends on the size of time_t (usually a signed integer) on the given platform.
+			 * As of version 5.12.0, perl has stopped using the underlying time library of the operating system it's running on and has its own implementation of those routines with a
+			 * safe range of at least +/ 2**52 (about 142 million years).
+			 * </quote>
+			 *
+			 * This is further confirmed from looking at the source for Time::Local - it's a Perl module and the implementations of timelocal() and timegm() use simple addition and
+			 * subtraction of numbers. Perl automatically promotes numbers from int32_t (IV) to uint32_t (UV) to 64-bit IEEE754 double (NV) as required.
+			 *
+			 * This means that using a double (NV) for our own time_t suffers from the same assumptions that Perl's own functions do.
+			 */
+			field_value = newSVnv ((const NV) hexchat_list_time (ph, list, field_name));
 			break;
 		default:
 			field_value = &PL_sv_undef;
@@ -375,7 +357,7 @@ fd_cb (int fd, int flags, void *userdata)
 				if (data->userdata) {
 					SvREFCNT_dec (data->userdata);
 				}
-				free (data);
+				g_free (data);
 			}
 		}
 
@@ -739,7 +721,7 @@ XS (XS_HexChat_send_modes)
 		if (SvROK (ST (0))) {
 			p_targets = (AV*) SvRV (ST (0));
 			target_count = av_len (p_targets) + 1;
-			targets = malloc (target_count * sizeof (char *));
+			targets = g_new (const char *, target_count);
 			for (i = 0; i < target_count; i++ ) {
 				elem = av_fetch (p_targets, i, 0);
 
@@ -750,13 +732,13 @@ XS (XS_HexChat_send_modes)
 				}
 			}
 		} else{
-			targets = malloc (sizeof (char *));
+			targets = g_new (const char *, 1);
 			targets[0] = SvPV_nolen (ST (0));
 			target_count = 1;
 		}
 		
 		if (target_count == 0) {
-			free (targets);
+			g_free ((char**) targets);
 			XSRETURN_EMPTY;
 		}
 
@@ -768,7 +750,7 @@ XS (XS_HexChat_send_modes)
 		}
 
 		hexchat_send_modes (ph, targets, target_count, modes_per_line, sign, mode);
-		free (targets);
+		g_free ((char**) targets);
 	}
 }
 static
@@ -886,11 +868,7 @@ XS (XS_HexChat_hook_server)
 		userdata = ST (3);
 		package = ST (4);
 		data = NULL;
-		data = malloc (sizeof (HookData));
-		if (data == NULL) {
-			XSRETURN_UNDEF;
-		}
-
+		data = g_new (HookData, 1);
 		data->callback = newSVsv (callback);
 		data->userdata = newSVsv (userdata);
 		data->depth = 0;
@@ -935,11 +913,7 @@ XS (XS_HexChat_hook_command)
 		package = ST (5);
 		data = NULL;
 
-		data = malloc (sizeof (HookData));
-		if (data == NULL) {
-			XSRETURN_UNDEF;
-		}
-
+		data = g_new (HookData, 1);
 		data->callback = newSVsv (callback);
 		data->userdata = newSVsv (userdata);
 		data->depth = 0;
@@ -975,11 +949,7 @@ XS (XS_HexChat_hook_print)
 		userdata = ST (3);
 		package = ST (4);
 
-		data = malloc (sizeof (HookData));
-		if (data == NULL) {
-			XSRETURN_UNDEF;
-		}
-
+		data = g_new (HookData, 1);
 		data->callback = newSVsv (callback);
 		data->userdata = newSVsv (userdata);
 		data->depth = 0;
@@ -1013,11 +983,7 @@ XS (XS_HexChat_hook_timer)
 		userdata = ST (2);
 		package = ST (3);
 
-		data = malloc (sizeof (HookData));
-		if (data == NULL) {
-			XSRETURN_UNDEF;
-		}
-
+		data = g_new (HookData, 1);
 		data->callback = newSVsv (callback);
 		data->userdata = newSVsv (userdata);
 		data->ctx = hexchat_get_context (ph);
@@ -1067,11 +1033,7 @@ XS (XS_HexChat_hook_fd)
 		}
 #endif
 
-		data = malloc (sizeof (HookData));
-		if (data == NULL) {
-			XSRETURN_UNDEF;
-		}
-
+		data = g_new (HookData, 1);
 		data->callback = newSVsv (callback);
 		data->userdata = newSVsv (userdata);
 		data->depth = 0;
@@ -1111,7 +1073,7 @@ XS (XS_HexChat_unhook)
 				SvREFCNT_dec (userdata->package);
 			}
 
-			free (userdata);
+			g_free (userdata);
 		}
 		XSRETURN (retCount);
 	}

plugins/perl/perl.vcxproj

@@ -62,7 +62,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -70,8 +70,8 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(PerlLib).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(PerlLib).lib;$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
       <DelayLoadDLLs>$(PerlLib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
@@ -91,7 +91,7 @@ move hexchat.pm.h "$(IntDir)"</Command>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;PERL520_EXPORTS;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(PerlPath)\lib\CORE;$(IntDir);..\..\src\common;$(Glib);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -99,8 +99,8 @@ move hexchat.pm.h "$(IntDir)"</Command>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>$(PerlLib).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>$(PerlLib).lib;$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>perl.def</ModuleDefinitionFile>
       <DelayLoadDLLs>$(PerlLib).dll;%(DelayLoadDLLs)</DelayLoadDLLs>
     </Link>
@@ -122,4 +122,4 @@ move hexchat.pm.h "$(IntDir)"</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

plugins/python/Makefile.am

@@ -1,10 +1,8 @@
-EXTRA_DIST = 
-
 libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = python.la
 python_la_SOURCES = python.c
-python_la_LDFLAGS = -avoid-version -module 
-python_la_LIBADD = $(PY_LIBS)
-AM_CPPFLAGS = $(PY_CFLAGS) $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+python_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+python_la_LIBADD = $(PY_LIBS) $(GLIB_LIBS)
+python_la_CFLAGS = $(PY_CFLAGS) $(GLIB_CFLAGS) -I$(top_srcdir)/src/common
 

plugins/python/python.c

@@ -51,23 +51,24 @@
  *
  */
 
+#include "config.h"
+
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
 #ifdef WIN32
 #include <direct.h>
-#include <glib/gstdio.h>
-#include "../../src/dirent/dirent-win32.h"
-#include "../../config-win32.h"
 #else
 #include <unistd.h>
 #include <dirent.h>
 #endif
 
 #include "hexchat-plugin.h"
-#undef _POSIX_C_SOURCE	/* Avoid warning: also in /usr/include/features.h from glib.h */
+#undef _POSIX_C_SOURCE	/* Avoid warnings from /usr/include/features.h */
+#undef _XOPEN_SOURCE
 #include <Python.h>
 #include <structmember.h>
 #include <pythread.h>
@@ -415,6 +416,9 @@ Util_BuildEOLList(char *word[])
 	PyObject *list;
 	int listsize = 31;
 	int i;
+	char *accum = NULL;
+	char *last = NULL;
+
 	/* Find the last valid array member; there may be intermediate NULLs that
 	 * would otherwise cause us to drop some members. */
 	while (listsize > 0 &&
@@ -425,10 +429,9 @@ Util_BuildEOLList(char *word[])
 		PyErr_Print();
 		return NULL;
 	}
-	char *accum = NULL;
-	char *last = NULL;
 	for (i = listsize; i > 0; i--) {
 		char *part = word[i];
+		PyObject *uni_part;
 		if (accum == NULL) {
 			accum = g_strdup (part);
 		} else if (part != NULL && part[0] != 0) {
@@ -444,14 +447,12 @@ Util_BuildEOLList(char *word[])
 				return NULL;
 			}
 		}
-		PyObject *uni_part = PyUnicode_FromString(accum);
+		uni_part = PyUnicode_FromString(accum);
 		PyList_SetItem(list, i - 1, uni_part);
 	}
 
-	if (last)
-		g_free (last);
-	if (accum)
-		g_free (accum);
+	g_free (last);
+	g_free (accum);
 
 	return list;
 }
@@ -459,26 +460,31 @@ Util_BuildEOLList(char *word[])
 static void
 Util_Autoload_from (const char *dir_name)
 {
-#ifndef PATH_MAX
-#define PATH_MAX 1024	/* Hurd doesn't define it */
-#endif
-	char oldcwd[PATH_MAX];
-	struct dirent *ent;
-	DIR *dir;
-	if (getcwd(oldcwd, PATH_MAX) == NULL)
+	gchar *oldcwd;
+	const char *entry_name;
+	GDir *dir;
+
+	oldcwd = g_get_current_dir ();
+	if (oldcwd == NULL)
 		return;
-	if (chdir(dir_name) != 0)
+	if (g_chdir(dir_name) != 0)
+	{
+		g_free (oldcwd);
 		return;
-	dir = opendir(".");
-	if (dir == NULL)
-		return;
-	while ((ent = readdir(dir))) {
-		int len = strlen(ent->d_name);
-		if (len > 3 && strcmp(".py", ent->d_name+len-3) == 0)
-			Command_PyLoad(ent->d_name);
 	}
-	closedir(dir);
-	chdir(oldcwd);
+	dir = g_dir_open (".", 0, NULL);
+	if (dir == NULL)
+	{
+		g_free (oldcwd);
+		return;
+	}
+	while ((entry_name = g_dir_read_name (dir)))
+	{
+		if (g_str_has_suffix (entry_name, ".py"))
+			Command_PyLoad((char*)entry_name);
+	}
+	g_dir_close (dir);
+	g_chdir (oldcwd);
 }
 
 static void
@@ -486,7 +492,7 @@ Util_Autoload()
 {
 	const char *xdir;
 	char *sub_dir;
-	/* we need local filesystem encoding for chdir, opendir etc */
+	/* we need local filesystem encoding for g_chdir, g_dir_open etc */
 
 	xdir = hexchat_get_info(ph, "configdir");
 
@@ -796,9 +802,7 @@ Callback_ThreadTimer(void *userdata)
 /* We keep this information global, so we can reset it when the
  * deinit function is called. */
 /* XXX This should be somehow bound to the printing context. */
-static char *xchatout_buffer = NULL;
-static int xchatout_buffer_size = 0;
-static int xchatout_buffer_pos = 0;
+static GString *xchatout_buffer = NULL;
 
 static PyObject *
 XChatOut_New()
@@ -822,76 +826,42 @@ XChatOut_dealloc(PyObject *self)
 static PyObject *
 XChatOut_write(PyObject *self, PyObject *args)
 {
-	int new_buffer_pos, data_size, print_limit, add_space;
+	gboolean add_space;
 	char *data, *pos;
-	if (!PyArg_ParseTuple(args, "s#:write", &data, &data_size))
+
+	if (!PyArg_ParseTuple(args, "s:write", &data))
 		return NULL;
-	if (!data_size) {
-		Py_INCREF(Py_None);
-		return Py_None;
+	if (!data || !*data) {
+		Py_RETURN_NONE;
 	}
 	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT|ALLOW_THREADS);
 	if (((XChatOutObject *)self)->softspace) {
-		add_space = 1;
+		add_space = TRUE;
 		((XChatOutObject *)self)->softspace = 0;
 	} else {
-		add_space = 0;
-	}
-	if (xchatout_buffer_size-xchatout_buffer_pos < data_size+add_space) {
-		char *new_buffer;
-		/* This buffer grows whenever needed, and does not
-		 * shrink. If we ever implement unloading of the
-		 * python interface, we must find some way to free
-		 * this buffer as well. */
-		xchatout_buffer_size += data_size*2+16;
-		new_buffer = g_realloc(xchatout_buffer, xchatout_buffer_size);
-		if (new_buffer == NULL) {
-			hexchat_print(ph, "Not enough memory to print");
-			/* The system is out of resources. Let's help. */
-			g_free(xchatout_buffer);
-			xchatout_buffer = NULL;
-			xchatout_buffer_size = 0;
-			xchatout_buffer_pos = 0;
-			/* Return something valid, since we have
-			 * already warned the user, and he probably
-			 * won't be able to notice this exception. */
-			goto exit;
-		}
-		xchatout_buffer = new_buffer;
-	}
-	memcpy(xchatout_buffer+xchatout_buffer_pos, data, data_size);
-	print_limit = new_buffer_pos = xchatout_buffer_pos+data_size;
-	pos = xchatout_buffer+print_limit;
-	if (add_space && *(pos-1) != '\n') {
-		*pos = ' ';
-		*(pos+1) = 0;
-		new_buffer_pos++;
-	}
-	while (*pos != '\n' && print_limit > xchatout_buffer_pos) {
-		pos--;
-		print_limit--;
-	}
-	if (*pos == '\n') {
-		/* Crop it, inserting the string limiter there. */
-		*pos = 0;
-		hexchat_print(ph, xchatout_buffer);
-		if (print_limit < new_buffer_pos) {
-			/* There's still data to be printed. */
-			print_limit += 1; /* Include the limiter. */
-			xchatout_buffer_pos = new_buffer_pos-print_limit;
-			memmove(xchatout_buffer, xchatout_buffer+print_limit,
-				xchatout_buffer_pos);
-		} else {
-			xchatout_buffer_pos = 0;
-		}
-	} else {
-		xchatout_buffer_pos = new_buffer_pos;
+		add_space = FALSE;
+	}
+
+	g_string_append (xchatout_buffer, data);
+
+	/* If not end of line add space to continue buffer later */
+	if (add_space && xchatout_buffer->str[xchatout_buffer->len - 1] != '\n')
+	{
+		g_string_append_c (xchatout_buffer, ' ');
+	}
+
+	/* If there is an end of line print up to that */
+	if ((pos = strrchr (xchatout_buffer->str, '\n')))
+	{
+		*pos = '\0';
+		hexchat_print (ph, xchatout_buffer->str);
+
+		/* Then remove it from buffer */
+		g_string_erase (xchatout_buffer, 0, pos - xchatout_buffer->str + 1);
 	}
 
-exit:
 	END_XCHAT_CALLS();
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 #define OFF(x) offsetof(XChatOutObject, x)
@@ -1043,8 +1013,7 @@ Context_set(ContextObject *self, PyObject *args)
 {
 	PyObject *plugin = Plugin_GetCurrent();
 	Plugin_SetContext(plugin, self->context);
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1057,8 +1026,7 @@ Context_command(ContextObject *self, PyObject *args)
 	hexchat_set_context(ph, self->context);
 	hexchat_command(ph, text);
 	END_XCHAT_CALLS();
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1071,8 +1039,7 @@ Context_prnt(ContextObject *self, PyObject *args)
 	hexchat_set_context(ph, self->context);
 	hexchat_print(ph, text);
 	END_XCHAT_CALLS();
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1117,8 +1084,7 @@ Context_get_info(ContextObject *self, PyObject *args)
 	info = hexchat_get_info(ph, name);
 	END_XCHAT_CALLS();
 	if (info == NULL) {
-		Py_INCREF(Py_None);
-		return Py_None;
+		Py_RETURN_NONE;
 	}
 	return PyUnicode_FromString(info);
 }
@@ -1401,11 +1367,7 @@ static Hook *
 Plugin_AddHook(int type, PyObject *plugin, PyObject *callback,
 	       PyObject *userdata, char *name, void *data)
 {
-	Hook *hook = (Hook *) g_malloc(sizeof(Hook));
-	if (hook == NULL) {
-		PyErr_NoMemory();
-		return NULL;
-	}
+	Hook *hook = g_new(Hook, 1);
 	hook->type = type;
 	hook->plugin = plugin;
 	Py_INCREF(callback);
@@ -1459,8 +1421,7 @@ Plugin_RemoveHook(PyObject *plugin, Hook *hook)
 					       hook));
 		Py_DECREF(hook->callback);
 		Py_DECREF(hook->userdata);
-		if (hook->name)
-			g_free(hook->name);
+		g_free(hook->name);
 		g_free(hook);
 	}
 }
@@ -1479,8 +1440,7 @@ Plugin_RemoveAllHooks(PyObject *plugin)
 		}
 		Py_DECREF(hook->callback);
 		Py_DECREF(hook->userdata);
-		if (hook->name)
-			g_free(hook->name);
+		g_free(hook->name);
 		g_free(hook);
 		list = list->next;
 	}
@@ -1709,8 +1669,7 @@ Module_hexchat_command(PyObject *self, PyObject *args)
 	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT|ALLOW_THREADS);
 	hexchat_command(ph, text);
 	END_XCHAT_CALLS();
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1722,8 +1681,7 @@ Module_xchat_prnt(PyObject *self, PyObject *args)
 	BEGIN_XCHAT_CALLS(RESTORE_CONTEXT|ALLOW_THREADS);
 	hexchat_print(ph, text);
 	END_XCHAT_CALLS();
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1766,8 +1724,7 @@ Module_hexchat_get_info(PyObject *self, PyObject *args)
 	info = hexchat_get_info(ph, name);
 	END_XCHAT_CALLS();
 	if (info == NULL) {
-		Py_INCREF(Py_None);
-		return Py_None;
+		Py_RETURN_NONE;
 	}
 	if (strcmp (name, "gtkwin_ptr") == 0)
 		return PyUnicode_FromFormat("%p", info); /* format as pointer */
@@ -1820,8 +1777,7 @@ Module_hexchat_get_context(PyObject *self, PyObject *args)
 		return NULL;
 	ctxobj = Context_FromContext(Plugin_GetContext(plugin));
 	if (ctxobj == NULL) {
-		Py_INCREF(Py_None);
-		return Py_None;
+		Py_RETURN_NONE;
 	}
 	return ctxobj;
 }
@@ -1838,8 +1794,7 @@ Module_hexchat_find_context(PyObject *self, PyObject *args, PyObject *kwargs)
 		return NULL;
 	ctxobj = Context_FromServerAndChannel(server, channel);
 	if (ctxobj == NULL) {
-		Py_INCREF(Py_None);
-		return Py_None;
+		Py_RETURN_NONE;
 	}
 	return ctxobj;
 }
@@ -1885,7 +1840,7 @@ Module_hexchat_pluginpref_get(PyObject *self, PyObject *args)
 	if (!PyArg_ParseTuple(args, "s:get_pluginpref", &var))
 		return NULL;
 		
-	// This will always return numbers as integers.
+	/* This will always return numbers as integers. */
 	BEGIN_XCHAT_CALLS(NONE);
 	result = hexchat_pluginpref_get_str(prefph, var, retstr);
 	END_XCHAT_CALLS();
@@ -2219,8 +2174,7 @@ Module_hexchat_unhook(PyObject *self, PyObject *args)
 		Plugin_RemoveHook(plugin, hook);
 	}	
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -2528,11 +2482,8 @@ IInterp_Exec(char *command)
 	}
 	d = PyModule_GetDict(m);
 	len = strlen(command);
-	buffer = (char *) g_malloc(len+2);
-	if (buffer == NULL) {
-		hexchat_print(ph, "Not enough memory for command buffer");
-		goto fail;
-	}
+
+	buffer = g_malloc(len + 2);
 	memcpy(buffer, command, len);
 	buffer[len] = '\n';
 	buffer[len+1] = 0;
@@ -2778,6 +2729,7 @@ hexchat_plugin_init(hexchat_plugin *plugin_handle,
 	Py_Initialize();
 	PySys_SetArgv(1, argv);
 
+	xchatout_buffer = g_string_new (NULL);
 	xchatout = XChatOut_New();
 	if (xchatout == NULL) {
 		hexchat_print(ph, "Can't allocate xchatout object");
@@ -2848,10 +2800,8 @@ hexchat_plugin_deinit()
 	plugin_list = NULL;
 
 	/* Reset xchatout buffer. */
-	g_free(xchatout_buffer);
+	g_string_free (xchatout_buffer, TRUE);
 	xchatout_buffer = NULL;
-	xchatout_buffer_size = 0;
-	xchatout_buffer_pos = 0;
 
 	if (interp_plugin) {
 		Py_DECREF(interp_plugin);

plugins/sysinfo/Makefile.am

@@ -1,7 +1,7 @@
 libdir = $(hexchatlibdir)
 
 lib_LTLIBRARIES = sysinfo.la
-sysinfo_la_SOURCES = hwmon.c match.c parse.c pci.c xsys.c
-sysinfo_la_LDFLAGS = -avoid-version -module
-sysinfo_la_LIBADD = -lpci
-AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/../../src/common
+sysinfo_la_SOURCES = match.c parse.c pci.c xsys.c
+sysinfo_la_LDFLAGS = $(PLUGIN_LDFLAGS) -module
+sysinfo_la_LIBADD = $(LIBPCI_LIBS) $(GLIB_LIBS)
+sysinfo_la_CFLAGS = $(LIBPCI_CFLAGS) $(GLIB_CFLAGS) -I$(srcdir)/../../src/common

plugins/sysinfo/hwmon.c

@@ -1,63 +0,0 @@
-/*
- * hwmon.c - Hardware monitoring functions for X-Sys
- * Copyright (C) 2005 Tony Vroon
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <unistd.h>
-#include "xsys.h"
-
-int hwmon_chip_present()
-{
-	FILE *fp = fopen("/sys/class/hwmon/hwmon0/device/name", "r");
-	if(fp != NULL) {
-		fclose(fp);
-		return 1;
-	}
-	return 0;
-}
-
-#if 0
-void get_hwmon_chip_name(char *name)
-{
-	char *position, buffer[bsize];
-	FILE *fp = fopen("/sys/class/hwmon/hwmon0/device/name", "r");
-	if(fp != NULL) {
-		if(fgets(buffer, bsize, fp) != NULL) {
-			position = strstr(buffer, "\n");
-                        *(position) = '\0';
-			snprintf(name, sizeof(name), "%s", buffer);
-		}
-		fclose(fp);
-	}
-}
-#endif
-
-void get_hwmon_temp(unsigned int *value, unsigned int *sensor)
-{
-	char buffer[bsize];
-	snprintf(buffer, bsize, "/sys/class/hwmon/hwmon0/device/temp%i_input", *sensor);
-	FILE *fp = fopen(buffer, "r");
-	if(fp != NULL) {
-		if(fgets(buffer, bsize, fp) != NULL)
-			*value = atoi(buffer);
-		fclose(fp);
-	}
-}

plugins/sysinfo/hwmon.h

@@ -1,28 +0,0 @@
-/*
- * hwmon.h - Hardware monitoring header for X-Sys
- * Copyright (C) 2005 Tony Vroon
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-
-#ifndef _HWMON_H_
-#define _HWMON_H_
-
-int hwmon_chip_present();
-void get_hwmon_chip_name(char *name);
-void get_hwmon_temp(unsigned int *value, unsigned int *sensor);
-
-#endif

plugins/sysinfo/match.c

@@ -22,6 +22,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
+#include <glib.h>
 #include "xsys.h"
 
 float percentage(unsigned long long *free, unsigned long long *total)
@@ -32,18 +33,18 @@ float percentage(unsigned long long *free, unsigned long long *total)
 
 char *pretty_freespace(const char *desc, unsigned long long *free_k, unsigned long long *total_k)
 {
-        char *result, **quantity;
+	char *quantities[] = { "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", 0 };
+	char *result, **quantity;
 	double free_space, total_space;
 	free_space = *free_k;
 	total_space = *total_k;
-        result = malloc(bsize * sizeof(char));
-	char *quantities[] = { "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB", 0 };
+	result = g_new(char, bsize);
 	if (total_space == 0)
 	{
-		snprintf(result, bsize, "%s: none", desc);
+		g_snprintf(result, bsize, "%s: none", desc);
 		return result;
 	}
-        quantity = quantities;
+	quantity = quantities;
 	while (total_space > 1023 && *(quantity + 1))
 	{
 		quantity++;
@@ -51,11 +52,11 @@ char *pretty_freespace(const char *desc, unsigned long long *free_k, unsigned lo
 		total_space = total_space / 1024;
 	}
 	if (sysinfo_get_percent () != 0)
-		snprintf(result, bsize, "%s: %.1f%s, %.1f%% free",
+		g_snprintf(result, bsize, "%s: %.1f%s, %.1f%% free",
 		desc, total_space, *quantity,
 		percentage(free_k, total_k));
 	else
-		snprintf(result, bsize, "%s: %.1f%s/%.1f%s free",
+		g_snprintf(result, bsize, "%s: %.1f%s/%.1f%s free",
 		desc, free_space, *quantity, total_space, *quantity);
         return result;
 }
@@ -63,28 +64,15 @@ char *pretty_freespace(const char *desc, unsigned long long *free_k, unsigned lo
 
 void remove_leading_whitespace(char *buffer)
 {
-	char *buffer2 = NULL;
-	int i = 0, j = 0, ews = 0;
+	char *p;
 
-	buffer2 = (char*)malloc(strlen(buffer) * sizeof(char));
-	if (buffer2 == NULL)
+	if (buffer == NULL)
 		return;
 
-	memset (buffer2, (char)0, strlen(buffer));
-	while (i < strlen(buffer))
-	{
-		/* count tabs, spaces as whitespace. */
-		if (!(buffer[i] == (char)32 || buffer[i] == (char)9) || ews == 1)
-		{
-			ews = 1;
-			buffer2[j] = buffer[i];
-			j++;
-		}
-		i++;
-	}
-	memset (buffer, (char)0, strlen(buffer));
-	strcpy (buffer, buffer2);
-	free (buffer2);
+	for (p = buffer; *p && isspace (*p); p++)
+	;
+
+	memmove (buffer, p, strlen (p) + 1);
 }
 
 char *decruft_filename(char *buffer)

plugins/sysinfo/parse.c

@@ -29,11 +29,12 @@
 #include <dirent.h>
 #include <sys/types.h>
 #include <pci/header.h>
+#include <glib.h>
 
 #include "pci.h"
 #include "match.h"
-#include "hwmon.h"
 #include "xsys.h"
+#include "parse.h"
 
 int xs_parse_cpu(char *model, char *vendor, double *freq, char *cache, unsigned int *count)
 {
@@ -46,7 +47,8 @@ int xs_parse_cpu(char *model, char *vendor, double *freq, char *cache, unsigned
 	FILE *fp = fopen("/proc/cpuinfo", "r");
 	if(fp == NULL)
 		return 1;
-	if(count != NULL) *count = 0;
+
+	*count = 0;
 	strcpy(cache,"unknown\0");
 	
 	#if defined(__i386__) || defined(__x86_64__)
@@ -121,7 +123,7 @@ int xs_parse_cpu(char *model, char *vendor, double *freq, char *cache, unsigned
 		while ((entry = readdir(dir)) != NULL)
 			if (strncmp(entry->d_name,"SUNW,UltraSPARC",15) == 0)
 			{
-				snprintf(buffer,bsize,"/proc/openprom/%s/ecache-size",entry->d_name);
+				g_snprintf(buffer,bsize,"/proc/openprom/%s/ecache-size",entry->d_name);
 				fp2 = fopen(buffer, "r");
 				if (fp2 == NULL) break;
 				fscanf(fp2,"%16s",cache);
@@ -170,7 +172,7 @@ int xs_parse_os(char *user, char *host, char *kernel)
 	
 	strncpy(user, usern, bsize);
 	strcpy(host, hostn);
-	snprintf(kernel, bsize, "%s %s %s", osinfo.sysname, osinfo.release, osinfo.machine);
+	g_snprintf(kernel, bsize, "%s %s %s", osinfo.sysname, osinfo.release, osinfo.machine);
 	
 	return 0;
 }
@@ -201,9 +203,9 @@ int xs_parse_sound(char *snd_card)
 			pos = strstr(buffer, ":");
 			card_id = strtoll(buffer, NULL, 0);
 			if (card_id == 0)
-				snprintf(card_buf, bsize, "%s", pos+2);
+				g_snprintf(card_buf, bsize, "%s", pos+2);
 			else
-				snprintf(card_buf, bsize, "%ld: %s", card_id, pos+2);
+				g_snprintf(card_buf, bsize, "%ld: %s", card_id, pos+2);
 			pos = strstr(card_buf, "\n");
 			*pos = '\0';
 			strcat(cards, card_buf);
@@ -267,11 +269,11 @@ int xs_parse_netdev(const char *device, unsigned long long *bytes_recv, unsigned
 	fclose(fp);
 	pos = strstr(buffer, ":");
 	pos++;
-	*bytes_recv = strtoull(pos, &pos, 0);
+	*bytes_recv = g_ascii_strtoull (pos, &pos, 0);
 
-	for(i=0;i<7;i++) strtoull(pos, &pos, 0);
+	for(i=0;i<7;i++) g_ascii_strtoull (pos, &pos, 0);
 	
-	*bytes_sent = strtoull(pos, NULL, 0);
+	*bytes_sent = g_ascii_strtoull (pos, NULL, 0);
 
 	return 0;
 }
@@ -297,15 +299,15 @@ int xs_parse_df(const char *mount_point, char *result)
 		for(;isspace(*pos);pos++);
 		if(mount_point == NULL)
 		{
-			total_k += strtoull(pos, &pos, 0);
-			strtoull(pos, &pos, 0);
-			free_k += strtoull(pos, &pos, 0);
+			total_k += g_ascii_strtoull (pos, &pos, 0);
+			g_ascii_strtoull(pos, &pos, 0);
+			free_k += g_ascii_strtoull (pos, &pos, 0);
 			continue;
 		}
-		total_k = strtoull(pos, &pos, 0);
-		strtoull(pos, &pos, 0);
-		free_k = strtoull(pos, &pos, 0);
-		strtoull(pos, &pos, 0);
+		total_k = g_ascii_strtoull (pos, &pos, 0);
+		g_ascii_strtoull(pos, &pos, 0);
+		free_k = g_ascii_strtoull (pos, &pos, 0);
+		g_ascii_strtoull (pos, &pos, 0);
 		for(;isspace(*pos);pos++);
 		for(;*pos!='/';pos++);
 		for(i=0;*(buffer+i)!='\n';i++);
@@ -316,16 +318,16 @@ int xs_parse_df(const char *mount_point, char *result)
 			char *tmp_buf = pretty_freespace(pos, &free_k, &total_k);
 			strcat(tmp_buf, " | ");
 			strcat(result, tmp_buf);
-			free(tmp_buf);
+			g_free(tmp_buf);
 		}
 		else if(strncmp(mount_point, pos, strlen(mount_point)) == 0)
 		{
 			char *tmp_buf = pretty_freespace(mount_point, &free_k, &total_k);
 			strncpy(result, tmp_buf, bsize);
-			free(tmp_buf);
+			g_free(tmp_buf);
 			break;
 		}
-		else snprintf(result, bsize, "Mount point %s not found!", mount_point);
+		else g_snprintf(result, bsize, "Mount point %s not found!", mount_point);
 	}
 	
 	if(mount_point != NULL && strncasecmp(mount_point, "ALL", 3)==0)
@@ -335,7 +337,7 @@ int xs_parse_df(const char *mount_point, char *result)
 	{
 		char *tmp_buf = pretty_freespace("Total", &free_k, &total_k);
 		strncpy(result, tmp_buf, bsize);
-		free(tmp_buf);
+		g_free(tmp_buf);
 	}
 	pclose(pipe);
 	return 0;
@@ -387,9 +389,9 @@ int xs_parse_distro(char *name)
 			find_match_char(buffer, "ACCEPT_KEYWORDS", keywords);
 		/* cppcheck-suppress uninitvar */
 		if (strstr(keywords, "\"") == NULL)
-			snprintf(buffer, bsize, "Gentoo Linux (stable)");
+			g_snprintf(buffer, bsize, "Gentoo Linux (stable)");
 		else
-			snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
+			g_snprintf(buffer, bsize, "Gentoo Linux %s", keywords);
 	}
 	else if((fp = fopen("/etc/redhat-release", "r")) != NULL)
 		fgets(buffer, bsize, fp);
@@ -404,7 +406,7 @@ int xs_parse_distro(char *name)
 	else if((fp = fopen("/etc/turbolinux-release", "r")) != NULL)
 		fgets(buffer, bsize, fp);
 	else if((fp = fopen("/etc/arch-release", "r")) != NULL)
-		snprintf(buffer, bsize, "ArchLinux");
+		g_snprintf(buffer, bsize, "ArchLinux");
 	else if((fp = fopen("/etc/lsb-release", "r")) != NULL)
 	{
 		char id[bsize], codename[bsize], release[bsize];
@@ -417,16 +419,16 @@ int xs_parse_distro(char *name)
 			find_match_char(buffer, "DISTRIB_CODENAME", codename);
 			find_match_char(buffer, "DISTRIB_RELEASE", release);
 		}
-		snprintf(buffer, bsize, "%s \"%s\" %s", id, codename, release);
+		g_snprintf(buffer, bsize, "%s \"%s\" %s", id, codename, release);
 	}
 	else if((fp = fopen("/etc/debian_version", "r")) != NULL)
 	{
 		char release[bsize];
 		fgets(release, bsize, fp);
-		snprintf(buffer, bsize, "Debian %s", release);
+		g_snprintf(buffer, bsize, "Debian %s", release);
 	}
 	else
-		snprintf(buffer, bsize, "Unknown Distro");
+		g_snprintf(buffer, bsize, "Unknown Distro");
 	if(fp != NULL) fclose(fp);
 	
 	pos=strchr(buffer, '\n');
@@ -434,28 +436,3 @@ int xs_parse_distro(char *name)
 	strcpy(name, buffer);
 	return 0;
 }
-
-int xs_parse_hwmon_chip(char *chip)
-{
-	if (!hwmon_chip_present())
-		return 1;
-#if 0
-	else
-		get_hwmon_chip_name(chip);
-#endif
-	return 0;
-}
-
-int xs_parse_hwmon_temp(char *temp, unsigned int *sensor)
-{
-	unsigned int value;
-	float celsius;
-
-	if (!hwmon_chip_present())
-		return 1;
-	else
-		get_hwmon_temp(&value, sensor);
-		celsius = (float)value;
-		snprintf(temp, bsize, "%.1fC", celsius/1000.0);
-	return 0;
-}

plugins/sysinfo/parse.h

@@ -34,7 +34,5 @@ int xs_parse_video(char *vid_card);
 int xs_parse_agpbridge(char *agp_bridge);
 int xs_parse_ether(char *ethernet_card);
 int xs_parse_distro(char *name);
-int xs_parse_hwmon_chip(char *chip);
-int xs_parse_hwmon_temp(char *temp, unsigned int *sensor);
 
 #endif

plugins/sysinfo/pci.c

@@ -25,6 +25,8 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <pci/pci.h>
+#include <glib.h>
+
 #include "xsys.h"
 
 static struct pci_filter filter;       /* Device filter */
@@ -47,8 +49,7 @@ static struct device *scan_device(struct pci_dev *p)
 
   	if (!pci_filter_match(&filter, p))
     		return NULL;
-  	d = malloc(sizeof(struct device));
-  	bzero(d, sizeof(*d));
+  	d = g_new0 (struct device, 1);
   	d->dev = p;
   	if (!pci_read_block(p, 0, d->config, how_much))
     		exit(1);
@@ -98,8 +99,8 @@ int pci_find_by_class(u16 *class, char *vendor, char *device)
     		/* Acquire vendor & device ID if the class matches */
     		if(get_conf_word(d, PCI_CLASS_DEVICE) == *class) {
       			nomatch = 0;
-			snprintf(vendor,7,"%04x",p->vendor_id);
-			snprintf(device,7,"%04x",p->device_id);
+			g_snprintf(vendor,7,"%04x",p->vendor_id);
+			g_snprintf(device,7,"%04x",p->device_id);
       			break;
     		}
   	}
@@ -115,12 +116,13 @@ void pci_find_fullname(char *fullname, char *vendor, char *device)
 	char devicename[bsize/2] = "";
 	char *position;
 	int cardfound = 0;
+	FILE *fp;
 
 	sysinfo_get_pciids (buffer);
-	FILE *fp = fopen (buffer, "r");
+	fp = fopen (buffer, "r");
 
 	if(fp == NULL) {
-		snprintf(fullname, bsize, "%s:%s", vendor, device);
+		g_snprintf(fullname, bsize, "%s:%s", vendor, device);
 		sysinfo_print_error ("pci.ids file not found! You might want to adjust your pciids setting with /SYSINFO SET pciids (you can query its current value with /SYSINFO LIST).\n");
 		return;
 	}
@@ -149,8 +151,8 @@ void pci_find_fullname(char *fullname, char *vendor, char *device)
  		}
 	}
 	if (cardfound == 1)
-		snprintf(fullname, bsize, "%s %s", vendorname, devicename);
+		g_snprintf(fullname, bsize, "%s %s", vendorname, devicename);
 	else
-		snprintf(fullname, bsize, "%s:%s", vendor, device);	
+		g_snprintf(fullname, bsize, "%s:%s", vendor, device);	
 	fclose(fp);
 }

plugins/sysinfo/sysinfo.cpp

@@ -155,7 +155,7 @@ getOsName (void)
 static char *
 getCpuName (void)
 {
-	// Get extended ids.
+	/* Get extended ids. */
 	unsigned int nExIds;
 	unsigned int i;
 	int CPUInfo[4] = {-1};

plugins/sysinfo/xsys.c

@@ -22,6 +22,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -86,6 +87,7 @@ print_summary (int announce, char* format)
 	char os_host[bsize];
 	char os_user[bsize];
 	char os_kernel[bsize];
+	char *free_space;
 	unsigned long long mem_total;
 	unsigned long long mem_free;
 	unsigned int count;
@@ -98,7 +100,7 @@ print_summary (int announce, char* format)
 	int seconds;
 	sysinfo[0] = '\0';
 
-	snprintf (buffer, bsize, "%s", hexchat_get_info (ph, "version"));
+	g_snprintf (buffer, bsize, "%s", hexchat_get_info (ph, "version"));
 	format_output ("HexChat", buffer, format);
 	strcat (sysinfo, "\017 ");
 	strncat (sysinfo, buffer, bsize - strlen (sysinfo));
@@ -110,7 +112,7 @@ print_summary (int announce, char* format)
 		return HEXCHAT_EAT_ALL;
 	}
 
-	snprintf (buffer, bsize, "%s", os_kernel);
+	g_snprintf (buffer, bsize, "%s", os_kernel);
 	format_output ("OS", buffer, format);
 	strcat (sysinfo, "\017 ");
 	strncat (sysinfo, buffer, bsize - strlen (sysinfo));
@@ -140,11 +142,11 @@ print_summary (int announce, char* format)
 
 	if (giga)
 	{
-		snprintf (buffer, bsize, "%u x %s (%s) @ %.2fGHz", count, cpu_model, cpu_vendor, cpu_freq);
+		g_snprintf (buffer, bsize, "%u x %s (%s) @ %.2fGHz", count, cpu_model, cpu_vendor, cpu_freq);
 	}
 	else
 	{
-		snprintf (buffer, bsize, "%u x %s (%s) @ %.0fMHz", count, cpu_model, cpu_vendor, cpu_freq);
+		g_snprintf (buffer, bsize, "%u x %s (%s) @ %.0fMHz", count, cpu_model, cpu_vendor, cpu_freq);
 	}
 
 	format_output ("CPU", buffer, format);
@@ -158,7 +160,9 @@ print_summary (int announce, char* format)
 		return HEXCHAT_EAT_ALL;
 	}
 
-	snprintf (buffer, bsize, "%s", pretty_freespace ("Physical", &mem_free, &mem_total));
+	free_space = pretty_freespace ("Physical", &mem_free, &mem_total);
+	g_snprintf (buffer, bsize, "%s", free_space);
+	g_free (free_space);
 	format_output ("RAM", buffer, format);	
 	strcat (sysinfo, "\017 ");
 	strncat (sysinfo, buffer, bsize - strlen (sysinfo));
@@ -220,21 +224,21 @@ print_summary (int announce, char* format)
 			{
 				if (weeks != 0)
 				{
-					snprintf (buffer, bsize, "%dw %dd %dh %dm %ds", weeks, days, hours, minutes, seconds);
+					g_snprintf (buffer, bsize, "%dw %dd %dh %dm %ds", weeks, days, hours, minutes, seconds);
 				}
 				else
 				{
-					snprintf (buffer, bsize, "%dd %dh %dm %ds", days, hours, minutes, seconds);
+					g_snprintf (buffer, bsize, "%dd %dh %dm %ds", days, hours, minutes, seconds);
 				}
 			}
 			else
 			{
-				snprintf (buffer, bsize, "%dh %dm %ds", hours, minutes, seconds);
+				g_snprintf (buffer, bsize, "%dh %dm %ds", hours, minutes, seconds);
 			}
 		}
 		else
 		{
-			snprintf (buffer, bsize, "%dm %ds", minutes, seconds);
+			g_snprintf (buffer, bsize, "%dm %ds", minutes, seconds);
 		}
 	}
 
@@ -268,7 +272,7 @@ print_os (int announce, char* format)
 		return HEXCHAT_EAT_ALL;
 	}
 
-	snprintf (buffer, bsize, "%s@%s, %s", user, host, kernel);
+	g_snprintf (buffer, bsize, "%s@%s, %s", user, host, kernel);
 	format_output ("OS", buffer, format);
 	
 	if (announce)
@@ -332,11 +336,11 @@ print_cpu (int announce, char* format)
 
 	if (giga)
 	{
-		snprintf (buffer, bsize, "%u x %s (%s) @ %.2fGHz w/ %s L2 Cache", count, model, vendor, freq, cache);
+		g_snprintf (buffer, bsize, "%u x %s (%s) @ %.2fGHz w/ %s L2 Cache", count, model, vendor, freq, cache);
 	}
 	else
 	{
-		snprintf (buffer, bsize, "%u x %s (%s) @ %.0fMHz w/ %s L2 Cache", count, model, vendor, freq, cache);
+		g_snprintf (buffer, bsize, "%u x %s (%s) @ %.0fMHz w/ %s L2 Cache", count, model, vendor, freq, cache);
 	}
 
 	format_output ("CPU", buffer, format);
@@ -373,7 +377,7 @@ print_ram (int announce, char* format)
 		return HEXCHAT_EAT_ALL;
 	}
 
-	snprintf (string, bsize, "%s - %s", pretty_freespace ("Physical", &mem_free, &mem_total), pretty_freespace ("Swap", &swap_free, &swap_total));
+	g_snprintf (string, bsize, "%s - %s", pretty_freespace ("Physical", &mem_free, &mem_total), pretty_freespace ("Swap", &swap_free, &swap_total));
 	format_output ("RAM", string, format);
 	
 	if (announce)
@@ -448,11 +452,11 @@ print_vga (int announce, char* format)
 
 	if (xs_parse_agpbridge (agp_bridge) != 0)
 	{
-		snprintf (buffer, bsize, "%s", vid_card);
+		g_snprintf (buffer, bsize, "%s", vid_card);
 	}
 	else
 	{
-		snprintf (buffer, bsize, "%s @ %s", vid_card, agp_bridge);
+		g_snprintf (buffer, bsize, "%s @ %s", vid_card, agp_bridge);
 	}
 
 	format_output ("VGA", buffer, format);
@@ -543,21 +547,21 @@ print_uptime (int announce, char* format)
 			{
 				if (weeks != 0)
 				{
-					snprintf (buffer, bsize, "%dw %dd %dh %dm %ds", weeks, days, hours, minutes, seconds);
+					g_snprintf (buffer, bsize, "%dw %dd %dh %dm %ds", weeks, days, hours, minutes, seconds);
 				}
 				else
 				{
-					snprintf (buffer, bsize, "%dd %dh %dm %ds", days, hours, minutes, seconds);
+					g_snprintf (buffer, bsize, "%dd %dh %dm %ds", days, hours, minutes, seconds);
 				}
 			}
 			else
 			{
-				snprintf (buffer, bsize, "%dh %dm %ds", hours, minutes, seconds);
+				g_snprintf (buffer, bsize, "%dh %dm %ds", hours, minutes, seconds);
 			}
 		}
 		else
 		{
-			snprintf (buffer, bsize, "%dm %ds", minutes, seconds);
+			g_snprintf (buffer, bsize, "%dm %ds", minutes, seconds);
 		}
 	}
 
@@ -598,7 +602,7 @@ netdata_cb (char *word[], char *word_eol[], void *userdata)
 	bytes_recv /= 1024;
 	bytes_sent /= 1024;
 	
-	snprintf (netdata, bsize, "%s: %.1f MB Received, %.1f MB Sent", word[2], (double)bytes_recv/1024.0, (double)bytes_sent/1024.0);
+	g_snprintf (netdata, bsize, "%s: %.1f MB Received, %.1f MB Sent", word[2], (double)bytes_recv/1024.0, (double)bytes_sent/1024.0);
 	hexchat_pluginpref_get_str (ph, "format", format);
 	format_output ("Netdata", netdata, format);
 
@@ -654,24 +658,24 @@ netstream_cb (char *word[], char *word_eol[], void *userdata)
 	if (bytes_recv > 1024)
 	{
 		bytes_recv /= 1024;
-		snprintf (mag_r, 5, "KB/s");
+		g_snprintf (mag_r, 5, "KB/s");
 	}
 	else
 	{
-		snprintf (mag_r, 5, "B/s");
+		g_snprintf (mag_r, 5, "B/s");
 	}
 
 	if (bytes_sent > 1024)
 	{
 		bytes_sent /= 1024;
-		snprintf (mag_s, 5, "KB/s");
+		g_snprintf (mag_s, 5, "KB/s");
 	}
 	else
 	{
-		snprintf (mag_s, 5, "B/s");
+		g_snprintf (mag_s, 5, "B/s");
 	}
 
-	snprintf (netstream, bsize, "%s: Receiving %llu %s, Sending %llu %s", word[2], bytes_recv, mag_r, bytes_sent, mag_s);
+	g_snprintf (netstream, bsize, "%s: Receiving %llu %s, Sending %llu %s", word[2], bytes_recv, mag_r, bytes_sent, mag_s);
 	hexchat_pluginpref_get_str (ph, "format", format);
 	format_output ("Netstream", netstream, format);
 
@@ -878,11 +882,11 @@ sysinfo_cb (char *word[], char *word_eol[], void *userdata)
 int
 hexchat_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg)
 {
+	char buffer[bsize];
 	ph = plugin_handle;
 	*plugin_name    = name;
 	*plugin_desc    = desc;
 	*plugin_version = version;
-	char buffer[bsize];
 
 	hexchat_hook_command (ph, "SYSINFO",	HEXCHAT_PRI_NORM,	sysinfo_cb,	sysinfo_help, NULL);
 	hexchat_hook_command (ph, "NETDATA",	HEXCHAT_PRI_NORM,	netdata_cb,	NULL, NULL);

po/POTFILES.in

@@ -10,6 +10,8 @@ src/common/inbound.c
 src/common/notify.c
 src/common/outbound.c
 src/common/plugin.c
+src/common/plugin-identd.c
+src/common/plugin-timer.c
 src/common/server.c
 src/common/servlist.c
 src/common/textevents.h

po/bg.po

@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Rostislav Raykov <zbrox@i-space.org>, 2005
-# n0kS Phr33d0m <shibam@v-gz.cz.cc>, 2012
+# Phr33d0m <shibam@v-gz.cz.cc>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"

po/da.po

@@ -6,7 +6,7 @@
 # Birger Langkjer <birger.langkjer@image.dk>, 1999
 # bviktor, 2012
 # Daniel Nylander <po@danielnylander.se>, 2007-2008,2010
-# Dennis Skov Midjord <dennisskovhermannsen@gmail.com>, 2012-2013
+# Incendia <dennisskovhermannsen@gmail.com>, 2012-2013
 # Henrik Hansen <hh@mailserver.dk>, 1999
 # Keld Simonsen, <keld2keldix.com>, 2011
 # Morten Brix Pedersen <morten@wtf.dk>, 2001

po/de.po

@@ -4,7 +4,7 @@
 # 
 # Translators:
 # SSL <albkert@gmail.com>, 2013
-# Alf Gaida <agaida@siduction.org>, 2014
+# agaida <agaida@siduction.org>, 2014
 # Benedikt Roth <Benedikt.Roth@gmx.net>, 2000
 # Christian Meyer <linux@chrisim.de>, 2000
 # Aray <dataray@web.de>, 2014
@@ -13,11 +13,11 @@
 # Jakob Kramer <jakob.kramer@gmx.de>, 2012-2013
 # Karl Eichwalder <ke@gnu.franken.de>, 2003
 # Klaas <klaasdemter@googlemail.com>, 2013
-# RJ ., 2012
-# Marcel Metz <mmetz@adrian-broher.net>, 2013
+# subscious, 2012
+# adrian_broher <mmetz@adrian-broher.net>, 2013
 # Matthias Warkus <mawa@iname.com>, 1999
-# RJ ., 2014
-# Richard Schwab <mail@w.tf-w.tf>, 2013-2014
+# subscious, 2014
+# Nothing4You <mail@w.tf-w.tf>, 2013-2014
 # Tamer Fahmy <e9526976@stud2.tuwien.ac.at>, 1999
 # TheX <xerus@live.de>, 2013
 msgid ""
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-07-25 21:49+0000\n"
+"PO-Revision-Date: 2014-06-02 04:31+0000\n"
 "Last-Translator: Aray <dataray@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/hexchat/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -45,7 +45,7 @@ msgstr "HexChar ist ein einfach zu benutzender, aber erweiterbarer IRC-CLient. E
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr "Hexchat unterstützt Features wie: DCC, SASL, procies, Rechtschreibprüfung, Benachrichtigungen, Logging, Benutzerdesigns und Python/Perl-Scripte"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:1
 msgid "HexChat"
@@ -57,11 +57,11 @@ msgstr "IRC-Client"
 
 #: ../data/misc/hexchat.desktop.in.h:3
 msgid "Chat with other people online"
-msgstr "Chatte online mit anderen Leuten"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:4
 msgid "IM;Chat;"
-msgstr "IM;Chat;"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:5
 msgid "Open Safe Mode"
@@ -299,7 +299,7 @@ msgstr "CTCP-Flut von %s, %s wird jetzt ignoriert\n"
 #: ../src/common/ignore.c:410
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr "Du wirst gerade von %s ge\"MSGflooded\". Setze gui_autoopen_dialog auf AUS.\n"
+msgstr ""
 
 #: ../src/common/notify.c:558
 #, c-format
@@ -365,7 +365,7 @@ msgstr "Unbekanntes Argument »%s« ignoriert."
 
 #: ../src/common/outbound.c:3093 ../src/common/outbound.c:3123
 msgid "Quiet is not supported by this server."
-msgstr "Ruhigstellen wird von diesem Server nicht unterstützt."
+msgstr ""
 
 #. error
 #: ../src/common/outbound.c:3585 ../src/common/outbound.c:3619
@@ -670,7 +670,7 @@ msgstr "QUERY [-nofocus] <Nick >, öffnet ein neues Dialogfenster [im Hintergrun
 msgid ""
 "QUIET <mask> [<quiettype>], quiet everyone matching the mask in the current "
 "channel if supported by the server."
-msgstr "QUIET <mask>[<quiettype>], stellt jeden im aktuellen Kanal ruhig, der auf diese Maske passt, wenn der Server Ruhigstellen unterstützt."
+msgstr ""
 
 #: ../src/common/outbound.c:4041
 msgid "QUIT [<reason>], disconnects from the current server"
@@ -780,7 +780,7 @@ msgstr "UNLOAD <Name>, entfernt ein Plugin oder Skript"
 msgid ""
 "UNQUIET <mask> [<mask>...], unquiets the specified masks if supported by the"
 " server."
-msgstr "UNQUIET <mask> [<mask>...], hebt eine Maske auf, die für automatische Ruhigstellung benutzt wird, wenn der Server es unterstützt."
+msgstr ""
 
 #: ../src/common/outbound.c:4090
 msgid "URL <url>, opens a URL in your browser"
@@ -874,27 +874,27 @@ msgstr "%C18*%O$t%C18$1%O zur Benachrichtigungsliste hinzugefügt."
 
 #: ../src/common/textevents.h:9
 msgid "%C22*%O$t%C22$1%O: %C18$2%O on %C24$4%O by %C26$3%O"
-msgstr "%C22*%O$t%C22$1%O: %C18$2%O auf %C24$4%O von %C26$3%O"
+msgstr ""
 
 #: ../src/common/textevents.h:12
 msgid "%C22*%O$tCannot join %C22$1 %O(%C20You are banned%O)."
-msgstr "%C22*%O$t Kann nicht betreten: %C22$1 %O(%C20Du wurdest gebannt%O)."
+msgstr ""
 
 #: ../src/common/textevents.h:18
 msgid "%C29*%O$tCapabilities acknowledged: %C29$2%O"
-msgstr "%C29*%O$tRechte erteilt: %C29$2%O"
+msgstr ""
 
 #: ../src/common/textevents.h:21
 msgid "%C23*%O$tCapabilities supported: %C29$2%O"
-msgstr "%C23*%O$tRechte unterstützt: %C29$2%O"
+msgstr ""
 
 #: ../src/common/textevents.h:24
 msgid "%C23*%O$tCapabilities requested: %C29$1%O"
-msgstr "%C23*%O$tRechte erbeten: %C29$1%O"
+msgstr ""
 
 #: ../src/common/textevents.h:27
 msgid "%C24*%O$t%C28$1%O is now known as %C18$2%O"
-msgstr "%C24*%O$t%C28$1%O heißt jetzt %C18$2%O"
+msgstr ""
 
 #: ../src/common/textevents.h:36
 msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
@@ -902,7 +902,7 @@ msgstr "%C22*%O$t%C26$1%O setzt einen Bann auf %C18$2%O"
 
 #: ../src/common/textevents.h:39
 msgid "%C22*%O$tChannel %C22$1%O created on %C24$2%O"
-msgstr "%C22*%O$tKanal %C22$1%O wurde erstellt am %C24$2%O"
+msgstr ""
 
 #: ../src/common/textevents.h:42
 msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
@@ -918,15 +918,15 @@ msgstr "%C22*%O$t%C26$1%O entfernt Voice-Status bei%C26 $2"
 
 #: ../src/common/textevents.h:51
 msgid "%C22*%O$t%C26$1%C sets exempt on %C18$2%O"
-msgstr "%C22*%O$t%C26$1%C setzt Ausnahme für %C18$2%O"
+msgstr ""
 
 #: ../src/common/textevents.h:54
 msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O erteilt %C18$2%O Halb-Operator-Status"
+msgstr ""
 
 #: ../src/common/textevents.h:57
 msgid "%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O"
-msgstr "%C22*%O$t%C26$1%C setzt Invite-Ausnahme für %C18$2%O"
+msgstr ""
 
 #: ../src/common/textevents.h:60
 msgid "%UChannel          Users   Topic"
@@ -1481,7 +1481,7 @@ msgstr "Server-Name"
 
 #: ../src/common/text.c:1060
 msgid "Acknowledged Capabilities"
-msgstr "Verliehene Rechte"
+msgstr ""
 
 #: ../src/common/text.c:1065
 msgid "Server Capabilities"
@@ -1489,7 +1489,7 @@ msgstr "Server-Fähigkeiten"
 
 #: ../src/common/text.c:1069
 msgid "Requested Capabilities"
-msgstr "Angeforderte Rechte"
+msgstr ""
 
 #: ../src/common/text.c:1073 ../src/common/text.c:1135
 msgid "Old nickname"
@@ -1637,11 +1637,11 @@ msgstr "Die Bannmaske"
 
 #: ../src/common/text.c:1201
 msgid "The nick of the person who did the quieting"
-msgstr "Der Nick der Person, die ruhig stellte"
+msgstr ""
 
 #: ../src/common/text.c:1202 ../src/common/text.c:1234
 msgid "The quiet mask"
-msgstr "Die Ruhigstellungsmaske"
+msgstr ""
 
 #: ../src/common/text.c:1206
 msgid "The nick who removed the key"
@@ -1681,7 +1681,7 @@ msgstr "Der Nick der Person, die den Bann entfernte"
 
 #: ../src/common/text.c:1233
 msgid "The nick of the person of did the unquiet'ing"
-msgstr "Nick der Person, die die Ruhigstellung aufhob"
+msgstr ""
 
 #: ../src/common/text.c:1238
 msgid "The nick of the person who did the exempt"
@@ -3110,11 +3110,11 @@ msgstr "Einlad."
 
 #: ../src/fe-gtk/banlist.c:76
 msgid "Quiets"
-msgstr "Ruhigstellungen"
+msgstr ""
 
 #: ../src/fe-gtk/banlist.c:77
 msgid "Quiet"
-msgstr "Ruhigstellen"
+msgstr ""
 
 #. poor way to get which is selected but it works
 #: ../src/fe-gtk/banlist.c:351 ../src/fe-gtk/banlist.c:385
@@ -3405,7 +3405,7 @@ msgstr "Plugins nicht automatisch laden"
 
 #: ../src/fe-gtk/fe-gtk.c:83
 msgid "Show plugin/script auto-load directory"
-msgstr "Zeige automatisches Ladeverzeichnis für Plugins/Scripte"
+msgstr ""
 
 #: ../src/fe-gtk/fe-gtk.c:84
 msgid "Show user config directory"
@@ -3475,7 +3475,7 @@ msgid ""
 "switch to the page with the most recent and important activity (queries "
 "first, then channels with hilight, channels with dialogue, channels with "
 "other data)"
-msgstr "Der \"Seite ändern\" Befehl wechselt zwischen den Seiten im Notizblock. Setze \"Data 1\" auf die Seite, zu der du wechseln möchtest. Wenn \"Data 2\" festgelegt wurde, wird der Wechsel relativ zur aktuellen Position erfolgen. Setze \"Data 1\", um automatisch zu der Seite mit den neuesten und wichtigsten Aktivitäten (Privatchats zuerst, dann Kanäle mit Highlight, Kanäle mit Dialog, Kanäle mit anderen Daten) zu wechseln."
+msgstr ""
 
 #: ../src/fe-gtk/fkeys.c:145
 msgid ""
@@ -3487,7 +3487,7 @@ msgstr "Die Insert in Buffer Aktion fügt den Inhalt von »Data 1« in die Zei
 msgid ""
 "The Scroll Page command scrolls the text widget up or down one page or one"
 " line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
-msgstr "Der Bildlauf-Befehl verschiebt das Text-Widget um eine Seite oder eine Zeile aufwärts oder abwärts. Setze \"Data 1\" Anfang, Ende oder Auf, Ab um +1 oder -1."
+msgstr ""
 
 #: ../src/fe-gtk/fkeys.c:149
 msgid ""
@@ -3552,7 +3552,7 @@ msgstr "Fehler beim Laden der Tastaturkürzel-Konfiguration"
 
 #: ../src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
-msgstr "Markiere eine Zeile, für Hilfestellung über die jeweilige Aktion."
+msgstr ""
 
 #: ../src/fe-gtk/fkeys.c:809
 msgid ": Keyboard Shortcuts"
@@ -3859,7 +3859,7 @@ msgstr "Suche beendet, kein Treffer."
 
 #: ../src/fe-gtk/maingui.c:2944
 msgid "Highlight _all"
-msgstr "Highlight _alle"
+msgstr ""
 
 #: ../src/fe-gtk/maingui.c:2950
 msgid "Highlight all occurrences, and underline the current occurrence."
@@ -3867,7 +3867,7 @@ msgstr "Hebe alle Vorkommnisse hervor und unterstreiche das aktuelle Vorkommnis.
 
 #: ../src/fe-gtk/maingui.c:2952
 msgid "Mat_ch case"
-msgstr "Groß-/Kleins_chreibung angleichen"
+msgstr ""
 
 #: ../src/fe-gtk/maingui.c:2957
 msgid "Perform a case-sensitive search."
@@ -3875,7 +3875,7 @@ msgstr "Eine Case-Sensitive Suche ausführen"
 
 #: ../src/fe-gtk/maingui.c:2959
 msgid "_Regex"
-msgstr "_Regulärer Ausdruck"
+msgstr ""
 
 #: ../src/fe-gtk/maingui.c:2964
 msgid "Regard search string as a regular expression."
@@ -3973,7 +3973,7 @@ msgstr "Automatisches Betreten"
 
 #: ../src/fe-gtk/menu.c:1113 ../src/fe-gtk/menu.c:1117
 msgid "_Auto-Connect"
-msgstr "_Automatisches Verbinden"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1137
 msgid ": User menu"
@@ -3998,7 +3998,7 @@ msgstr "Markierungslinie manuell zurücksetzen"
 
 #: ../src/fe-gtk/menu.c:1304
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr "Markierungslinie wurde zurückgesetzt, weil die begrenzung des Scrollbalkens überschritten wurde."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1306
 msgid "Marker line reset by CLEAR command."
@@ -4014,7 +4014,7 @@ msgstr "Empfange Channelliste …"
 
 #: ../src/fe-gtk/menu.c:1461
 msgid " has been build without plugin support."
-msgstr "wurde ohne Plugin-Support erstellt"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1469
 msgid ""
@@ -4215,7 +4215,7 @@ msgstr "Grafisch"
 
 #: ../src/fe-gtk/menu.c:1785
 msgid "_Fullscreen"
-msgstr "_Vollbild"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1787
 msgid "_Server"
@@ -4231,15 +4231,15 @@ msgstr "_Wiederverbinden"
 
 #: ../src/fe-gtk/menu.c:1790
 msgid "_Join a Channel..."
-msgstr "_Betrete einen Kanal"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1791
 msgid "_List of Channels..."
-msgstr "_Liste aller Kanäle"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1794
 msgid "Marked _Away"
-msgstr "Als _Abwesend markiert"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1796
 msgid "_Usermenu"
@@ -4297,7 +4297,7 @@ msgstr "_Fenster"
 
 #: ../src/fe-gtk/menu.c:1812
 msgid "_Ban List..."
-msgstr "_Bannliste"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1813
 msgid "Character Chart..."
@@ -4309,7 +4309,7 @@ msgstr "Direktchat …"
 
 #: ../src/fe-gtk/menu.c:1815
 msgid "File _Transfers..."
-msgstr "Dateiüber_tragung"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1816
 msgid "Friends List..."
@@ -4321,11 +4321,11 @@ msgstr "Ignorierliste …"
 
 #: ../src/fe-gtk/menu.c:1818
 msgid "_Plugins and Scripts..."
-msgstr "_Plugins und Scripte"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1819
 msgid "_Raw Log..."
-msgstr "_Roher Log"
+msgstr ""
 
 #. 61
 #: ../src/fe-gtk/menu.c:1820
@@ -4564,11 +4564,11 @@ msgstr "_Laden …"
 
 #: ../src/fe-gtk/plugingui.c:270
 msgid "_Unload"
-msgstr "_Entladen"
+msgstr ""
 
 #: ../src/fe-gtk/plugingui.c:273
 msgid "_Reload"
-msgstr "_Neu laden"
+msgstr ""
 
 #: ../src/fe-gtk/rawlog.c:80 ../src/fe-gtk/rawlog.c:136
 #: ../src/fe-gtk/textgui.c:479 ../src/fe-gtk/urlgrab.c:216
@@ -4694,7 +4694,7 @@ msgstr "Passwort:"
 
 #: ../src/fe-gtk/servlistgui.c:1885
 msgid "Password used for login. If in doubt, leave blank."
-msgstr "Passwort zum Einloggen. Im Zweifel leer lassen."
+msgstr ""
 
 #: ../src/fe-gtk/servlistgui.c:1890
 msgid "Character set:"
@@ -5106,11 +5106,11 @@ msgstr "Nickvervollständigung sortiert nach:"
 
 #: ../src/fe-gtk/setup.c:205
 msgid "Nick completion amount:"
-msgstr "Anzahl Nickvervollständigung"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:205
 msgid "Threshold of nicks to start listing instead of completing"
-msgstr "Schwellwert zum Auflisten von Nicks anstatt Vervollständigung"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:205
 msgid "nicks."
@@ -5303,7 +5303,7 @@ msgstr "Neue Reiter im Vordergrund:"
 
 #: ../src/fe-gtk/setup.c:319
 msgid "Placement of notices:"
-msgstr "Plaziern von Notizen:"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:320
 msgid "Show channel switcher at:"
@@ -5436,7 +5436,7 @@ msgstr "Symbol im Benachrichtigungsbereich blinken lassen bei:"
 
 #: ../src/fe-gtk/setup.c:404
 msgid "Bounce dock icon on:"
-msgstr "Dock-Icon springen lassen bei:"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:407 ../src/fe-gtk/setup.c:453
 msgid "Blink task bar on:"
@@ -5451,17 +5451,17 @@ msgstr "Piepsen bei:"
 msgid ""
 "Play the \"Instant Message Notification\" system sound upon the selected "
 "events"
-msgstr "Den \"Sofortnachrichten-Benachrichtigungs\"-Systemton bei folgenden Ereignissen abspielen:"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:414
 msgid ""
 "Play \"message-new-instant\" from the freedesktop.org sound theme upon the "
 "selected events"
-msgstr "Den \"message-new-instant\"-Ton aus dem freedesktop.org Soundthema bei ausgewählten Ereignissen abspielen"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:416
 msgid "Play a GTK beep upon the selected events"
-msgstr "einen GTK Piepton bei den ausgewählten Ereignissen abspielen"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:420 ../src/fe-gtk/setup.c:456
 msgid "Omit alerts when marked as being away"
@@ -5489,7 +5489,7 @@ msgstr "Ins Infofeld schließen"
 
 #: ../src/fe-gtk/setup.c:431
 msgid "Automatically mark away/back"
-msgstr "Automatisch als abwesend/zurück markieren"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:431
 msgid "Automatically change status when hiding to tray."
@@ -5497,7 +5497,7 @@ msgstr "Status automatisch wechseln, wenn das Programm in den Tray geschlossen w
 
 #: ../src/fe-gtk/setup.c:433
 msgid "Only show tray balloons when hidden or iconified"
-msgstr "Balloon-Tipps nur anzeigen, wenn minimiert oder im Tray"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:436 ../src/fe-gtk/setup.c:459
 msgid "Highlighted Messages"
@@ -5668,7 +5668,7 @@ msgstr "Benutze Serverzeit, wenn unterstützt"
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr "Zeitstempel vom Server holen, wenn die \"Time-Server\"-Erweiterung unterstützt wird."
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:521
 msgid "Automatically reconnect to servers on disconnect"
@@ -5684,13 +5684,13 @@ msgstr "Verzögerung beim automatischen Betreten:"
 
 #: ../src/fe-gtk/setup.c:524
 msgid "Ban Type:"
-msgstr "Bannart:"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:524
 msgid ""
 "Attempt to use this banmask when banning or quieting. (requires "
 "irc_who_join)"
-msgstr "Versuchen, diese Bannmaske zu benutzen, wenn gebannt oder ruhiggestellt wird. (benötigt irc_who_join)"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:531 ../src/fe-gtk/setup.c:1817
 msgid "Logging"
@@ -5795,7 +5795,7 @@ msgstr "Nur für Computer mit mehreren Adressen."
 
 #: ../src/fe-gtk/setup.c:585
 msgid "File Transfers"
-msgstr "Dateiübertragungen"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:586
 msgid "Get my address from the IRC server"
@@ -5997,7 +5997,7 @@ msgstr "Chatten"
 
 #: ../src/fe-gtk/setup.c:1816
 msgid "Sounds"
-msgstr "Töne"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:1818
 msgid "Advanced"
@@ -6062,12 +6062,12 @@ msgstr "Ignoriere Alles"
 
 #: ../src/fe-gtk/sexy-spell-entry.c:711
 msgid "Spelling Suggestions"
-msgstr "Rechtschreib-Vorschläge"
+msgstr ""
 
 #: ../src/fe-gtk/sexy-spell-entry.c:1272
 #, c-format
 msgid "enchant error for language: %s"
-msgstr "Fehler in der enchant-Bibliothek in Sprache: %s"
+msgstr ""
 
 #: ../src/fe-gtk/textgui.c:171
 msgid "There was an error parsing the string"

po/el.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Filippos Soulakis <txapollo243@gmail.com>, 2013
+# txapollo243 <txapollo243@gmail.com>, 2013
 # Stathis Kamperis <ekamperi@auth.gr>, 2006
 # Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2013
 msgid ""

po/en_GB.po

@@ -3,19 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Alfred Daw <sacarasc@gmail.com>, 2013
+# sacarasc <sacarasc@gmail.com>, 2013
 # Sir_Burpalot <doctor.z01db3rg@gmail.com>, 2014
 # Gareth Owen <gowen72@yahoo.com>, 2004
-# Ivan Srbulov <Srbulov.Ivan@gmail.com>, 2013
-# Richard Hitt <rbh00@netcom.com>, 2013
-# Alfred Daw <sacarasc@gmail.com>, 2012
+# tea <Srbulov.Ivan@gmail.com>, 2013
+# rbh00 <rbh00@netcom.com>, 2013
+# sacarasc <sacarasc@gmail.com>, 2012
 # TheEndermen <theendermenofdoom@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-07-09 19:40+0000\n"
+"PO-Revision-Date: 2014-05-21 20:52+0000\n"
 "Last-Translator: Sir_Burpalot <doctor.z01db3rg@gmail.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/hexchat/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -126,7 +126,7 @@ msgstr "No active DCCs\n"
 
 #: ../src/common/hexchat.c:867
 msgid "_Open Dialog Window"
-msgstr "_Open Dialogue Window"
+msgstr "_Open Dialog Window"
 
 #: ../src/common/hexchat.c:868
 msgid "_Send a File"
@@ -3670,7 +3670,7 @@ msgstr "_Always show this dialog after connecting."
 
 #: ../src/fe-gtk/maingui.c:397
 msgid "Dialog with"
-msgstr "Dialogue with"
+msgstr "Dialog with"
 
 #: ../src/fe-gtk/maingui.c:695
 #, c-format
@@ -3686,7 +3686,7 @@ msgstr "No topic is set"
 msgid ""
 "This server still has %d channels or dialogs associated with it. Close them "
 "all?"
-msgstr "This server still has %d channels or dialogues associated with it. Close them all?"
+msgstr "This server still has %d channels or dialogs associated with it. Close them all?"
 
 #: ../src/fe-gtk/maingui.c:1203
 msgid "Quit HexChat?"
@@ -4056,7 +4056,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr "Dialogue Buttons - Special codes:\n\n%a  =  all selected nicks\n%c  =  current channel\n%e  =  current network name\n%h  =  selected nick's hostname\n%m  =  machine info\n%n  =  your nick\n%s  =  selected nick\n%t  =  time/date\n%u  =  selected users account"
+msgstr "Dialog Buttons - Special codes:\n\n%a  =  all selected nicks\n%c  =  current channel\n%e  =  current network name\n%h  =  selected nick's hostname\n%m  =  machine info\n%n  =  your nick\n%s  =  selected nick\n%t  =  time/date\n%u  =  selected users account"
 
 #: ../src/fe-gtk/menu.c:1507
 msgid ""
@@ -4112,7 +4112,7 @@ msgstr ": Userlist buttons"
 
 #: ../src/fe-gtk/menu.c:1574
 msgid ": Dialog buttons"
-msgstr ": Dialogue buttons"
+msgstr ": Dialog buttons"
 
 #: ../src/fe-gtk/menu.c:1581
 msgid ": CTCP Replies"
@@ -4428,7 +4428,7 @@ msgstr ": Friends List"
 
 #: ../src/fe-gtk/notifygui.c:429
 msgid "Open Dialog"
-msgstr "Open Dialogue"
+msgstr "Open Dialog"
 
 #: ../src/fe-gtk/plugin-tray.c:264
 #, c-format

po/es.po

@@ -4,18 +4,16 @@
 # 
 # Translators:
 # bviktor, 2012
-# bviktor, 2012
-# Víctor <vegadark89@gmail.com>, 2013-2014
-# Víctor <vegadark89@gmail.com>, 2012-2013
-# Víctor <vegadark89@gmail.com>, 2014
-# Víctor <vegadark89@gmail.com>, 2014
+# Víctor منتصر <vegadark89@gmail.com>, 2013-2014
+# Víctor منتصر <vegadark89@gmail.com>, 2012-2013
+# Víctor منتصر <vegadark89@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-09-25 00:30+0000\n"
-"Last-Translator: Gato Loko\n"
+"PO-Revision-Date: 2014-05-14 17:34+0000\n"
+"Last-Translator: Víctor منتصر <vegadark89@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/hexchat/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

po/et.po

@@ -5,14 +5,13 @@
 # Translators:
 # Ekke Vasli <ekke@chamber.ee>, 2001
 # Ilmar Kerm <ikerm@hot.ee>, 2002
-# jasva, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-09-28 09:26+0000\n"
-"Last-Translator: jasva\n"
+"PO-Revision-Date: 2014-05-14 17:20+0000\n"
+"Last-Translator: TingPing <tingping@tingping.se>\n"
 "Language-Team: Estonian (http://www.transifex.com/projects/p/hexchat/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,25 +24,25 @@ msgid ""
 "HexChat is an easy to use yet extensible IRC Client. It allows you to "
 "securely join multiple networks and talk to users privately or in channels "
 "using a customizable interface. You can even transfer files."
-msgstr "HexChat on lihtne ja paljude võimalustega IRC klient. See võimaldab turvaliselt ühenduda mitme võrguda samaaegselt ja suhelda inimestega privaatselt või liituda vestluskanalitega, kasutades selleks kohandatavat rakendust. Samuti on võimalus failivahetuseks."
+msgstr ""
 
 #: ../data/misc/hexchat.appdata.xml.in.h:2
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr "HexChat toetab kasutamiseks: DCC, SASL, hoiatusi, logide koguminst, kohandatud teemasid ja Python/Perl skripte."
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:1
 msgid "HexChat"
-msgstr "HexChat"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:2
 msgid "IRC Client"
-msgstr "IRC klient"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:3
 msgid "Chat with other people online"
-msgstr "Vestle teiste kasutajatega internetis"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:4
 msgid "IM;Chat;"
@@ -51,11 +50,11 @@ msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:5
 msgid "Open Safe Mode"
-msgstr "Ava turvarežiim"
+msgstr ""
 
 #: ../data/misc/htm.desktop.in.h:1
 msgid "HexChat Theme Manager"
-msgstr "HexChat teemahaldur"
+msgstr ""
 
 #. 0 means unlimited
 #. STRINGS
@@ -122,27 +121,27 @@ msgstr "Ei ole ühtegi aktiivset DCCd\n"
 
 #: ../src/common/hexchat.c:867
 msgid "_Open Dialog Window"
-msgstr "_Ava dialoogiaken"
+msgstr ""
 
 #: ../src/common/hexchat.c:868
 msgid "_Send a File"
-msgstr "_Saada fail"
+msgstr ""
 
 #: ../src/common/hexchat.c:869
 msgid "_User Info (WhoIs)"
-msgstr "_Kasutaja info (Whois)"
+msgstr ""
 
 #: ../src/common/hexchat.c:870
 msgid "_Add to Friends List"
-msgstr "_Lisa sõprade nimekirja"
+msgstr ""
 
 #: ../src/common/hexchat.c:871
 msgid "_Ignore"
-msgstr "_Ignoreeri"
+msgstr ""
 
 #: ../src/common/hexchat.c:872
 msgid "O_perator Actions"
-msgstr "O_peraatori toimingud"
+msgstr ""
 
 #: ../src/common/hexchat.c:874
 msgid "Give Ops"
@@ -223,7 +222,7 @@ msgstr "Põhjus %s väljaviskamiseks:"
 
 #: ../src/common/hexchat.c:920
 msgid "Sendfile"
-msgstr "Saada fail"
+msgstr ""
 
 #: ../src/common/hexchat.c:921
 msgid "Dialog"
@@ -255,7 +254,7 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr "Sul puuduvad kirjutamisõigused asukohta %s. Sellest sessioonist ei salvestata midagi."
+msgstr ""
 
 #: ../src/common/hexchat.c:1139
 msgid ""
@@ -285,7 +284,7 @@ msgstr "%s ujutab sind CTCP päringutega üle, ignoreerin kasutajat %s\n"
 #: ../src/common/ignore.c:410
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr "%s uputab sind üle massiliste sõnumitega, mistõttu lülitame gui_autoopen_dialog VÄLJA.\n"
+msgstr ""
 
 #: ../src/common/notify.c:558
 #, c-format
@@ -308,12 +307,12 @@ msgstr "Pole ühendatud. Proovi /server <host> [<port>]\n"
 #: ../src/common/outbound.c:280
 #, c-format
 msgid "Server %s already exists on network %s.\n"
-msgstr "Server %s eksisteerib juba võrguloendis %s.\n"
+msgstr ""
 
 #: ../src/common/outbound.c:286
 #, c-format
 msgid "Added server %s to network %s.\n"
-msgstr "Server %s on võrkuda nimekirja %s lisatud.\n"
+msgstr ""
 
 #: ../src/common/outbound.c:371
 #, c-format
@@ -351,7 +350,7 @@ msgstr "Tundmatut parameetrit '%s' ignoreeriti."
 
 #: ../src/common/outbound.c:3093 ../src/common/outbound.c:3123
 msgid "Quiet is not supported by this server."
-msgstr "Vaigistamine pole antud serveris toetatud."
+msgstr ""
 
 #. error
 #: ../src/common/outbound.c:3585 ../src/common/outbound.c:3619
@@ -370,7 +369,7 @@ msgstr "ADDBUTTON <nimi> <tegevus>, lisab kasutajate nimekirja alla uue nupu"
 msgid ""
 "ADDSERVER <NewNetwork> <newserver/6667>, adds a new network with a new "
 "server to the network list"
-msgstr "ADDSERVER <UusVõrk> <uusserver/6667> lisab uue võrgu koos uue serveriga võrguloendisse."
+msgstr ""
 
 #: ../src/common/outbound.c:3904
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
@@ -378,7 +377,7 @@ msgstr "ALLCHAN <käsk>, saadab käsu kõikidele kanalitele, kus oled"
 
 #: ../src/common/outbound.c:3906
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
-msgstr "ALLCHANL <käsk>, saadab käsu kõikidesse kanalitesse antud serveris"
+msgstr ""
 
 #: ../src/common/outbound.c:3908
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"

po/eu.po

@@ -4,15 +4,14 @@
 # 
 # Translators:
 # Mikel Olasagasti <hey_neken@euskal.org>, 2004
-# Mikel Olasagasti Uranga <mikel@olasagasti.info>, 2012
-# Mikel Olasagasti Uranga <mikel@olasagasti.info>, 2014
+# Hey_neken <mikel@olasagasti.info>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-10-13 08:06+0000\n"
-"Last-Translator: Mikel Olasagasti Uranga <mikel@olasagasti.info>\n"
+"PO-Revision-Date: 2014-05-14 17:20+0000\n"
+"Last-Translator: TingPing <tingping@tingping.se>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/hexchat/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,11 +34,11 @@ msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:1
 msgid "HexChat"
-msgstr "HexChat"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:2
 msgid "IRC Client"
-msgstr "IRC bezeroa"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:3
 msgid "Chat with other people online"
@@ -47,7 +46,7 @@ msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:4
 msgid "IM;Chat;"
-msgstr "IM;Chat;Txat;"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:5
 msgid "Open Safe Mode"
@@ -122,7 +121,7 @@ msgstr "Ez dago DCC aktiborik\n"
 
 #: ../src/common/hexchat.c:867
 msgid "_Open Dialog Window"
-msgstr "Ir_eki elkarrizketa leihoa"
+msgstr ""
 
 #: ../src/common/hexchat.c:868
 msgid "_Send a File"
@@ -1139,7 +1138,7 @@ msgstr ""
 #: ../src/common/textevents.h:234
 #, c-format
 msgid "%C16,17                                                              "
-msgstr "%C16,17                                                              "
+msgstr ""
 
 #: ../src/common/textevents.h:237
 #, c-format
@@ -5234,7 +5233,7 @@ msgstr "Eskaria egiten den fitxetan soilik"
 
 #: ../src/fe-gtk/setup.c:293
 msgid "Automatic"
-msgstr "Automatikoa"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:294
 msgid "In an extra tab"
@@ -5325,7 +5324,7 @@ msgstr "Ireki DCC, ezikusi, notifikazio etab. fitxetan ala leihoetan?"
 
 #: ../src/fe-gtk/setup.c:333
 msgid "Messages"
-msgstr "Mezuak"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:334
 msgid "Scrollback"
@@ -5983,7 +5982,7 @@ msgstr "Elkarrizketan"
 
 #: ../src/fe-gtk/setup.c:1816
 msgid "Sounds"
-msgstr "Soinuak"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:1818
 msgid "Advanced"
@@ -6033,7 +6032,7 @@ msgstr ""
 
 #: ../src/fe-gtk/sexy-spell-entry.c:559
 msgid "More..."
-msgstr "Gehiago..."
+msgstr ""
 
 #. + Add to Dictionary
 #: ../src/fe-gtk/sexy-spell-entry.c:631
@@ -6086,7 +6085,7 @@ msgstr "Egiaztatu denak"
 
 #: ../src/fe-gtk/textgui.c:485
 msgid "OK"
-msgstr "Ados"
+msgstr ""
 
 #: ../src/fe-gtk/urlgrab.c:198
 msgid ": URL Grabber"

po/fr.po

@@ -8,16 +8,14 @@
 # Calinou, 2014
 # Misdre <misdre@hexchat.misdre.info>, 2013
 # Misdre <misdre@hexchat.misdre.info>, 2013
-# Towinet, 2014
 # Calinou, 2013
-# Yannick Le Guen <leguen.yannick@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-11-06 16:06+0000\n"
-"Last-Translator: Yannick Le Guen <leguen.yannick@gmail.com>\n"
+"PO-Revision-Date: 2014-05-14 17:20+0000\n"
+"Last-Translator: TingPing <tingping@tingping.se>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/hexchat/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,13 +28,13 @@ msgid ""
 "HexChat is an easy to use yet extensible IRC Client. It allows you to "
 "securely join multiple networks and talk to users privately or in channels "
 "using a customizable interface. You can even transfer files."
-msgstr "HexChat est un client IRC facile à utiliser et extensible. Il vous permet de rejoindre en toute sécurité plusieurs réseaux et de parler à d'autres utilisateurs en privé ou dans des canaux grâce à une interface personnalisable. Vous pouvez même transférer des fichiers."
+msgstr "HexChat est un client IRC facile à utiliser et extensible. Il vous permet de rejoindre en toute sécurité plusieurs réseaux et parler à d'autres utilisateurs en privé ou dans des canaux grâce à une interface personnalisable. Vous pouvez même transférer des fichiers."
 
 #: ../data/misc/hexchat.appdata.xml.in.h:2
 msgid ""
 "HexChat supports features such as: DCC, SASL, proxies, spellcheck, alerts, "
 "logging, custom themes, and Python/Perl scripts."
-msgstr "HexChat prend en charge des fonctionnalités telles que : DCC, SASL, serveurs mandataires, vérification orthographique, alertes, journalisation, thèmes personnalisés et scripts Python et Perl."
+msgstr "HexChat prend en charge des fonctionnalités telles que : DCC, SASL, serveur mandataire, vérification orthographie, alertes, journalisation, thèmes personnalisés et scripts Python et Perl."
 
 #: ../data/misc/hexchat.desktop.in.h:1
 msgid "HexChat"
@@ -557,13 +555,13 @@ msgstr "JOIN <canal>, rejoindre le canal"
 #: ../src/common/outbound.c:3989
 msgid ""
 "KICK <nick> [reason], kicks the nick from the current channel (needs chanop)"
-msgstr "KICK <pseudo> [raison], expulse le pseudo du canal actuel (nécessite d'être opérateur [chanop])"
+msgstr "KICK <pseudo> [raison], expulse le pseudo du canal actuel (opérateur requis)"
 
 #: ../src/common/outbound.c:3991
 msgid ""
 "KICKBAN <nick> [reason], bans then kicks the nick from the current channel "
 "(needs chanop)"
-msgstr "KICKBAN <pseudo> [raison], bannit puis expulse le pseudo du canal actuel (nécessite d'être opérateur [chanop])"
+msgstr "KICKBAN <pseudo> [raison], bannit puis expulse le pseudo du canal actuel (opérateur requis)"
 
 #: ../src/common/outbound.c:3994
 msgid "LAGCHECK, forces a new lag check"
@@ -693,7 +691,7 @@ msgstr "RECV <texte>, envoie des données brutes à HexChat, comme si elles éta
 
 #: ../src/common/outbound.c:4052
 msgid "RELOAD <name>, reloads a plugin or script"
-msgstr "RELOAD <nom>, recharge un greffon ou script"
+msgstr "RELOAD <nom>, recharge un plugin ou script"
 
 #: ../src/common/outbound.c:4054
 msgid "SAY <text>, sends the text to the object in the current window"
@@ -753,7 +751,7 @@ msgid ""
 "TRAY -i <number>                    Blink tray with an internal icon.\n"
 "TRAY -t <text>                      Set the tray tooltip.\n"
 "TRAY -b <title> <text>              Set the tray balloon."
-msgstr "\nTRAY -f <délai> <fichier1> [<fichier2>] Définit les fichiers à utiliser pour faire clignoter l'icône de barre d'état.\nTRAY -f <fichier>                   Définit le fichier à utiliser pour l'icône de barre d'état.\nTRAY -i <numéro>                    Définit une icône interne pour le clignotement de la barre d'état.\nTRAY -t <texte>                     Définit le message d'aide de l'icône de barre d'état.\nTRAY -b <titre> <texte>             Définit le message flottant de l'icône de barre d'état."
+msgstr "\nTRAY -f <délai> <fichier1> [<fichier2>] Spécifie les fichiers à utiliser pour faire clignoter l'icone de barre d'état.\nTRAY -f <fichier>                   Spécifie le fichier à utiliser pour l'icone de barre d'état.\nTRAY -i <numéro>                    Spécifie un icone interne pour le clignotement de la barre d'état.\nTRAY -t <texte>                     Spécifie le message d'aide de l'icone de barre d'état.\nTRAY -b <titre> <texte>             Spécifie le message flottant de l'icone de barre d'état."
 
 #: ../src/common/outbound.c:4085
 msgid "UNBAN <mask> [<mask>...], unbans the specified masks."
@@ -897,11 +895,11 @@ msgstr "%C22*%O$tCanal %C22$1%O créé le %C24$2%O"
 
 #: ../src/common/textevents.h:42
 msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O a enlevé l'état de semi-opérateur de canal à %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O a enlevé le statut de semi-opérateur de canal à %C18$2%O"
 
 #: ../src/common/textevents.h:45
 msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O a enlevé l'état d'opérateur de canal à %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O a enlevé le statut d'opérateur de canal à %C18$2%O"
 
 #: ../src/common/textevents.h:48
 msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
@@ -913,7 +911,7 @@ msgstr "%C22*%O$t%C26$1%C a mis une exception sur %C18$2%O"
 
 #: ../src/common/textevents.h:54
 msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O a donné l'état de semi-opérateur de canal à %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O a donné le statut de semi-opérateur de canal à %C18$2%O"
 
 #: ../src/common/textevents.h:57
 msgid "%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O"
@@ -933,7 +931,7 @@ msgstr "%C22*%O$tCanal %C22$1%O mode : %C24$2"
 
 #: ../src/common/textevents.h:78
 msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
-msgstr "%C22*%O$t%C26$1%O a donné l'état d'opérateur de canal à %C18$2%O"
+msgstr "%C22*%O$t%C26$1%O a donné le statut d'opérateur de canal à %C18$2%O"
 
 #: ../src/common/textevents.h:81
 msgid "%C22*%O$t%C26$1%O sets quiet on %C18$2%O"
@@ -981,7 +979,7 @@ msgstr "%C22*%O$t%C26$1%O a donné la parole à %C18$2%O"
 
 #: ../src/common/textevents.h:114
 msgid "%C23*%O$tConnected. Now logging in."
-msgstr "%C23*%O$tConnecté. Maintenant entrons..."
+msgstr "%C23*%O$tConnecté. maintenant entrons..."
 
 #: ../src/common/textevents.h:117
 msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
@@ -989,7 +987,7 @@ msgstr "%C23*%O$tConnexion à %C29$1%C (%C23$2 :$3%O)"
 
 #: ../src/common/textevents.h:120
 msgid "%C20*%O$tConnection failed (%C20$1%O)"
-msgstr "%C20*%O$tLa connexion a échoué (%C20$1%O)"
+msgstr "%C20*%O$tLa connexion a échouée (%C20$1%O)"
 
 #: ../src/common/textevents.h:123
 msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
@@ -1085,7 +1083,7 @@ msgstr "%C20*%O$tDCC RECV : Impossible d'ouvrir '%C23$1%C' en écriture (%C20$2%
 msgid ""
 "%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
 "instead."
-msgstr "%C23*%O$tLe fichier '%C24$1%C' existe déjà, il sera enregistré sous « %C23$2%O » à la place."
+msgstr "%C23*%O$tLe fichier '%C24$1%C' existe déjà, il sera sauvé sous '%C23$2%O' à la place."
 
 #: ../src/common/textevents.h:192
 msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
@@ -1418,7 +1416,7 @@ msgstr "Hôte de la personne"
 
 #: ../src/common/text.c:1035
 msgid "The account of the person"
-msgstr "Le compte de la personne"
+msgstr ""
 
 #: ../src/common/text.c:1039 ../src/common/text.c:1046
 #: ../src/common/text.c:1053 ../src/common/text.c:1265
@@ -1943,7 +1941,7 @@ msgstr "Connexion réinitialisée à l'autre extrémité"
 
 #: ../src/common/util.c:985
 msgid "Ascension Island"
-msgstr "Ascension, île"
+msgstr "Île Ascension"
 
 #: ../src/common/util.c:986
 msgid "Andorra"
@@ -2371,7 +2369,7 @@ msgstr "Hong-kong"
 
 #: ../src/common/util.c:1092
 msgid "Heard and McDonald Islands"
-msgstr "Heard, île et McDonald, îles"
+msgstr "Heard, île et mcdonald, îles"
 
 #: ../src/common/util.c:1093
 msgid "Honduras"
@@ -3162,7 +3160,7 @@ msgstr "L'ouverture de la liste de bannissements a échoué."
 #: ../src/fe-gtk/banlist.c:813
 #, c-format
 msgid ": Ban List (%s)"
-msgstr ": Liste de bannissement (%s)"
+msgstr "XChat : liste de bannissement (%s)"
 
 #: ../src/fe-gtk/banlist.c:848 ../src/fe-gtk/notifygui.c:425
 msgid "Remove"
@@ -3201,7 +3199,7 @@ msgstr "Copie le suje_t du canal"
 #: ../src/fe-gtk/chanlist.c:720
 #, c-format
 msgid ": Channel List (%s)"
-msgstr ": liste des canaux (%s)"
+msgstr "XChat : liste des canaux (%s)"
 
 #: ../src/fe-gtk/chanlist.c:794
 msgid "_Search"
@@ -3213,7 +3211,7 @@ msgstr "_Télécharger"
 
 #: ../src/fe-gtk/chanlist.c:806
 msgid "Save _List..."
-msgstr "Enregistrer la _Liste..."
+msgstr "Sauver la _Liste"
 
 #. =============================================================
 #: ../src/fe-gtk/chanlist.c:819
@@ -3293,7 +3291,7 @@ msgstr "Impossible de reprendre le même fichier en provenance de deux personnes
 
 #: ../src/fe-gtk/dccgui.c:798
 msgid ": Uploads and Downloads"
-msgstr ": envois et réceptions"
+msgstr "XChat: Envois et réceptions"
 
 #: ../src/fe-gtk/dccgui.c:815 ../src/fe-gtk/dccgui.c:1056
 #: ../src/fe-gtk/notifygui.c:124
@@ -3319,7 +3317,7 @@ msgstr "Envois"
 
 #: ../src/fe-gtk/dccgui.c:858
 msgid "Downloads"
-msgstr "Récupérations"
+msgstr "Récupération"
 
 #: ../src/fe-gtk/dccgui.c:863
 msgid "Details"
@@ -3351,7 +3349,7 @@ msgstr "Ouvrir le dossier..."
 
 #: ../src/fe-gtk/dccgui.c:1045
 msgid ": DCC Chat List"
-msgstr ": liste de Chat DCC"
+msgstr "XChat : liste de Chat DCC"
 
 #: ../src/fe-gtk/dccgui.c:1058
 msgid "Recv"
@@ -3416,7 +3414,7 @@ msgstr "Ouvrir l'URL ou exécuter la commande dans un HexChat existant"
 
 #: ../src/fe-gtk/fe-gtk.c:90
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
-msgstr "Démarré minimisé. 0=Normal 1=Minimisé 2=Dans l'icône d'état"
+msgstr "Démarré minimisé. 0=Normal 1=Minimisé 2=Dans l'icone d'état"
 
 #: ../src/fe-gtk/fe-gtk.c:90
 msgid "level"
@@ -3456,7 +3454,7 @@ msgid ""
 "When run all \\n characters in Data 1 are used to deliminate separate "
 "commands so it is possible to run more than one command. If you want a \\ "
 "in the actual text run then enter \\\\"
-msgstr "La commande d'action Exécuter (Run) lance la donnée dans Data 1 telle que si elle avait été tapée dans la boîte de saisie dans laquelle vous pressez la séquence de touches. Ainsi elle peut contenir du texte (qui sera envoyé à la chaîne/personne), des commandes ou des commandes d'utilisateur. Lorsqu'elle est exécutée tous les caractères \\n dans Données 1 sont utilisés pour délimiter les commandes séparées, afin qu'il soit possible de faire fonctionner davantage qu'une commande. Si vous voulez un \\n dans le texte réel alors entrez \\\\"
+msgstr ""
 
 #: ../src/fe-gtk/fkeys.c:143
 msgid ""
@@ -3466,7 +3464,7 @@ msgid ""
 "switch to the page with the most recent and important activity (queries "
 "first, then channels with hilight, channels with dialogue, channels with "
 "other data)"
-msgstr "La page changements (Change Page) commande le basculement entre les pages du carnet. Si Donnée 2 est paramétrée à n'importe quoi alors le commutateur sera relatif à la position actuelle. Paramétrer Donnée 1 à auto afin de commuter vers la page ayant l'activité la plus récente et la plus fréquente (requêtes d'abord, puis canaux mis en évidence, canaux avec des dialogues, canaux avec d'autres données)"
+msgstr ""
 
 #: ../src/fe-gtk/fkeys.c:145
 msgid ""
@@ -3478,7 +3476,7 @@ msgstr "La commande Insert in Buffer insérera le contenu de Données 1 dans l
 msgid ""
 "The Scroll Page command scrolls the text widget up or down one page or one"
 " line. Set Data 1 to either Top, Bottom, Up, Down, +1 or -1."
-msgstr "La commande Scroll Page fait défiler le widget textuel vers le haut ou vers le bas d'une page ou d'une ligne. Définir Data 1 soit à Top, Bottom, Up, Down, +1 ou -1."
+msgstr ""
 
 #: ../src/fe-gtk/fkeys.c:149
 msgid ""
@@ -3543,11 +3541,11 @@ msgstr "Il y a eu une erreur au chargement de la configuration des raccourcis cl
 
 #: ../src/fe-gtk/fkeys.c:540
 msgid "Select a row to get help information on its Action."
-msgstr "Sélectionner une ligne pour obtenir des informations sur son action."
+msgstr "Sélectionnez une ligne pour obtenir de l'information sur son Action."
 
 #: ../src/fe-gtk/fkeys.c:809
 msgid ": Keyboard Shortcuts"
-msgstr ": raccourcis clavier"
+msgstr "XChat : raccourcis clavier"
 
 #: ../src/fe-gtk/gtkutil.c:108
 msgid "Cannot write to that file."
@@ -3580,7 +3578,7 @@ msgstr "DCC"
 
 #: ../src/fe-gtk/ignoregui.c:165
 msgid "Unignore"
-msgstr "Ne plus ignorer"
+msgstr "Ne plus exclure"
 
 #: ../src/fe-gtk/ignoregui.c:293
 msgid "Are you sure you want to remove all ignores?"
@@ -3592,7 +3590,7 @@ msgstr "Entrer le masque d'exclusion :"
 
 #: ../src/fe-gtk/ignoregui.c:350
 msgid ": Ignore list"
-msgstr ": liste d'ignorance"
+msgstr "XChat : liste d'ignorance"
 
 #: ../src/fe-gtk/ignoregui.c:358
 msgid "Ignore Stats:"
@@ -3628,7 +3626,7 @@ msgstr "Le nom de canal est trop court, veuillez réessayer."
 
 #: ../src/fe-gtk/joind.c:133
 msgid ": Connection Complete"
-msgstr ": fin de la procédure de connexion"
+msgstr "XChat : fin de la procédure de connexion"
 
 #: ../src/fe-gtk/joind.c:161
 #, c-format
@@ -3691,7 +3689,7 @@ msgstr "Ce serveur comporte déjà %d canaux ou dialogues qui lui sont associés
 
 #: ../src/fe-gtk/maingui.c:1203
 msgid "Quit HexChat?"
-msgstr "Quitter HexChat ?"
+msgstr "Quitter HeXChat ?"
 
 #: ../src/fe-gtk/maingui.c:1223
 msgid "Don't ask next time."
@@ -3756,7 +3754,7 @@ msgstr "_Recharger le tampon"
 
 #: ../src/fe-gtk/maingui.c:1540
 msgid "Strip _Colors"
-msgstr "Enlever les _couleurs"
+msgstr "Enlever les couleurs"
 
 #: ../src/fe-gtk/maingui.c:1541
 msgid "_Hide Join/Part Messages"
@@ -3776,7 +3774,7 @@ msgstr "Faire clignoter l'_icône de barre d'état"
 
 #: ../src/fe-gtk/maingui.c:1556
 msgid "Blink Task _Bar"
-msgstr "Faire clignoter la _barre des tâches"
+msgstr "Faire clignoter la _barre d'état"
 
 #: ../src/fe-gtk/maingui.c:1569 ../src/fe-gtk/maingui.c:1689
 #: ../src/fe-gtk/maingui.c:3386
@@ -3798,7 +3796,7 @@ msgstr "La limite d'utilisateurs doit être un nombre !\n"
 
 #: ../src/fe-gtk/maingui.c:2066
 msgid "Filter Colors"
-msgstr "Filtrer les couleurs"
+msgstr "Couleurs de filtre"
 
 #: ../src/fe-gtk/maingui.c:2067
 msgid "No outside messages"
@@ -3858,7 +3856,7 @@ msgstr "Mettre en surbrillance toutes les occurrences et souligner l'occurrence
 
 #: ../src/fe-gtk/maingui.c:2952
 msgid "Mat_ch case"
-msgstr "Sensible à la _casse"
+msgstr "Sensible à la _case"
 
 #: ../src/fe-gtk/maingui.c:2957
 msgid "Perform a case-sensitive search."
@@ -3866,11 +3864,11 @@ msgstr "Réaliser une recherche sensible à la casse."
 
 #: ../src/fe-gtk/maingui.c:2959
 msgid "_Regex"
-msgstr "Expression _rationnelle"
+msgstr "_Rege"
 
 #: ../src/fe-gtk/maingui.c:2964
 msgid "Regard search string as a regular expression."
-msgstr "Traiter la chaîne de recherche comme une expression rationnelle."
+msgstr "Voir la chaîne de recherche comme une expression régulière."
 
 #: ../src/fe-gtk/menu.c:115
 msgid "Host unknown"
@@ -3956,19 +3954,19 @@ msgstr "Cycler canal"
 
 #: ../src/fe-gtk/menu.c:1077
 msgid "_Autojoin"
-msgstr "Rejoindre _automatiquement"
+msgstr "Rejoindre automatiquement si expulsé"
 
 #: ../src/fe-gtk/menu.c:1079
 msgid "Autojoin Channel"
-msgstr "Rejoindre le canal automatiquement"
+msgstr "Joindre le canal automatiquement"
 
 #: ../src/fe-gtk/menu.c:1113 ../src/fe-gtk/menu.c:1117
 msgid "_Auto-Connect"
-msgstr "Connexion _automatique"
+msgstr "Connexion automatique"
 
 #: ../src/fe-gtk/menu.c:1137
 msgid ": User menu"
-msgstr ": menu utilisateur"
+msgstr "XChat : menu utilisateur"
 
 #. sep
 #: ../src/fe-gtk/menu.c:1146
@@ -3977,27 +3975,27 @@ msgstr "Éditer ce menu..."
 
 #: ../src/fe-gtk/menu.c:1292
 msgid "Marker line disabled."
-msgstr "Ligne de repérage désactivée."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1298
 msgid "Marker line never set."
-msgstr "Ligne de repérage jamais définie."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1302
 msgid "Marker line reset manually."
-msgstr "Ligne de repérage repositionnée manuellement."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1304
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr "Ligne de repérage repositionnée à cause de la limite de défilement."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1306
 msgid "Marker line reset by CLEAR command."
-msgstr "Ligne de repérage repositionnée avec la commande CLEAR."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1308
 msgid "Marker line state unknown."
-msgstr "État de la ligne de repérage inconnu."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1395
 msgid "Retrieve channel list..."
@@ -4005,7 +4003,7 @@ msgstr "Récupérer la liste des canaux..."
 
 #: ../src/fe-gtk/menu.c:1461
 msgid " has been build without plugin support."
-msgstr "a été compilé sans prise en charge des greffons."
+msgstr "a été compilé sans prise en charge des extensions."
 
 #: ../src/fe-gtk/menu.c:1469
 msgid ""
@@ -4042,7 +4040,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr "Boutons de la liste d'utilisateurs - codes spéciaux :\n\n%a = tous les pseudos sélectionnés\n%c = canal actuel\n%e = nom du réseau actuel\n%h = hôte des pseudos sélectionnés\n%m = informations sur la machine\n%n = votre pseudo\n%s = pseudo sélectionné\n%t = date et heure\n%u = nom de compte des pseudos sélectionnés"
+msgstr "Bouttons de la liste d'utilisateurs - codes spéciaux :\n\n%a = tous les pseudos sélectionnés\n%c = canal actuel\n%e = nom du réseau actuel\n%h = hôte des pseudos sélectionnés\n%m = information machine\n%n = votre pseudo\n%s = pseudo sélectionné\n%t = date et heure\n%u = nom de compte des pseudos sélectionnés"
 
 #: ../src/fe-gtk/menu.c:1496
 msgid ""
@@ -4057,7 +4055,7 @@ msgid ""
 "%s  =  selected nick\n"
 "%t  =  time/date\n"
 "%u  =  selected users account"
-msgstr "Boutons de dialogue - codes spéciaux :\n\n%a = tous les pseudos sélectionnés\n%c = canal actuel\n%e = nom du réseau actuel\n%h = hôte du pseudo sélectionné\n% = informations sur la machine\n%n = votre pseudo\n%s = pseudo sélectionné\n%t = date et heure\n%u = nom de compte du pseudo sélectionné"
+msgstr "Boutons de dialogue - codes spéciaux :\n\n%a = tous les pseudos sélectionnés\n%c = canal actuel\n%e = nom du réseau actuel\n%h = hôte du pseudo sélectionné\n% = information machine\n%n = votre pseudo\n%s = pseudo sélectionné\n%t = date et heure\n%u = nom de compte du pseudo sélectionné"
 
 #: ../src/fe-gtk/menu.c:1507
 msgid ""
@@ -4089,11 +4087,11 @@ msgstr "Gestionnaire d'URL - Codes d'échappement :\n\n%s  =  la chaîne URL\n\n
 
 #: ../src/fe-gtk/menu.c:1527
 msgid ": User Defined Commands"
-msgstr ": commandes définies par l'utilisateur"
+msgstr "XChat : commandes définies par l'utilisateur"
 
 #: ../src/fe-gtk/menu.c:1534
 msgid ": Userlist Popup menu"
-msgstr ": menu de la liste des utilisateurs"
+msgstr "XChat : menu de la liste des utilisateurs"
 
 #: ../src/fe-gtk/menu.c:1541
 msgid "Replace with"
@@ -4101,23 +4099,23 @@ msgstr "Remplacer par"
 
 #: ../src/fe-gtk/menu.c:1541
 msgid ": Replace"
-msgstr ": remplacer"
+msgstr "XChat : remplacer"
 
 #: ../src/fe-gtk/menu.c:1548
 msgid ": URL Handlers"
-msgstr ": gestionnaires d'URL"
+msgstr "XChat : gestionnaires d'URL"
 
 #: ../src/fe-gtk/menu.c:1567
 msgid ": Userlist buttons"
-msgstr ": boutons de la liste des utilisateurs"
+msgstr "XChat : boutons de la liste des utilisateurs"
 
 #: ../src/fe-gtk/menu.c:1574
 msgid ": Dialog buttons"
-msgstr ": boutons de dialogue"
+msgstr "XChat : boutons de dialogue"
 
 #: ../src/fe-gtk/menu.c:1581
 msgid ": CTCP Replies"
-msgstr ": réponses CTCP"
+msgstr "XChat : réponses CTCP"
 
 #: ../src/fe-gtk/menu.c:1743
 msgid "He_xChat"
@@ -4226,15 +4224,15 @@ msgstr "Re_joindre un canal..."
 
 #: ../src/fe-gtk/menu.c:1791
 msgid "_List of Channels..."
-msgstr "_Liste des canaux..."
+msgstr "_Liste de canaux..."
 
 #: ../src/fe-gtk/menu.c:1794
 msgid "Marked _Away"
-msgstr "Se marquer _absent"
+msgstr "Marqué _absent"
 
 #: ../src/fe-gtk/menu.c:1796
 msgid "_Usermenu"
-msgstr "Menu de l'_utilisateur"
+msgstr "Menu de l_utilisateur"
 
 #. 40
 #: ../src/fe-gtk/menu.c:1798
@@ -4312,7 +4310,7 @@ msgstr "Liste d'ignorance..."
 
 #: ../src/fe-gtk/menu.c:1818
 msgid "_Plugins and Scripts..."
-msgstr "_Greffons et scripts..."
+msgstr "_Plugins et scripts..."
 
 #: ../src/fe-gtk/menu.c:1819
 msgid "_Raw Log..."
@@ -4329,7 +4327,7 @@ msgstr "Repositionner la ligne de repérage"
 
 #: ../src/fe-gtk/menu.c:1823
 msgid "Move to Marker Line"
-msgstr "Aller à la ligne de repérage"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1824
 msgid "_Copy Selection"
@@ -4421,7 +4419,7 @@ msgstr "Notifier depuis les réseaux suivants :"
 
 #: ../src/fe-gtk/notifygui.c:381
 msgid "Comma separated list of networks is accepted."
-msgstr "Une liste de réseaux séparés par une virgule est acceptée."
+msgstr "Entrez les réseaux séparés par une virgule."
 
 #: ../src/fe-gtk/notifygui.c:407
 msgid ": Friends List"
@@ -4434,7 +4432,7 @@ msgstr "Ouvrir la fenêtre de dialogue"
 #: ../src/fe-gtk/plugin-tray.c:264
 #, c-format
 msgid ": Connected to %u networks and %u channels"
-msgstr ": Vous êtes connecté à %u réseaux et %u canaux"
+msgstr "XChat : Vous êtes connecté à %u réseaux et %u canaux"
 
 #: ../src/fe-gtk/plugin-tray.c:628
 msgid "_Restore Window"
@@ -4463,7 +4461,7 @@ msgstr "Messages en surbrillance"
 #. blink_item (BIT_FILEOFFER, submenu, _("File Offer"));
 #: ../src/fe-gtk/plugin-tray.c:640
 msgid "_Change status"
-msgstr "_Changer d'état"
+msgstr "_Changer l'état"
 
 #: ../src/fe-gtk/plugin-tray.c:646
 msgid "_Away"
@@ -4476,12 +4474,12 @@ msgstr "_Retour"
 #: ../src/fe-gtk/plugin-tray.c:714
 #, c-format
 msgid ": Highlighted message from: %s (%s)"
-msgstr ": Message en surbrillance de %s (%s)"
+msgstr "XChat : Message en surbrillance de %s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:717
 #, c-format
 msgid ": %u highlighted messages, latest from: %s (%s)"
-msgstr ": %u messages en surbrillance. Le dernier est de %s (%s)"
+msgstr "XChat : %u messages en surbrillance. Le dernier est de %s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:722
 #, c-format
@@ -4506,12 +4504,12 @@ msgstr "Message de canal de : %s (%s)"
 #: ../src/fe-gtk/plugin-tray.c:771
 #, c-format
 msgid ": Private message from: %s (%s)"
-msgstr ": Message privé de %s (%s)"
+msgstr "XChat : Message privé de %s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:774
 #, c-format
 msgid ": %u private messages, latest from: %s (%s)"
-msgstr ": %u messages privés. Le dernier est de %s (%s)"
+msgstr "XChat : %u messages privés. Le dernier est de %s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:779
 #, c-format
@@ -4521,17 +4519,17 @@ msgstr "Message privé de : %s (%s)"
 #: ../src/fe-gtk/plugin-tray.c:818
 #, c-format
 msgid ": File offer from: %s (%s)"
-msgstr ": Demande de transfert de fichier de %s (%s)"
+msgstr "XChat : Demande de transfert de fichier de %s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:821
 #, c-format
 msgid ": %u file offers, latest from: %s (%s)"
-msgstr ": %u demandes de transferts de fichier. Le dernier est de %s (%s)"
+msgstr "XChat : %u demandes de transferts de fichier. Le dernier est de %s (%s)"
 
 #: ../src/fe-gtk/plugin-tray.c:826
 #, c-format
 msgid "File offer from: %s (%s)"
-msgstr ": Demande de transfert de fichier de %s (%s)"
+msgstr "XChat : Demande de transfert de fichier de %s (%s)"
 
 #: ../src/fe-gtk/plugingui.c:64
 msgid "Version"
@@ -4547,7 +4545,7 @@ msgstr "Sélectionner un greffon ou un script à charger"
 
 #: ../src/fe-gtk/plugingui.c:252
 msgid ": Plugins and Scripts"
-msgstr ": greffons et scripts"
+msgstr "XChat : greffons et scripts"
 
 #: ../src/fe-gtk/plugingui.c:267
 msgid "_Load..."
@@ -4590,7 +4588,7 @@ msgstr "Le nom d'utilisateur ne peut être vide."
 
 #: ../src/fe-gtk/servlistgui.c:1578
 msgid "You must have two unique nick names."
-msgstr "Vous devez avoir deux pseudonymes uniques."
+msgstr ""
 
 #: ../src/fe-gtk/servlistgui.c:1630
 msgid ""
@@ -4693,11 +4691,11 @@ msgstr "Jeu de caractères :"
 
 #: ../src/fe-gtk/servlistgui.c:1970
 msgid ": Network List"
-msgstr ": liste des réseaux"
+msgstr "XChat : liste des réseaux"
 
 #: ../src/fe-gtk/servlistgui.c:1981
 msgid "User Information"
-msgstr "Informations utilisateur"
+msgstr "Information utilisateur"
 
 #: ../src/fe-gtk/servlistgui.c:2005
 msgid "Third choice:"
@@ -4727,7 +4725,7 @@ msgstr "_Trier"
 msgid ""
 "Sorts the network list in alphabetical order. Use SHIFT-UP and SHIFT-DOWN "
 "keys to move a row."
-msgstr "Trie les réseaux par ordre alphabétique. Utiliser MAJ + Haut et MAJ + Bas pour déplacer une ligne."
+msgstr "Trie les réseaux dans l'ordre alphabétique. Utilisez Shift-Haut et Shift-Bas pour déplacer une ligne."
 
 #: ../src/fe-gtk/servlistgui.c:2168
 msgid "_Favor"
@@ -4943,7 +4941,7 @@ msgstr "Ukrainien"
 
 #: ../src/fe-gtk/setup.c:139
 msgid "Vietnamese"
-msgstr "Vietnamien"
+msgstr "Viétnamien"
 
 #: ../src/fe-gtk/setup.c:140
 msgid "Walloon"
@@ -5077,11 +5075,11 @@ msgstr "Dictionnaire à utiliser : "
 msgid ""
 "Use language codes (as in \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\n"
 "Separate multiple entries with commas."
-msgstr "Utiliser des codes de langues (comme dans « %LOCALAPPDATA%\\enchant\\myspell\\dicts »).\nSéparer les entrées multiples avec des virgules."
+msgstr "Utiliser des codes de langues (en tant que \"%LOCALAPPDATA%\\enchant\\myspell\\dicts\").\nSéparez les entrées par des virgules."
 
 #: ../src/fe-gtk/setup.c:199
 msgid "Use language codes. Separate multiple entries with commas."
-msgstr "Utiliser des codes de langue. Séparer les entrées multiples avec des virgules."
+msgstr "Entrez des codes de langue Séparer les par une virgule."
 
 #: ../src/fe-gtk/setup.c:202
 msgid "Nick Completion"
@@ -5093,7 +5091,7 @@ msgstr "Suffixe pour la complétion des pseudonymes :"
 
 #: ../src/fe-gtk/setup.c:204
 msgid "Nick completion sorted:"
-msgstr "Tri de la complétion des pseudonymes :"
+msgstr "Tri de la complétion des pseudo :"
 
 #: ../src/fe-gtk/setup.c:205
 msgid "Nick completion amount:"
@@ -5101,7 +5099,7 @@ msgstr "Maximum pour la complétion de pseudonymes :"
 
 #: ../src/fe-gtk/setup.c:205
 msgid "Threshold of nicks to start listing instead of completing"
-msgstr "Lister les pseudonymes au lieu de les compléter au-delà de ce seuil"
+msgstr "Seuil du nombre de pseudonymes à lister au lieu de compléter"
 
 #: ../src/fe-gtk/setup.c:205
 msgid "nicks."
@@ -5165,11 +5163,11 @@ msgstr "Afficher les noms d'hôtes dans la liste des utilisateurs"
 
 #: ../src/fe-gtk/setup.c:255
 msgid "Show icons for user modes"
-msgstr "Afficher des icônes pour les modes utilisateurs"
+msgstr "Afficher des icones pour les modes utilisateurs"
 
 #: ../src/fe-gtk/setup.c:255
 msgid "Use graphical icons instead of text symbols in the user list."
-msgstr "Afficher des icônes plutôt que du texte dans la liste des utilisateurs."
+msgstr "Afficher des icones plutôt que du texte dans la liste des utilisateurs."
 
 #: ../src/fe-gtk/setup.c:256
 msgid "Color nicknames in userlist"
@@ -5274,7 +5272,7 @@ msgstr "Trier les onglets par ordre alphabétique"
 
 #: ../src/fe-gtk/setup.c:314
 msgid "Show icons in the channel tree"
-msgstr "Afficher des icônes dans l'arbre des canaux"
+msgstr "Montrer des icones dans l'arbre des canaux"
 
 #: ../src/fe-gtk/setup.c:315
 msgid "Show dotted lines in the channel tree"
@@ -5362,7 +5360,7 @@ msgstr "Télécharger les fichiers vers :"
 
 #: ../src/fe-gtk/setup.c:353
 msgid "Move completed files to:"
-msgstr "Déplacer les fichiers complets vers :"
+msgstr "Déplacer les fichiers terminés vers :"
 
 #: ../src/fe-gtk/setup.c:354
 msgid "Save nick name in filenames"
@@ -5419,24 +5417,24 @@ msgstr "Alertes"
 
 #: ../src/fe-gtk/setup.c:400 ../src/fe-gtk/setup.c:452
 msgid "Show tray balloons on:"
-msgstr "Afficher une fenêtre de notification pour :"
+msgstr "Quand montrer une fenêtre de notification :"
 
 #: ../src/fe-gtk/setup.c:402
 msgid "Blink tray icon on:"
-msgstr "Faire clignoter l'icône de barre d'état pour :"
+msgstr "Faire clignoter l'icône de barre d'état"
 
 #: ../src/fe-gtk/setup.c:404
 msgid "Bounce dock icon on:"
-msgstr "Faire rebondir l'icône du dock pour :"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:407 ../src/fe-gtk/setup.c:453
 msgid "Blink task bar on:"
-msgstr "Faire clignoter la barre des tâches pour :"
+msgstr "Quand faire clignoter la barre d'état :"
 
 #: ../src/fe-gtk/setup.c:411 ../src/fe-gtk/setup.c:414
 #: ../src/fe-gtk/setup.c:416 ../src/fe-gtk/setup.c:454
 msgid "Make a beep sound on:"
-msgstr "Émettre un bip pour :"
+msgstr "Quand émettre un bip : "
 
 #: ../src/fe-gtk/setup.c:411
 msgid ""
@@ -5452,7 +5450,7 @@ msgstr "Jouer « message-new-instant » depuis le thème de sons freedesktop.org
 
 #: ../src/fe-gtk/setup.c:416
 msgid "Play a GTK beep upon the selected events"
-msgstr "Jouer un bip GTK sur les événements sélectionnés"
+msgstr "Jouer un bip GTK quand le ou les événements arrivent"
 
 #: ../src/fe-gtk/setup.c:420 ../src/fe-gtk/setup.c:456
 msgid "Omit alerts when marked as being away"
@@ -5484,7 +5482,7 @@ msgstr "Gérer le statut absent/présent automatiquement"
 
 #: ../src/fe-gtk/setup.c:431
 msgid "Automatically change status when hiding to tray."
-msgstr "Automatiquement changer d'état en cachant l'application dans la barre de tâches."
+msgstr "Automatiquement changer de statut en cachant l'application dans la barre de tâches."
 
 #: ../src/fe-gtk/setup.c:433
 msgid "Only show tray balloons when hidden or iconified"
@@ -5505,7 +5503,7 @@ msgstr "Mots déclenchant une surbrillance :"
 
 #: ../src/fe-gtk/setup.c:440 ../src/fe-gtk/setup.c:463
 msgid "Nick names not to highlight:"
-msgstr "Pseudos à ne pas mettre en surbrillance :"
+msgstr "Pseudo à ne pas mettre en surbrillance :"
 
 #: ../src/fe-gtk/setup.c:441 ../src/fe-gtk/setup.c:464
 msgid "Nick names to always highlight:"
@@ -5579,7 +5577,7 @@ msgstr "Cacher les messages d'entrée/sortie par défaut."
 
 #: ../src/fe-gtk/setup.c:485
 msgid "Hide nick change messages"
-msgstr "Cacher les messages de changement de pseudonyme"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:492
 msgid "*!*@*.host"
@@ -5629,7 +5627,7 @@ msgstr "Ajouter automatiquement les informations de couleur"
 msgid ""
 "Automatically include color information in copied lines of text.  Otherwise,"
 " include color information if the CONTROL key is held down while selecting."
-msgstr "Ajouter automatiquement les informations de couleurs dans les lignes de texte copiées. Sinon, la couleur sera ajoutée uniquement si la touche Control est appuyée lors de la sélection."
+msgstr "Ajouter automatiquement les informations de couleurs dans les lignes de texte copiées. Sinon, la couleur sera ajouté uniquement si la touche Control est appuyée lors de la sélection."
 
 #: ../src/fe-gtk/setup.c:515
 msgid "Real name:"
@@ -5641,7 +5639,7 @@ msgstr "Police alternative :"
 
 #: ../src/fe-gtk/setup.c:517
 msgid "Separate multiple entries with commas without spaces before or after."
-msgstr "Séparer plusieurs entrées avec des virgules sans espaces avant ou après la virgule."
+msgstr "Séparez plusieurs entrées avec des virgules sans espaces avant ou après la virgule."
 
 #: ../src/fe-gtk/setup.c:519
 msgid "Display lists in compact mode"
@@ -5653,13 +5651,13 @@ msgstr "Utiliser moins d'espace entre la liste des utilisateurs et l'arbre des c
 
 #: ../src/fe-gtk/setup.c:520
 msgid "Use server time if supported"
-msgstr "Utiliser le temps serveur si pris en charge"
+msgstr "Utiliser le temps serveur si pris en charg"
 
 #: ../src/fe-gtk/setup.c:520
 msgid ""
 "Display timestamps obtained from server if it supports the time-server "
 "extension."
-msgstr "Afficher les horodatages obtenus depuis le serveur s'il prend en charge l'extension serveur de temps."
+msgstr "Afficher les horodatages obtenus depuis le serveur s'il supporte l'extension du temps côté serveur."
 
 #: ../src/fe-gtk/setup.c:521
 msgid "Automatically reconnect to servers on disconnect"
@@ -5860,7 +5858,7 @@ msgstr "Sélectionner une image"
 
 #: ../src/fe-gtk/setup.c:1088
 msgid "Select Download Folder"
-msgstr "Choisir le dossier pour la réception de fichiers"
+msgstr "Choisir le dossier pour le réception de fichiers"
 
 #: ../src/fe-gtk/setup.c:1098
 msgid "Select font"
@@ -6030,7 +6028,7 @@ msgstr "*ATTENTION*\nAccepter automatiquement les DCC dans votre répertoire per
 
 #: ../src/fe-gtk/setup.c:2198
 msgid ": Preferences"
-msgstr ": préférences"
+msgstr "XChat : préférences"
 
 #: ../src/fe-gtk/sexy-spell-entry.c:545
 msgid "<i>(no suggestions)</i>"
@@ -6091,11 +6089,11 @@ msgstr "Tout tester"
 
 #: ../src/fe-gtk/textgui.c:485
 msgid "OK"
-msgstr "OK"
+msgstr ""
 
 #: ../src/fe-gtk/urlgrab.c:198
 msgid ": URL Grabber"
-msgstr ": récupération d'URL"
+msgstr "XChat : récupération d'URL"
 
 #: ../src/fe-gtk/urlgrab.c:212
 msgid "Clear list"

po/id.po

@@ -4,8 +4,8 @@
 # 
 # Translators:
 # Andhika Padmawan <andhika.padmawan@gmail.com>, 2010
-# Rahmat Bambang <doplank@gmx.com>, 2012-2013
-# Rahmat Bambang <doplank@gmx.com>, 2013
+# doplank <doplank@gmx.com>, 2012-2013
+# doplank <doplank@gmx.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"

po/it.po

@@ -6,14 +6,13 @@
 # Claudio Arseni <claudio.arseni@gmail.com>, 2013-2014
 # Eros Palberti - Fabio Viola : How-Tux Team <admin@how-tux.com>, 2006
 # Random_R, 2013
-# Random_R, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-09-03 19:07+0000\n"
-"Last-Translator: Teodoro Santoni <asbrasbra@gmail.com>\n"
+"PO-Revision-Date: 2014-05-30 13:32+0000\n"
+"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/hexchat/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

po/ko.po

@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
-# Seong-ho Cho <darkcircle.0426@gmail.com>, 2014
+# Darkcircle <darkcircle.0426@gmail.com>, 2014
+# Darkcircle <darkcircle.0426@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
 "PO-Revision-Date: 2014-05-15 13:09+0000\n"
-"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
+"Last-Translator: Darkcircle <darkcircle.0426@gmail.com>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/hexchat/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

po/ml.po

@@ -4,8 +4,8 @@
 # 
 # Translators:
 # bviktor, 2012
-# Thorne Heathenspring <thorne@null.net>, 2013
-# Thorne Heathenspring <thorne@null.net>, 2012
+# Thorne <thorne@null.net>, 2013
+# Thorne <thorne@null.net>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"

po/nb.po

@@ -3,9 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Xtreme Power <neethan98@hotmail.ca>, 2013
-# Thor K. H. <nitrolinken@gmail.com>, 2013
-# Thor K. H. <nitrolinken@gmail.com>, 2012-2013
+# xtremesmw <neethan98@hotmail.ca>, 2013
+# Thor K.H. <nitrolinken@gmail.com>, 2013
+# Thor K.H. <nitrolinken@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"

po/ru.po

@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Aleksandr P <davian818@gmail.com>, 2010
-# Andrey Vihrov <andrey.vihrov@gmail.com>, 2013
+# andreyv <andrey.vihrov@gmail.com>, 2013
 # Valek Filippov <frob@df.ru>, 2001
 # Volosenkov Dmitry <_bil_@mail.ru>, 1999
 msgid ""

po/sr.po

@@ -4,7 +4,7 @@
 # 
 # Translators:
 # o Zoltan Čala <zolika@sezampro.yu>, 1999
-# Velimir Majstorov <majstorov@gmail.com>, 2013
+# Ortak Velja <majstorov@gmail.com>, 2013
 # Zlatan Vasović <legospace9876@gmail.com>, 2013-2014
 msgid ""
 msgstr ""

po/sr@latin.po

@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Velimir Majstorov <majstorov@gmail.com>, 2013
+# Ortak Velja <majstorov@gmail.com>, 2013
 # o Zoltan Čala <zolika@sezampro.yu>, 1999
 # Zlatan Vasović <legospace9876@gmail.com>, 2013
 msgid ""

po/sv.po

@@ -3,16 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jakob <jakob@knugen.nu>, 2014
-# Jakob <jakob@knugen.nu>, 2012
-# Martin Jernberg <bittin@cafe8bitar.se>, 2014
+# androidnisse <jakob@knugen.nu>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-08-22 13:24+0000\n"
-"Last-Translator: Martin Jernberg <bittin@cafe8bitar.se>\n"
+"PO-Revision-Date: 2014-05-14 17:20+0000\n"
+"Last-Translator: TingPing <tingping@tingping.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/hexchat/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +23,7 @@ msgid ""
 "HexChat is an easy to use yet extensible IRC Client. It allows you to "
 "securely join multiple networks and talk to users privately or in channels "
 "using a customizable interface. You can even transfer files."
-msgstr "HexChat är en lättanvänd men även utbyggbar IRC klient. Den låter dig säkert ansluta till flera nätverk och prata med användare privat eller i kanaler med ett anpassningsbart utseende. Du kan även överföra filer."
+msgstr ""
 
 #: ../data/misc/hexchat.appdata.xml.in.h:2
 msgid ""
@@ -35,15 +33,15 @@ msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:1
 msgid "HexChat"
-msgstr "HexChat"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:2
 msgid "IRC Client"
-msgstr "IRC klient"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:3
 msgid "Chat with other people online"
-msgstr "Chatta med andra människor online"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:4
 msgid "IM;Chat;"
@@ -51,11 +49,11 @@ msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:5
 msgid "Open Safe Mode"
-msgstr "Öppna säkert läge"
+msgstr ""
 
 #: ../data/misc/htm.desktop.in.h:1
 msgid "HexChat Theme Manager"
-msgstr "HexChat temahanterare "
+msgstr ""
 
 #. 0 means unlimited
 #. STRINGS
@@ -130,15 +128,15 @@ msgstr "_Skicka en fil"
 
 #: ../src/common/hexchat.c:869
 msgid "_User Info (WhoIs)"
-msgstr "_Användarinfo (Whois)"
+msgstr "An_vändarinfo (Whois)"
 
 #: ../src/common/hexchat.c:870
 msgid "_Add to Friends List"
-msgstr "_Lägg till i vänlista"
+msgstr "_Lägg till i vännerlista"
 
 #: ../src/common/hexchat.c:871
 msgid "_Ignore"
-msgstr "_Ignorera"
+msgstr ""
 
 #: ../src/common/hexchat.c:872
 msgid "O_perator Actions"
@@ -214,7 +212,7 @@ msgstr "Ta bort op"
 
 #: ../src/common/hexchat.c:918
 msgid "bye"
-msgstr "hej då"
+msgstr "hejdå"
 
 #: ../src/common/hexchat.c:919
 #, c-format
@@ -255,7 +253,7 @@ msgstr "Ping"
 #, c-format
 msgid ""
 "You do not have write access to %s. Nothing from this session can be saved."
-msgstr "Du har inte skrivrättigheter till %s. Ingenting från den här sessionen kan bli sparat"
+msgstr ""
 
 #: ../src/common/hexchat.c:1139
 msgid ""
@@ -2446,7 +2444,7 @@ msgstr "Jordanien"
 
 #: ../src/common/util.c:1112
 msgid "Company Jobs"
-msgstr "Företags jobb"
+msgstr ""
 
 #: ../src/common/util.c:1113
 msgid "Japan"
@@ -2554,7 +2552,7 @@ msgstr "Moldavien"
 
 #: ../src/common/util.c:1139
 msgid "Montenegro"
-msgstr "Montenegro"
+msgstr ""
 
 #: ../src/common/util.c:1140
 msgid "United States Medical"
@@ -2622,7 +2620,7 @@ msgstr "Mauritius"
 
 #: ../src/common/util.c:1156
 msgid "Museums"
-msgstr "Museum"
+msgstr ""
 
 #: ../src/common/util.c:1157
 msgid "Maldives"
@@ -2786,7 +2784,7 @@ msgstr "Gammaldags ARPAnet"
 
 #: ../src/common/util.c:1197
 msgid "Serbia"
-msgstr "Serbien"
+msgstr ""
 
 #: ../src/common/util.c:1198
 msgid "Russian Federation"
@@ -2858,7 +2856,7 @@ msgstr "Surinam"
 
 #: ../src/common/util.c:1215
 msgid "South Sudan"
-msgstr "Syd Sudan"
+msgstr ""
 
 #: ../src/common/util.c:1216
 msgid "Sao Tome and Principe"
@@ -3088,7 +3086,7 @@ msgstr ""
 
 #: ../src/fe-gtk/banlist.c:67
 msgid "Invites"
-msgstr "Inbjudningar"
+msgstr ""
 
 #: ../src/fe-gtk/banlist.c:68 ../src/fe-gtk/ignoregui.c:164
 msgid "Invite"
@@ -3723,7 +3721,7 @@ msgstr "<u>Understruken</u>"
 
 #: ../src/fe-gtk/maingui.c:1475
 msgid "<i>Italic</i>"
-msgstr "<i>kursiv</i>"
+msgstr ""
 
 #: ../src/fe-gtk/maingui.c:1476
 msgid "Normal"
@@ -3837,7 +3835,7 @@ msgstr "Ange nytt smeknamn:"
 
 #: ../src/fe-gtk/maingui.c:2832
 msgid "No results found."
-msgstr "Inga resultat funna."
+msgstr ""
 
 #: ../src/fe-gtk/maingui.c:2928
 msgid "Search hit end or not found."
@@ -3895,7 +3893,7 @@ msgstr "Användare:"
 
 #: ../src/fe-gtk/menu.c:637
 msgid "Account:"
-msgstr "Konto:"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:647
 msgid "Country:"
@@ -4116,7 +4114,7 @@ msgstr "XChat: CTCP-svar"
 
 #: ../src/fe-gtk/menu.c:1743
 msgid "He_xChat"
-msgstr "He_xChat"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1744
 msgid "Network Li_st..."
@@ -4201,7 +4199,7 @@ msgstr "Diagram"
 
 #: ../src/fe-gtk/menu.c:1785
 msgid "_Fullscreen"
-msgstr "_Fullskärm"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1787
 msgid "_Server"
@@ -5959,7 +5957,7 @@ msgstr "Gränssnitt"
 
 #: ../src/fe-gtk/setup.c:1807
 msgid "Appearance"
-msgstr "Utseende "
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:1808
 msgid "Input box"
@@ -5983,7 +5981,7 @@ msgstr "Chattande"
 
 #: ../src/fe-gtk/setup.c:1816
 msgid "Sounds"
-msgstr "Ljud"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:1818
 msgid "Advanced"
@@ -6025,7 +6023,7 @@ msgstr "*VARNING*\nAtt automatiskt acceptera DCC till din\nhemkatalog kan vara f
 
 #: ../src/fe-gtk/setup.c:2198
 msgid ": Preferences"
-msgstr ": Inställningar"
+msgstr "XChat: Inställningar"
 
 #: ../src/fe-gtk/sexy-spell-entry.c:545
 msgid "<i>(no suggestions)</i>"
@@ -6033,7 +6031,7 @@ msgstr ""
 
 #: ../src/fe-gtk/sexy-spell-entry.c:559
 msgid "More..."
-msgstr "Mer..."
+msgstr ""
 
 #. + Add to Dictionary
 #: ../src/fe-gtk/sexy-spell-entry.c:631
@@ -6044,11 +6042,11 @@ msgstr ""
 #. - Ignore All
 #: ../src/fe-gtk/sexy-spell-entry.c:676
 msgid "Ignore All"
-msgstr "Ignorera alla"
+msgstr ""
 
 #: ../src/fe-gtk/sexy-spell-entry.c:711
 msgid "Spelling Suggestions"
-msgstr "Stavningsförslag"
+msgstr ""
 
 #: ../src/fe-gtk/sexy-spell-entry.c:1272
 #, c-format
@@ -6086,7 +6084,7 @@ msgstr "Testa allt"
 
 #: ../src/fe-gtk/textgui.c:485
 msgid "OK"
-msgstr "OK"
+msgstr ""
 
 #: ../src/fe-gtk/urlgrab.c:198
 msgid ": URL Grabber"

po/tr.po

@@ -3,19 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Atilla Öntaş <tarakbumba@gmail.com>, 2014
-# Demiray Muhterem <mdemiray@msn.com>, 2014
+# tulliana <mdemiray@msn.com>, 2014
 # ifthenelse <ifthenelse@gmx.com>, 2013
 # osmanos <osman.erkan@yandex.com>, 2014
 # TingPing <tingping@tingping.se>, 2014
-# Ufuk UYUMAZ <ufukuyumaz@gmail.com>, 2013
+# Ufuk Uyumaz <ufukuyumaz@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-10-06 16:54+0000\n"
-"Last-Translator: Demiray Muhterem <mdemiray@msn.com>\n"
+"PO-Revision-Date: 2014-05-14 17:20+0000\n"
+"Last-Translator: TingPing <tingping@tingping.se>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/hexchat/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -38,27 +37,27 @@ msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:1
 msgid "HexChat"
-msgstr "HexChat"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:2
 msgid "IRC Client"
-msgstr "IRC Client"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:3
 msgid "Chat with other people online"
-msgstr "İnsanlar ile çevrimiçi sohbet"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:4
 msgid "IM;Chat;"
-msgstr "IM;Chat;"
+msgstr ""
 
 #: ../data/misc/hexchat.desktop.in.h:5
 msgid "Open Safe Mode"
-msgstr "Güvenli Modda Aç"
+msgstr ""
 
 #: ../data/misc/htm.desktop.in.h:1
 msgid "HexChat Theme Manager"
-msgstr "Hexchat Tema Yöneticisi"
+msgstr ""
 
 #. 0 means unlimited
 #. STRINGS
@@ -404,13 +403,13 @@ msgstr "BAN <maske> [<yasaktipi>], maskeye uygun herkesi kanalda yasaklar. Zaten
 
 #: ../src/common/outbound.c:3913
 msgid "CHANOPT [-quiet] <variable> [<value>]"
-msgstr "CHANOPT [-quiet] <değişken> [<değer>]"
+msgstr ""
 
 #: ../src/common/outbound.c:3914
 msgid ""
 "CHARSET [<encoding>], get or set the encoding used for the current "
 "connection"
-msgstr "CHARSET [<kodlama>], geçerli bağlantı için kullanılan kodlamayı getir veya ayarla"
+msgstr ""
 
 #: ../src/common/outbound.c:3915
 msgid ""
@@ -424,19 +423,19 @@ msgstr ""
 
 #: ../src/common/outbound.c:3919
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr "COUNTRY [-s] <kodlama/değişken ifade>, bir ülke kodlaması bulur, mesela: au = australia"
+msgstr ""
 
 #: ../src/common/outbound.c:3921
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr "CTCP <rumuz> <ileti>,CTCP iletisinii rumuza gönder, ortak iletiler VERSION ve USERINFO' dur"
+msgstr ""
 
 #: ../src/common/outbound.c:3923
 msgid ""
 "CYCLE [<channel>], parts the current or given channel and immediately "
 "rejoins"
-msgstr "CYCLE [<kanall>], geçerli olan veya verilen kanalı böler ve hemen yeniden katılır"
+msgstr ""
 
 #: ../src/common/outbound.c:3925
 msgid ""
@@ -1407,7 +1406,7 @@ msgstr "Katılan kişinin adı"
 
 #: ../src/common/text.c:1033
 msgid "The channel being joined"
-msgstr "Kanala girildi."
+msgstr ""
 
 #: ../src/common/text.c:1034 ../src/common/text.c:1097
 #: ../src/common/text.c:1148
@@ -1416,7 +1415,7 @@ msgstr "Kişinin bilgisayarı"
 
 #: ../src/common/text.c:1035
 msgid "The account of the person"
-msgstr "Kişinin hesabı"
+msgstr ""
 
 #: ../src/common/text.c:1039 ../src/common/text.c:1046
 #: ../src/common/text.c:1053 ../src/common/text.c:1265
@@ -1470,7 +1469,7 @@ msgstr "Sunucu Adı"
 
 #: ../src/common/text.c:1060
 msgid "Acknowledged Capabilities"
-msgstr "Sunucu Özellikleri"
+msgstr ""
 
 #: ../src/common/text.c:1065
 msgid "Server Capabilities"
@@ -1578,7 +1577,7 @@ msgstr ""
 
 #: ../src/common/text.c:1171
 msgid "The nick of the person who set the key"
-msgstr "Kilidi ayarlayan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1172
 msgid "The key"
@@ -1586,7 +1585,7 @@ msgstr "Anahtar"
 
 #: ../src/common/text.c:1176
 msgid "The nick of the person who set the limit"
-msgstr "Limiti ayarlayan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1177
 msgid "The limit"
@@ -1594,31 +1593,31 @@ msgstr "Sınır"
 
 #: ../src/common/text.c:1181
 msgid "The nick of the person who did the op'ing"
-msgstr "Op veren kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1182
 msgid "The nick of the person who has been op'ed"
-msgstr "Op olan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1186
 msgid "The nick of the person who has been halfop'ed"
-msgstr "Yarım Op olan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1187
 msgid "The nick of the person who did the halfop'ing"
-msgstr "Yarım Op veren kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1191
 msgid "The nick of the person who did the voice'ing"
-msgstr "Konuşma izni veren kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1192
 msgid "The nick of the person who has been voice'ed"
-msgstr "Konuşma izni alan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1196
 msgid "The nick of the person who did the banning"
-msgstr "Banlayan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1197 ../src/common/text.c:1229
 msgid "The ban mask"
@@ -1626,7 +1625,7 @@ msgstr "Yasak maskesi"
 
 #: ../src/common/text.c:1201
 msgid "The nick of the person who did the quieting"
-msgstr "Konuşma iznini alan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1202 ../src/common/text.c:1234
 msgid "The quiet mask"
@@ -1634,43 +1633,43 @@ msgstr "Sessiz maske"
 
 #: ../src/common/text.c:1206
 msgid "The nick who removed the key"
-msgstr "Kilidi kaldıranın rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1210
 msgid "The nick who removed the limit"
-msgstr "Limiti kaldıranın rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1214
 msgid "The nick of the person of did the deop'ing"
-msgstr "Op alan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1215
 msgid "The nick of the person who has been deop'ed"
-msgstr "Op'u alınan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1218
 msgid "The nick of the person of did the dehalfop'ing"
-msgstr "Yarım Op'u alan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1219
 msgid "The nick of the person who has been dehalfop'ed"
-msgstr "Yarım Op'u elinden alınan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1223
 msgid "The nick of the person of did the devoice'ing"
-msgstr "Konuşma iznini alan kişini rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1224
 msgid "The nick of the person who has been devoice'ed"
-msgstr "Konuşma izni alınan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1228
 msgid "The nick of the person of did the unban'ing"
-msgstr "Yasağı kaldıran kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1233
 msgid "The nick of the person of did the unquiet'ing"
-msgstr "Konuşma yasağını kaldıran kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1238
 msgid "The nick of the person who did the exempt"
@@ -1686,7 +1685,7 @@ msgstr "Kişinin kullanıcı adı serbest bırakıldı."
 
 #: ../src/common/text.c:1248
 msgid "The nick of the person who did the invite"
-msgstr "Davet eden kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1249 ../src/common/text.c:1254
 msgid "The invite mask"
@@ -1694,15 +1693,15 @@ msgstr "Davet maskesi"
 
 #: ../src/common/text.c:1253
 msgid "The nick of the person removed the invite"
-msgstr "Daveti kaldıran kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1258
 msgid "The nick of the person setting the mode"
-msgstr "Mod ayarlarını yapan kişinin rumuzu"
+msgstr ""
 
 #: ../src/common/text.c:1259
 msgid "The mode's sign (+/-)"
-msgstr "Mod'lar imza (+/-)"
+msgstr ""
 
 #: ../src/common/text.c:1260
 msgid "The mode letter"
@@ -1710,7 +1709,7 @@ msgstr "Mektup Modu"
 
 #: ../src/common/text.c:1261
 msgid "The channel it's being set on"
-msgstr "Bu şu anda kanal ayarlanıyor"
+msgstr ""
 
 #: ../src/common/text.c:1268
 msgid "Full name"
@@ -2893,7 +2892,7 @@ msgstr "Chad"
 
 #: ../src/common/util.c:1223
 msgid "Internet Communication Services"
-msgstr "İnternet İletişim Hizmetleri"
+msgstr ""
 
 #: ../src/common/util.c:1224
 msgid "French Southern Territories"
@@ -2937,7 +2936,7 @@ msgstr "Türkiye"
 
 #: ../src/common/util.c:1235
 msgid "Travel and Tourism"
-msgstr "Seyahat ve Turizm"
+msgstr ""
 
 #: ../src/common/util.c:1236
 msgid "Trinidad and Tobago"
@@ -3017,7 +3016,7 @@ msgstr "Samoa"
 
 #: ../src/common/util.c:1255
 msgid "Adult Entertainment"
-msgstr "Yetişkin Eğlence"
+msgstr ""
 
 #: ../src/common/util.c:1256
 msgid "Yemen"
@@ -3053,7 +3052,7 @@ msgstr ""
 
 #: ../src/common/dbus/dbus-client.c:114 ../src/common/dbus/dbus-client.c:128
 msgid "Failed to complete Command"
-msgstr "Komut başarısız"
+msgstr ""
 
 #: ../src/common/dbus/dbus-plugin.c:30
 msgid "remote access"

po/zh_CN.po

@@ -5,16 +5,14 @@
 # Translators:
 # Aron Xu <happyaron.xu@gmail.com>, 2010
 # Dalin <ayi880@hotmail.com>, 2003
-# Eleanor Chen <chenyueg@gmail.com>, 2010
-# highwind <highwindmx@126.com>, 2014
-# bababababanana1, 2014
-# Michael Jay Tong <michaeljayt@gmail.com>, 2014
+# chenyueg <chenyueg@gmail.com>, 2010
+# michaeljayt <michaeljayt@gmail.com>, 2014
 # Minor revision by Walte <webmaster@www.linuxfans.org>, 2003
 # Rongjun Mu <elanmu@sina.com>, 2003
 # Rongjun Mu <rongjunmu+i18n@gmail.com>, 2004
 # Sarah Smith <sarahs@redhat.com>, 2003
 # SEPTEM <septeman@gmail.com>, 2006
-# Tong Hui <tonghuix@gmail.com>, 2014
+# tonghuix <tonghuix@gmail.com>, 2014
 # Zhuyuan Liu <gtkdict@yahoo.com.cn>, 2005
 # Zong Yaotang <zong@cosix.com.au>, 2002
 msgid ""
@@ -22,8 +20,8 @@ msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
 "POT-Creation-Date: 2014-05-14 13:20-0400\n"
-"PO-Revision-Date: 2014-11-02 15:21+0000\n"
-"Last-Translator: Michael Jay Tong <michaeljayt@gmail.com>\n"
+"PO-Revision-Date: 2014-05-14 17:20+0000\n"
+"Last-Translator: TingPing <tingping@tingping.se>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/hexchat/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -291,12 +289,12 @@ msgstr "否   "
 #: ../src/common/ignore.c:385
 #, c-format
 msgid "You are being CTCP flooded from %s, ignoring %s\n"
-msgstr "您正受到来自 %s 的洗屏攻击，忽略 %s\n"
+msgstr "您正受到来自 %s 的 CTCP 洪水攻击，忽略 %s\n"
 
 #: ../src/common/ignore.c:410
 #, c-format
 msgid "You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"
-msgstr "您正受到来自 %s 的 MSG 洪水攻击，设置图形化自动对话框为关闭。\n"
+msgstr "您正受到来自 %s 的 MSG 洪水攻击，自动打开图形化对话框参数gui_autoopen_dialog 将设置为关闭。\n"
 
 #: ../src/common/notify.c:558
 #, c-format
@@ -310,7 +308,7 @@ msgstr "  %-20s 离线\n"
 
 #: ../src/common/outbound.c:72
 msgid "No channel joined. Try /join #<channel>\n"
-msgstr "没有进入任何频道。请尝试输入 /join #<channel>\n"
+msgstr "没有进入任何频道。请尝试 /join #<channel>\n"
 
 #: ../src/common/outbound.c:78
 msgid "Not connected. Try /server <host> [<port>]\n"
@@ -987,7 +985,7 @@ msgstr "%C22*%O$t%C26$1%O 给了 %C18$2%O 发言权"
 
 #: ../src/common/textevents.h:114
 msgid "%C23*%O$tConnected. Now logging in."
-msgstr "%C23*%O$t 已连接。正在登录..."
+msgstr "%C23*%O$tC 已连接。正在登录..."
 
 #: ../src/common/textevents.h:117
 msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
@@ -1424,7 +1422,7 @@ msgstr "此人的主机名"
 
 #: ../src/common/text.c:1035
 msgid "The account of the person"
-msgstr "这个人的帐号"
+msgstr ""
 
 #: ../src/common/text.c:1039 ../src/common/text.c:1046
 #: ../src/common/text.c:1053 ../src/common/text.c:1265
@@ -3983,27 +3981,27 @@ msgstr "编辑此菜单..."
 
 #: ../src/fe-gtk/menu.c:1292
 msgid "Marker line disabled."
-msgstr "标记线已禁用."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1298
 msgid "Marker line never set."
-msgstr "标记线永不设置."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1302
 msgid "Marker line reset manually."
-msgstr "标记线手动重设."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1304
 msgid "Marker line reset because exceeded scrollback limit."
-msgstr "因超越回滚限制重设标记线."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1306
 msgid "Marker line reset by CLEAR command."
-msgstr "使用CLEAR命令重设标记线."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1308
 msgid "Marker line state unknown."
-msgstr "标记线状态未知."
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1395
 msgid "Retrieve channel list..."
@@ -4335,7 +4333,7 @@ msgstr "重置标记线"
 
 #: ../src/fe-gtk/menu.c:1823
 msgid "Move to Marker Line"
-msgstr "移动至标记线"
+msgstr ""
 
 #: ../src/fe-gtk/menu.c:1824
 msgid "_Copy Selection"
@@ -4596,7 +4594,7 @@ msgstr "用户名不可留空。"
 
 #: ../src/fe-gtk/servlistgui.c:1578
 msgid "You must have two unique nick names."
-msgstr "您必须拥有两个昵称."
+msgstr ""
 
 #: ../src/fe-gtk/servlistgui.c:1630
 msgid ""
@@ -4737,7 +4735,7 @@ msgstr "按字母顺序排练网络列表。使用SHIFT+上下方向键来移动
 
 #: ../src/fe-gtk/servlistgui.c:2168
 msgid "_Favor"
-msgstr "收藏(_F)"
+msgstr "收藏 (_F)"
 
 #: ../src/fe-gtk/servlistgui.c:2169
 msgid "Mark or unmark this network as a favorite."
@@ -5433,7 +5431,7 @@ msgstr "托盘图标闪烁于："
 
 #: ../src/fe-gtk/setup.c:404
 msgid "Bounce dock icon on:"
-msgstr "弹跳托盘图标于:"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:407 ../src/fe-gtk/setup.c:453
 msgid "Blink task bar on:"
@@ -5585,7 +5583,7 @@ msgstr "默认隐藏频道里的进入/离开信息"
 
 #: ../src/fe-gtk/setup.c:485
 msgid "Hide nick change messages"
-msgstr "隐藏昵称变更信息"
+msgstr ""
 
 #: ../src/fe-gtk/setup.c:492
 msgid "*!*@*.host"
@@ -6097,7 +6095,7 @@ msgstr "测试全部"
 
 #: ../src/fe-gtk/textgui.c:485
 msgid "OK"
-msgstr "确认"
+msgstr ""
 
 #: ../src/fe-gtk/urlgrab.c:198
 msgid ": URL Grabber"

readme.md

@@ -1,4 +1,4 @@
-# HexChat [![Build Status](https://travis-ci.org/hexchat/hexchat.png)](https://travis-ci.org/hexchat/hexchat) [![Build Status](http://nekomimi.cloudapp.net:8080/job/hexchat/badge/icon)](http://nekomimi.cloudapp.net:8080/job/hexchat/) [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/hexchat/hexchat/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+# HexChat [![Build Status](http://img.shields.io/travis/hexchat/hexchat.svg?style=flat)](https://travis-ci.org/hexchat/hexchat) [![Build Status](http://img.shields.io/jenkins/s/http/nekomimi.cloudapp.net:8080/hexchat.svg?style=flat)](http://nekomimi.cloudapp.net:8080/job/hexchat/)
 
 HexChat is an IRC client for Windows and UNIX-like operating systems.  
 See [IRCHelp.org](http://irchelp.org) for information about IRC in general.  

src/common/Makefile.am

@@ -1,8 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 
+include $(top_srcdir)/m4/clang-analyze.am
+
 noinst_LIBRARIES = libhexchatcommon.a
 
-AM_CPPFLAGS = $(COMMON_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(top_srcdir)
 
 EXTRA_DIST = \
 	cfgfiles.h \
@@ -20,11 +22,11 @@ EXTRA_DIST = \
 	inet.h \
 	make-te.c \
 	modes.h \
-	msproxy.h \
 	network.h \
 	notify.h \
 	outbound.h \
 	plugin.h \
+	plugin-identd.h \
 	plugin-timer.h \
 	proto-irc.h \
 	server.h \
@@ -44,10 +46,6 @@ if USE_OPENSSL
 ssl_c = ssl.c
 endif
 
-if USE_MSPROXY
-msproxy_c = msproxy.c
-endif
-
 if USE_DBUS
 dbusdir = dbus
 libhexchatcommon_a_LIBADD =				\
@@ -62,23 +60,28 @@ endif
 noinst_PROGRAMS = make-te
 
 libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
-	history.c ignore.c inbound.c marshal.c modes.c $(msproxy_c) network.c notify.c \
-	outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \
+	history.c ignore.c inbound.c marshal.c modes.c network.c notify.c \
+	outbound.c plugin.c plugin-identd.c plugin-timer.c proto-irc.c server.c servlist.c \
 	$(ssl_c) text.c tree.c url.c userlist.c util.c
-libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
 
 textenums.h: textevents.h
 
-textevents.h: textevents.in make-te
-	$(AM_V_GEN) ./make-te < textevents.in > textevents.h 2> textenums.h
+textevents.h: $(srcdir)/textevents.in make-te
+	$(AM_V_GEN) ./make-te < $< > $@ 2> textenums.h
 
-marshal.h: marshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --header $(srcdir)/marshalers.list > $@
+marshal.h: $(srcdir)/marshalers.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --header $< > $@
 
-marshal.c: marshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --body $(srcdir)/marshalers.list > $@
+marshal.c: $(srcdir)/marshalers.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=_hexchat_marshal --body $< > $@
 
 
+if DO_STATIC_ANALYSIS
+analyze_plists = $(libhexchatcommon_a_SOURCES:%.c=%.plist)
+all-local: $(analyze_plists)
+MOSTLYCLEANFILES = $(analyze_plists)
+endif
+
 BUILT_SOURCES = textenums.h textevents.h marshal.c marshal.h
 
 CLEANFILES = $(BUILT_SOURCES)

src/common/cfgfiles.c

@@ -57,15 +57,11 @@ list_addentry (GSList ** list, char *cmd, char *name)
 	size_t name_len;
 	size_t cmd_len = 1;
 
-	/* remove <2.8.0 stuff */
-	if (!strcmp (cmd, "away") && !strcmp (name, "BACK"))
-		return;
-
 	if (cmd)
 		cmd_len = strlen (cmd) + 1;
 	name_len = strlen (name) + 1;
 
-	pop = malloc (sizeof (struct popup) + cmd_len + name_len);
+	pop = g_malloc (sizeof (struct popup) + cmd_len + name_len);
 	pop->name = (char *) pop + sizeof (struct popup);
 	pop->cmd = pop->name + name_len;
 
@@ -137,13 +133,13 @@ list_loadconf (char *file, GSList ** list, char *defaultconf)
 		abort ();
 	}
 
-	ibuf = malloc (st.st_size);
+	ibuf = g_malloc (st.st_size);
 	read (fd, ibuf, st.st_size);
 	close (fd);
 
 	list_load_from_data (list, ibuf, st.st_size);
 
-	free (ibuf);
+	g_free (ibuf);
 }
 
 void
@@ -153,7 +149,7 @@ list_free (GSList ** list)
 	while (*list)
 	{
 		data = (void *) (*list)->data;
-		free (data);
+		g_free (data);
 		*list = g_slist_remove (*list, data);
 	}
 }
@@ -170,7 +166,7 @@ list_delentry (GSList ** list, char *name)
 		if (!g_ascii_strcasecmp (name, pop->name))
 		{
 			*list = g_slist_remove (*list, pop);
-			free (pop);
+			g_free (pop);
 			return 1;
 		}
 		alist = alist->next;
@@ -211,10 +207,10 @@ cfg_get_str (char *cfg, const char *var, char *dest, int dest_len)
 		while (*cfg != 0 && *cfg != '\n')
 			cfg++;
 		if (*cfg == 0)
-			return 0;
+			return NULL;
 		cfg++;
 		if (*cfg == 0)
-			return 0;
+			return NULL;
 	}
 }
 
@@ -224,7 +220,7 @@ cfg_put_str (int fh, char *var, char *value)
 	char buf[512];
 	int len;
 
-	snprintf (buf, sizeof buf, "%s = %s\n", var, value);
+	g_snprintf (buf, sizeof buf, "%s = %s\n", var, value);
 	len = strlen (buf);
 	return (write (fh, buf, len) == len);
 }
@@ -235,7 +231,7 @@ cfg_put_color (int fh, int r, int g, int b, char *var)
 	char buf[400];
 	int len;
 
-	snprintf (buf, sizeof buf, "%s = %04x %04x %04x\n", var, r, g, b);
+	g_snprintf (buf, sizeof buf, "%s = %04x %04x %04x\n", var, r, g, b);
 	len = strlen (buf);
 	return (write (fh, buf, len) == len);
 }
@@ -249,7 +245,7 @@ cfg_put_int (int fh, int value, char *var)
 	if (value == -1)
 		value = 1;
 
-	snprintf (buf, sizeof buf, "%s = %d\n", var, value);
+	g_snprintf (buf, sizeof buf, "%s = %d\n", var, value);
 	len = strlen (buf);
 	return (write (fh, buf, len) == len);
 }
@@ -312,9 +308,7 @@ get_xdir (void)
 
 		if (portable_mode () || SHGetKnownFolderPath (&FOLDERID_RoamingAppData, 0, NULL, &roaming_path_wide) != S_OK)
 		{
-			char *path;
-
-			path = g_win32_get_package_installation_directory_of_module (NULL);
+			char *path = g_win32_get_package_installation_directory_of_module (NULL);
 			if (path)
 			{
 				xdir = g_build_filename (path, "config", NULL);
@@ -440,6 +434,7 @@ const struct prefs vars[] =
 	{"gui_tab_dots", P_OFFINT (hex_gui_tab_dots), TYPE_BOOL},
 	{"gui_tab_icons", P_OFFINT (hex_gui_tab_icons), TYPE_BOOL},
 	{"gui_tab_layout", P_OFFINT (hex_gui_tab_layout), TYPE_INT},
+	{"gui_tab_middleclose", P_OFFINT (hex_gui_tab_middleclose), TYPE_BOOL},
 	{"gui_tab_newtofront", P_OFFINT (hex_gui_tab_newtofront), TYPE_INT},
 	{"gui_tab_pos", P_OFFINT (hex_gui_tab_pos), TYPE_INT},
 	{"gui_tab_scrollchans", P_OFFINT (hex_gui_tab_scrollchans), TYPE_BOOL},
@@ -482,6 +477,7 @@ const struct prefs vars[] =
 	{"gui_win_width", P_OFFINT (hex_gui_win_width), TYPE_INT},
 
 	{"identd", P_OFFINT (hex_identd), TYPE_BOOL},
+	{"identd_port", P_OFFINT (hex_identd_port), TYPE_INT},
 
 	{"input_balloon_chans", P_OFFINT (hex_input_balloon_chans), TYPE_BOOL},
 	{"input_balloon_hilight", P_OFFINT (hex_input_balloon_hilight), TYPE_BOOL},
@@ -533,9 +529,7 @@ const struct prefs vars[] =
 	{"irc_whois_front", P_OFFINT (hex_irc_whois_front), TYPE_BOOL},
 
 	{"net_auto_reconnect", P_OFFINT (hex_net_auto_reconnect), TYPE_BOOL},
-#ifndef WIN32	/* FIXME fix reconnect crashes and remove this ifdef! */
 	{"net_auto_reconnectonfail", P_OFFINT (hex_net_auto_reconnectonfail), TYPE_BOOL},
-#endif
 	{"net_bind_host", P_OFFSET (hex_net_bind_host), TYPE_STR},
 	{"net_ping_timeout", P_OFFINT (hex_net_ping_timeout), TYPE_INT},
 	{"net_proxy_auth", P_OFFINT (hex_net_proxy_auth), TYPE_BOOL},
@@ -590,10 +584,10 @@ const struct prefs vars[] =
 	{0, 0, 0},
 };
 
-static char *
+static const char *
 convert_with_fallback (const char *str, const char *fallback)
 {
-	char *utf;
+	const char *utf;
 
 #ifndef WIN32
 	/* On non-Windows, g_get_user_name and g_get_real_name return a string in system locale, so convert it to utf-8. */
@@ -652,7 +646,7 @@ get_default_language (void)
 
 	if (lang_no >= 0)
 	{
-		free (lang);
+		g_free (lang);
 		return lang_no;
 	}
 
@@ -661,7 +655,7 @@ get_default_language (void)
 
 	lang_no = find_language_number (lang);
 
-	free (lang);
+	g_free (lang);
 
 	return lang_no >= 0 ? lang_no : find_language_number ("en");
 }
@@ -703,8 +697,8 @@ get_default_spell_languages (void)
 				}
 			}
 		}
-		if (last != NULL)
-			g_free(last);
+
+		g_free (last);
 
 		if (lang_list[0])
 			return g_strdup (ret);
@@ -765,6 +759,7 @@ load_default_config(void)
 	prefs.hex_gui_tab_chans = 1;
 	prefs.hex_gui_tab_dialogs = 1;
 	prefs.hex_gui_tab_icons = 1;
+	prefs.hex_gui_tab_middleclose = 1;
 	prefs.hex_gui_tab_server = 1;
 	prefs.hex_gui_tab_sort = 1;
 	prefs.hex_gui_topicbar = 1;
@@ -776,12 +771,12 @@ load_default_config(void)
 	prefs.hex_gui_ulist_resizable = 1;
 	prefs.hex_gui_ulist_style = 1;
 	prefs.hex_gui_win_save = 1;
-	prefs.hex_identd = 1;
 	prefs.hex_input_flash_hilight = 1;
 	prefs.hex_input_flash_priv = 1;
 	prefs.hex_input_tray_hilight = 1;
 	prefs.hex_input_tray_priv = 1;
 	prefs.hex_irc_cap_server_time = 1;
+	prefs.hex_irc_logging = 1;
 	prefs.hex_irc_who_join = 1; /* Can kick with inordinate amount of channels, required for some of our features though, TODO: add cap like away check? */
 	prefs.hex_irc_whois_front = 1;
 	prefs.hex_net_auto_reconnect = 1;
@@ -846,7 +841,7 @@ load_default_config(void)
 #ifdef WIN32
 	if (portable_mode () || SHGetKnownFolderPath (&FOLDERID_Downloads, 0, NULL, &roaming_path_wide) != S_OK)
 	{
-		snprintf (prefs.hex_dcc_dir, sizeof (prefs.hex_dcc_dir), "%s\\downloads", get_xdir ());
+		g_snprintf (prefs.hex_dcc_dir, sizeof (prefs.hex_dcc_dir), "%s\\downloads", get_xdir ());
 	}
 	else
 	{
@@ -860,34 +855,36 @@ load_default_config(void)
 #else
 	if (g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD))
 	{
-		strcpy (prefs.hex_dcc_dir, g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD));
+		safe_strcpy (prefs.hex_dcc_dir, g_get_user_special_dir (G_USER_DIRECTORY_DOWNLOAD), sizeof(prefs.hex_dcc_dir));
 	}
 	else
 	{
-		strcpy (prefs.hex_dcc_dir, g_build_filename (g_get_home_dir (), "Downloads", NULL));
+		char *download_dir = g_build_filename (g_get_home_dir (), "Downloads", NULL);
+		safe_strcpy (prefs.hex_dcc_dir, download_dir, sizeof(prefs.hex_dcc_dir));
+		g_free (download_dir);
 	}
 #endif
 	strcpy (prefs.hex_gui_ulist_doubleclick, "QUERY %s");
 	strcpy (prefs.hex_input_command_char, "/");
-	strcpy (prefs.hex_irc_logmask, g_build_filename ("%n", "%c.log", NULL));
-	strcpy (prefs.hex_irc_nick1, username);
-	strcpy (prefs.hex_irc_nick2, username);
-	strcat (prefs.hex_irc_nick2, "_");
-	strcpy (prefs.hex_irc_nick3, username);
-	strcat (prefs.hex_irc_nick3, "__");
+	strcpy (prefs.hex_irc_logmask, "%n"G_DIR_SEPARATOR_S"%c.log");
+	safe_strcpy (prefs.hex_irc_nick1, username, sizeof(prefs.hex_irc_nick1));
+	safe_strcpy (prefs.hex_irc_nick2, username, sizeof(prefs.hex_irc_nick2));
+	g_strlcat (prefs.hex_irc_nick2, "_", sizeof(prefs.hex_irc_nick2));
+	safe_strcpy (prefs.hex_irc_nick3, username, sizeof(prefs.hex_irc_nick3));
+	g_strlcat (prefs.hex_irc_nick3, "__", sizeof(prefs.hex_irc_nick3));
 	strcpy (prefs.hex_irc_no_hilight, "NickServ,ChanServ,InfoServ,N,Q");
-	strcpy (prefs.hex_irc_part_reason, _("Leaving"));
-	strcpy (prefs.hex_irc_quit_reason, prefs.hex_irc_part_reason);
-	strcpy (prefs.hex_irc_real_name, realname);
-	strcpy (prefs.hex_irc_user_name, username);
+	safe_strcpy (prefs.hex_irc_part_reason, _("Leaving"), sizeof(prefs.hex_irc_part_reason));
+	safe_strcpy (prefs.hex_irc_quit_reason, prefs.hex_irc_part_reason, sizeof(prefs.hex_irc_quit_reason));
+	safe_strcpy (prefs.hex_irc_real_name, realname, sizeof(prefs.hex_irc_real_name));
+	safe_strcpy (prefs.hex_irc_user_name, username, sizeof(prefs.hex_irc_user_name));
 	strcpy (prefs.hex_stamp_log_format, "%b %d %H:%M:%S ");
 	strcpy (prefs.hex_stamp_text_format, "[%H:%M:%S] ");
 
 	font = fe_get_default_font ();
 	if (font)
 	{
-		strcpy (prefs.hex_text_font, font);
-		strcpy (prefs.hex_text_font_main, font);
+		safe_strcpy (prefs.hex_text_font, font, sizeof(prefs.hex_text_font));
+		safe_strcpy (prefs.hex_text_font_main, font, sizeof(prefs.hex_text_font_main));
 	}
 	else
 	{
@@ -897,7 +894,7 @@ load_default_config(void)
 
 	strcpy (prefs.hex_text_font_alternative, DEF_FONT_ALTER);
 	langs = get_default_spell_languages ();
-	strcpy (prefs.hex_text_spell_langs, langs);
+	safe_strcpy (prefs.hex_text_spell_langs, langs, sizeof(prefs.hex_text_spell_langs));
 
 
 	/* private variables */
@@ -1227,7 +1224,7 @@ cmd_set (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 				if (erase || *val)
 				{
 					/* save the previous value until we print it out */
-					prev_string = (char*) malloc (vars[i].len + 1);
+					prev_string = g_malloc (vars[i].len + 1);
 					strncpy (prev_string, (char *) &prefs + vars[i].offset, vars[i].len);
 
 					/* update the variable */
@@ -1239,7 +1236,7 @@ cmd_set (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 						PrintTextf (sess, "%s set to: %s (was: %s)\n", var, (char *) &prefs + vars[i].offset, prev_string);
 					}
 
-					free (prev_string);
+					g_free (prev_string);
 				}
 				else
 				{
@@ -1314,7 +1311,7 @@ cmd_set (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 }
 
 int
-hexchat_open_file (char *file, int flags, int mode, int xof_flags)
+hexchat_open_file (const char *file, int flags, int mode, int xof_flags)
 {
 	char *buf;
 	int fd;

src/common/cfgfiles.h

@@ -48,7 +48,7 @@ void list_loadconf (char *file, GSList ** list, char *defaultconf);
 int list_delentry (GSList ** list, char *name);
 void list_addentry (GSList ** list, char *cmd, char *name);
 int cmd_set (session *sess, char *tbuf, char *word[], char *word_eol[]);
-int hexchat_open_file (char *file, int flags, int mode, int xof_flags);
+int hexchat_open_file (const char *file, int flags, int mode, int xof_flags);
 FILE *hexchat_fopen_file (const char *file, const char *mode, int xof_flags);
 
 #define XOF_DOMODE 1

src/common/chanopt.c

@@ -119,7 +119,7 @@ chanopt_command (session *sess, char *tbuf, char *word[], char *word_eol[])
 	if (!quiet)
 		PrintTextf (sess, "\002Network\002: %s \002Channel\002: %s\n",
 						sess->server->network ? server_get_network (sess->server, TRUE) : _("<none>"),
-						sess->channel[0] ? sess->channel : _("<none>"));
+						sess->session_name[0] ? sess->session_name : _("<none>"));
 
 	while (i < sizeof (chanopt) / sizeof (channel_options))
 	{
@@ -208,7 +208,7 @@ chanopt_find (char *network, char *channel, gboolean add_new)
 		return NULL;
 
 	/* allocate a new one */
-	co = g_malloc0 (sizeof (chanopt_in_memory));
+	co = g_new0 (chanopt_in_memory, 1);
 	co->channel = g_strdup (channel);
 	co->network = g_strdup (network);
 
@@ -298,7 +298,7 @@ chanopt_load (session *sess)
 	chanopt_in_memory *co;
 	char *network;
 
-	if (sess->channel[0] == 0)
+	if (sess->session_name[0] == 0)
 		return;
 
 	network = server_get_network (sess->server, FALSE);
@@ -311,7 +311,7 @@ chanopt_load (session *sess)
 		chanopt_load_all ();
 	}
 
-	co = chanopt_find (network, sess->channel, FALSE);
+	co = chanopt_find (network, sess->session_name, FALSE);
 	if (!co)
 		return;
 
@@ -334,7 +334,7 @@ chanopt_save (session *sess)
 	chanopt_in_memory *co;
 	char *network;
 
-	if (sess->channel[0] == 0)
+	if (sess->session_name[0] == 0)
 		return;
 
 	network = server_get_network (sess->server, FALSE);
@@ -343,7 +343,7 @@ chanopt_save (session *sess)
 
 	/* 2. reconcile sess with what we loaded from disk */
 
-	co = chanopt_find (network, sess->channel, TRUE);
+	co = chanopt_find (network, sess->session_name, TRUE);
 
 	i = 0;
 	while (i < sizeof (chanopt) / sizeof (channel_options))
@@ -368,10 +368,10 @@ chanopt_save_one_channel (chanopt_in_memory *co, int fh)
 	char buf[256];
 	guint8 val;
 
-	snprintf (buf, sizeof (buf), "%s = %s\n", "network", co->network);
+	g_snprintf (buf, sizeof (buf), "%s = %s\n", "network", co->network);
 	write (fh, buf, strlen (buf));
 
-	snprintf (buf, sizeof (buf), "%s = %s\n", "channel", co->channel);
+	g_snprintf (buf, sizeof (buf), "%s = %s\n", "channel", co->channel);
 	write (fh, buf, strlen (buf));
 
 	i = 0;
@@ -380,7 +380,7 @@ chanopt_save_one_channel (chanopt_in_memory *co, int fh)
 		val = G_STRUCT_MEMBER (guint8, co, chanopt[i].offset);
 		if (val != SET_DEFAULT)
 		{
-			snprintf (buf, sizeof (buf), "%s = %d\n", chanopt[i].name, val);
+			g_snprintf (buf, sizeof (buf), "%s = %d\n", chanopt[i].name, val);
 			write (fh, buf, strlen (buf));
 		}
 		i++;

src/common/common.vcxproj

@@ -20,16 +20,15 @@
     <ClInclude Include="dcc.h" />
     <ClInclude Include="fe.h" />
     <ClInclude Include="history.h" />
-    <ClInclude Include="identd.h" />
     <ClInclude Include="ignore.h" />
     <ClInclude Include="inbound.h" />
     <ClInclude Include="inet.h" />
     <ClInclude Include="marshal.h" />
     <ClInclude Include="modes.h" />
-    <ClInclude Include="msproxy.h" />
     <ClInclude Include="network.h" />
     <ClInclude Include="notify.h" />
     <ClInclude Include="outbound.h" />
+    <ClInclude Include="plugin-identd.h" />
     <ClInclude Include="plugin-timer.h" />
     <ClInclude Include="plugin.h" />
     <ClInclude Include="proto-irc.h" />
@@ -54,12 +53,11 @@
     <ClCompile Include="ctcp.c" />
     <ClCompile Include="dcc.c" />
     <ClCompile Include="history.c" />
-    <ClCompile Include="identd.c" />
+    <ClCompile Include="plugin-identd.c" />
     <ClCompile Include="ignore.c" />
     <ClCompile Include="inbound.c" />
     <ClCompile Include="marshal.c" />
     <ClCompile Include="modes.c" />
-    <ClCompile Include="msproxy.c" />
     <ClCompile Include="network.c" />
     <ClCompile Include="notify.c" />
     <ClCompile Include="outbound.c" />
@@ -77,8 +75,8 @@
     <ClCompile Include="hexchat.c" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\config-win32.h.tt" />
-    <ClInclude Include="..\..\config-win32.h" />
+    <None Include="..\..\win32\config.h.tt" />
+    <ClInclude Include="..\..\config.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{87554B59-006C-4D94-9714-897B27067BA3}</ProjectGuid>
@@ -125,7 +123,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -142,7 +140,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_LIB;$(OwnFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..;$(DepsRoot)\include;$(Glib);$(Gtk);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DisableSpecificWarnings>4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -160,11 +158,11 @@
     <PreBuildEvent>
       <Command><![CDATA[
 SET SOLUTIONDIR=$(SolutionDir)..\
-powershell -File "$(SolutionDir)..\version-template.ps1" "$(SolutionDir)..\config-win32.h.tt" "$(SolutionDir)..\config-win32.h"
+powershell -File "$(SolutionDir)..\win32\version-template.ps1" "$(SolutionDir)..\win32\config.h.tt" "$(SolutionDir)..\config.h"
 "$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --header "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.h"
 "$(DepsRoot)\bin\glib-genmarshal.exe" --prefix=_hexchat_marshal --body "$(ProjectDir)marshalers.list" > "$(ProjectDir)marshal.c"
 
       ]]></Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
-</Project>
+</Project>

src/common/common.vcxproj.filters

@@ -29,9 +29,6 @@
     <ClInclude Include="history.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="identd.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ignore.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -44,9 +41,6 @@
     <ClInclude Include="modes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="msproxy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="network.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -104,7 +98,7 @@
     <ClInclude Include="hexchat-plugin.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\config-win32.h">
+    <ClInclude Include="..\..\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="typedef.h">
@@ -113,6 +107,9 @@
     <ClInclude Include="marshal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="plugin-identd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="cfgfiles.c">
@@ -130,9 +127,6 @@
     <ClCompile Include="history.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="identd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="ignore.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -142,9 +136,6 @@
     <ClCompile Include="modes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="msproxy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="network.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -193,8 +184,11 @@
     <ClCompile Include="marshal.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="plugin-identd.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\config-win32.h.tt" />
+    <None Include="..\..\win32\config.h.tt" />
   </ItemGroup>
-</Project>
+</Project>

src/common/ctcp.c

@@ -44,12 +44,12 @@ ctcp_reply (session *sess, char *nick, char *word[], char *word_eol[],
 {
 	char tbuf[4096];	/* can receive 2048 from IRC, so this is enough */
 
-	conf = strdup (conf);
+	conf = g_strdup (conf);
 	/* process %C %B etc */
 	check_special_chars (conf, TRUE);
 	auto_insert (tbuf, sizeof (tbuf), conf, word, word_eol, "", "", word_eol[5],
 					 server_get_network (sess->server, TRUE), "", "", nick, "");
-	free (conf);
+	g_free (conf);
 	handle_command (sess, tbuf, FALSE);
 }
 
@@ -139,10 +139,10 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
 	if (!g_ascii_strcasecmp (msg, "VERSION") && !prefs.hex_irc_hide_version)
 	{
 #ifdef WIN32
-		snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" [x%d] / %s",
+		g_snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" [x%d] / %s",
 					 get_cpu_arch (), get_sys_str (1));
 #else
-		snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" / %s",
+		g_snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" / %s",
 					 get_sys_str (1));
 #endif
 		serv->p_nctcp (serv, nick, outbuf);

src/common/dbus/Makefile.am

@@ -15,7 +15,7 @@ BUILT_SOURCES =				\
 
 CLEANFILES = $(BUILT_SOURCES)
 
-AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS)
+AM_CPPFLAGS = $(COMMON_CFLAGS) $(DBUS_CFLAGS) -I$(top_srcdir)/src/common
 
 noinst_PROGRAMS = example
 example_SOURCES = example.c

src/common/dbus/dbus-client.c

@@ -19,11 +19,13 @@
  * xclaesse@gmail.com
  */
 
+#include "config.h"
+
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <dbus/dbus-glib.h>
 #include "dbus-client.h"
-#include "../hexchat.h"
-#include "../hexchatc.h"
+#include "hexchat.h"
+#include "hexchatc.h"
 
 #define DBUS_SERVICE "org.hexchat.service"
 #define DBUS_REMOTE "/org/hexchat/Remote"
@@ -91,7 +93,7 @@ hexchat_remote (void)
 	g_object_unref (dbus);
 
 	if (!hexchat_running) {
-		//dbus_g_connection_unref (connection);
+		/* dbus_g_connection_unref (connection); */
 		return;
 	}
 

src/common/dbus/dbus-plugin.c

@@ -25,7 +25,8 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib/gi18n.h>
-#include "../hexchat-plugin.h"
+#include "hexchat-plugin.h"
+#include "dbus-plugin.h"
 
 #define PNAME _("remote access")
 #define PDESC _("plugin for remote access using DBUS")

src/common/dbus/example.c

@@ -33,7 +33,7 @@ guint command_id;
 guint server_id;
 
 static void
-write_error (char *message,
+write_error (const char *message,
 	     GError **error)
 {
 	if (error == NULL || *error == NULL) {

src/common/dcc.h

@@ -39,17 +39,6 @@
 
 #define CPS_AVG_WINDOW 10
 
-/* can we do 64-bit dcc? */
-#if defined(G_GINT64_FORMAT) && defined(HAVE_STRTOULL)
-#define USE_DCC64
-/* we really get only 63 bits, since st_size is signed */
-#define DCC_SIZE gint64
-#define DCC_SFMT G_GINT64_FORMAT
-#else
-#define DCC_SIZE unsigned int
-#define DCC_SFMT "u"
-#endif
-
 struct DCC
 {
 	struct server *serv;
@@ -62,21 +51,21 @@ struct DCC
 	int wiotag;						/* writing/sending io tag */
 	int port;
 	int pasvid;						/* mIRC's passive DCC id */
-	int cps;
+	gint64 cps;
 	int resume_error;
 	int resume_errno;
 
 	GTimeVal lastcpstv, firstcpstv;
-	DCC_SIZE lastcpspos;
-	int maxcps;
+	goffset lastcpspos;
+	gint64 maxcps;
 
 	unsigned char ack_buf[4];	/* buffer for reading 4-byte ack */
 	int ack_pos;
 
-	DCC_SIZE size;
-	DCC_SIZE resumable;
-	DCC_SIZE ack;
-	DCC_SIZE pos;
+	guint64 size;
+	guint64 resumable;
+	guint64 ack;
+	guint64 pos;
 	time_t starttime;
 	time_t offertime;
 	time_t lasttime;
@@ -125,7 +114,7 @@ void dcc_check_timeouts (void);
 void dcc_change_nick (server *serv, char *oldnick, char *newnick);
 void dcc_notify_kill (struct server *serv);
 struct DCC *dcc_write_chat (char *nick, char *text);
-void dcc_send (struct session *sess, char *to, char *file, int maxcps, int passive);
+void dcc_send (struct session *sess, char *to, char *file, gint64 maxcps, int passive);
 struct DCC *find_dcc (char *nick, char *file, int type);
 void dcc_get_nick (struct session *sess, char *nick);
 void dcc_chat (session *sess, char *nick, int passive);
@@ -134,5 +123,6 @@ void handle_dcc (session *sess, char *nick, char *word[], char *word_eol[],
 void dcc_show_list (session *sess);
 guint32 dcc_get_my_address (void);
 void dcc_get_with_destfile (struct DCC *dcc, char *utf8file);
+char *net_ip (guint32 addr);
 
 #endif

src/common/fe.h

@@ -88,11 +88,10 @@ void fe_progressbar_start (struct session *sess);
 void fe_progressbar_end (struct server *serv);
 void fe_print_text (struct session *sess, char *text, time_t stamp,
 					gboolean no_activity);
-void fe_userlist_insert (struct session *sess, struct User *newuser, int row, int sel);
+void fe_userlist_insert (struct session *sess, struct User *newuser, gboolean sel);
 int fe_userlist_remove (struct session *sess, struct User *user);
 void fe_userlist_rehash (struct session *sess, struct User *user);
 void fe_userlist_update (struct session *sess, struct User *user);
-void fe_userlist_move (struct session *sess, struct User *user, int new_row);
 void fe_userlist_numbers (struct session *sess);
 void fe_userlist_clear (struct session *sess);
 void fe_userlist_set_selected (struct session *sess);

src/common/hexchat-plugin.h

@@ -88,11 +88,19 @@ struct _hexchat_plugin
 	void (*hexchat_print) (hexchat_plugin *ph,
 	     const char *text);
 	void (*hexchat_printf) (hexchat_plugin *ph,
-	      const char *format, ...);
+	      const char *format, ...)
+#ifdef __GNUC__
+	__attribute__((format(printf, 2, 3)))
+#endif
+	;
 	void (*hexchat_command) (hexchat_plugin *ph,
 	       const char *command);
 	void (*hexchat_commandf) (hexchat_plugin *ph,
-		const char *format, ...);
+		const char *format, ...)
+#ifdef __GNUC__
+	__attribute__((format(printf, 2, 3)))
+#endif
+	;
 	int (*hexchat_nickcmp) (hexchat_plugin *ph,
 	       const char *s1,
 	       const char *s2);
@@ -254,7 +262,11 @@ hexchat_print (hexchat_plugin *ph,
 
 void
 hexchat_printf (hexchat_plugin *ph,
-	      const char *format, ...);
+	      const char *format, ...)
+#ifdef __GNUC__
+	__attribute__((format(printf, 2, 3)))
+#endif
+;
 
 void
 hexchat_command (hexchat_plugin *ph,
@@ -262,7 +274,11 @@ hexchat_command (hexchat_plugin *ph,
 
 void
 hexchat_commandf (hexchat_plugin *ph,
-		const char *format, ...);
+		const char *format, ...)
+#ifdef __GNUC__
+	__attribute__((format(printf, 2, 3)))
+#endif
+;
 
 int
 hexchat_nickcmp (hexchat_plugin *ph,

src/common/hexchat.c

@@ -42,6 +42,7 @@
 #include "ignore.h"
 #include "hexchat-plugin.h"
 #include "plugin.h"
+#include "plugin-identd.h"
 #include "plugin-timer.h"
 #include "notify.h"
 #include "server.h"
@@ -55,14 +56,6 @@
 #include <glib-object.h>			/* for g_type_init() */
 #endif
 
-#ifdef USE_MSPROXY
-#include "msproxy.h"
-#endif
-
-#ifdef USE_LIBPROXY
-#include <proxy.h>
-#endif
-
 GSList *popup_list = 0;
 GSList *button_list = 0;
 GSList *dlgbutton_list = 0;
@@ -113,10 +106,6 @@ struct session *current_tab;
 struct session *current_sess = 0;
 struct hexchatprefs prefs;
 
-#ifdef USE_LIBPROXY
-pxProxyFactory *libproxy_factory;
-#endif
-
 /*
  * Update the priority queue of the "interesting sessions"
  * (sess_list_by_lastact).
@@ -212,7 +201,7 @@ find_dialog (server *serv, char *nick)
 		}
 		list = list->next;
 	}
-	return 0;
+	return NULL;
 }
 
 session *
@@ -223,14 +212,14 @@ find_channel (server *serv, char *chan)
 	while (list)
 	{
 		sess = list->data;
-		if ((!serv || serv == sess->server) && sess->type == SESS_CHANNEL)
+		if ((serv == sess->server) && sess->type == SESS_CHANNEL)
 		{
 			if (!serv->p_cmp (chan, sess->channel))
 				return sess;
 		}
 		list = list->next;
 	}
-	return 0;
+	return NULL;
 }
 
 static void
@@ -260,7 +249,7 @@ lag_check (void)
 	unsigned long tim;
 	char tbuf[128];
 	time_t now = time (0);
-	int lag;
+	time_t lag;
 
 	tim = make_ping_time ();
 
@@ -270,16 +259,17 @@ lag_check (void)
 		if (serv->connected && serv->end_of_motd)
 		{
 			lag = now - serv->ping_recv;
-			if (prefs.hex_net_ping_timeout && lag > prefs.hex_net_ping_timeout && lag > 0)
+			if (prefs.hex_net_ping_timeout != 0 && lag > prefs.hex_net_ping_timeout && lag > 0)
 			{
-				sprintf (tbuf, "%d", lag);
+				sprintf (tbuf, "%" G_GINT64_FORMAT, (gint64) lag);
 				EMIT_SIGNAL (XP_TE_PINGTIMEOUT, serv->server_session, tbuf, NULL,
 								 NULL, NULL, 0);
 				if (prefs.hex_net_auto_reconnect)
 					serv->auto_reconnect (serv, FALSE, -1);
-			} else
+			}
+			else
 			{
-				snprintf (tbuf, sizeof (tbuf), "LAG%lu", tim);
+				g_snprintf (tbuf, sizeof (tbuf), "LAG%lu", tim);
 				serv->p_ping (serv, "", tbuf);
 				
 				if (!serv->lag_sent)
@@ -359,9 +349,6 @@ static int
 hexchat_misc_checks (void)		/* this gets called every 1/2 second */
 {
 	static int count = 0;
-#ifdef USE_MSPROXY
-	static int count2 = 0;
-#endif
 
 	count++;
 
@@ -377,15 +364,6 @@ hexchat_misc_checks (void)		/* this gets called every 1/2 second */
 		count = 0;
 	}
 
-#ifdef USE_MSPROXY	
-	count2++;
-	if (count2 >= 720)			/* 720 every 6 minutes */
-	{
-		msproxy_keepalive ();
-		count2 = 0;
-	}
-#endif
-
 	return 1;
 }
 
@@ -396,7 +374,6 @@ irc_init (session *sess)
 {
 	static int done_init = FALSE;
 	char *buf;
-	int i;
 
 	if (done_init)
 		return;
@@ -404,6 +381,7 @@ irc_init (session *sess)
 	done_init = TRUE;
 
 	plugin_add (sess, NULL, NULL, timer_plugin_init, NULL, NULL, FALSE);
+	plugin_add (sess, NULL, NULL, identd_plugin_init, identd_plugin_deinit, NULL, FALSE);
 
 #ifdef USE_PLUGIN
 	if (!arg_skip_plugins)
@@ -431,7 +409,8 @@ irc_init (session *sess)
 	
 	if (arg_urls != NULL)
 	{
-		for (i = 0; i < g_strv_length(arg_urls); i++)
+		guint i;
+		for (i = 0; i < g_strv_length (arg_urls); i++)
 		{
 			buf = g_strdup_printf ("%s %s", i==0? "server" : "newserver", arg_urls[i]);
 			handle_command (sess, buf, FALSE);
@@ -455,12 +434,7 @@ session_new (server *serv, char *from, int type, int focus)
 {
 	session *sess;
 
-	sess = malloc (sizeof (struct session));
-	if (sess == NULL)
-	{
-		return NULL;
-	}
-	memset (sess, 0, sizeof (struct session));
+	sess = g_new0 (struct session, 1);
 
 	sess->server = serv;
 	sess->logfd = -1;
@@ -479,7 +453,10 @@ session_new (server *serv, char *from, int type, int focus)
 	sess->lastact_idx = LACT_NONE;
 
 	if (from != NULL)
-		safe_strcpy (sess->channel, from, CHANLEN);
+	{
+		safe_strcpy(sess->channel, from, CHANLEN);
+		safe_strcpy(sess->session_name, from, CHANLEN);
+	}
 
 	sess_list = g_slist_prepend (sess_list, sess);
 
@@ -539,9 +516,8 @@ exec_notify_kill (session * sess)
 		waitpid (re->childpid, NULL, WNOHANG);
 		fe_input_remove (re->iotag);
 		close (re->myfd);
-		if (re->linebuf)
-			free(re->linebuf);
-		free (re);
+		g_free(re->linebuf);
+		g_free (re);
 	}
 #endif
 }
@@ -647,10 +623,8 @@ session_free (session *killsess)
 	send_quit_or_part (killsess);
 
 	history_free (&killsess->history);
-	if (killsess->topic)
-		free (killsess->topic);
-	if (killsess->current_modes)
-		free (killsess->current_modes);
+	g_free (killsess->topic);
+	g_free (killsess->current_modes);
 
 	fe_session_callback (killsess);
 
@@ -661,7 +635,7 @@ session_free (session *killsess)
 			current_sess = sess_list->data;
 	}
 
-	free (killsess);
+	g_free (killsess);
 
 	if (!sess_list && !in_hexchat_exit)
 		hexchat_exit ();						/* sess_list is empty, quit! */
@@ -780,15 +754,11 @@ xchat_init (void)
 #ifdef WIN32
 	WSADATA wsadata;
 
-#ifdef USE_IPV6
 	if (WSAStartup(0x0202, &wsadata) != 0)
 	{
 		MessageBox (NULL, "Cannot find winsock 2.2+", "Error", MB_OK);
 		exit (0);
 	}
-#else
-	WSAStartup(0x0101, &wsadata);
-#endif	/* !USE_IPV6 */
 #endif	/* !WIN32 */
 
 #ifdef USE_SIGACTION
@@ -825,7 +795,7 @@ xchat_init (void)
 	notify_load ();
 	ignore_load ();
 
-	snprintf (buf, sizeof (buf),
+	g_snprintf (buf, sizeof (buf),
 		"NAME %s~%s~\n"				"CMD query %%s\n\n"\
 		"NAME %s~%s~\n"				"CMD send %%s\n\n"\
 		"NAME %s~%s~\n"				"CMD whois %%s %%s\n\n"\
@@ -881,7 +851,7 @@ xchat_init (void)
 
 	list_loadconf ("popup.conf", &popup_list, buf);
 
-	snprintf (buf, sizeof (buf),
+	g_snprintf (buf, sizeof (buf),
 		"NAME %s\n"				"CMD part\n\n"
 		"NAME %s\n"				"CMD getstr # join \"%s\"\n\n"
 		"NAME %s\n"				"CMD quote LINKS\n\n"
@@ -895,7 +865,7 @@ xchat_init (void)
 				_("Hide Version"));
 	list_loadconf ("usermenu.conf", &usermenu_list, buf);
 
-	snprintf (buf, sizeof (buf),
+	g_snprintf (buf, sizeof (buf),
 		"NAME %s\n"		"CMD op %%a\n\n"
 		"NAME %s\n"		"CMD deop %%a\n\n"
 		"NAME %s\n"		"CMD ban %%s\n\n"
@@ -912,7 +882,7 @@ xchat_init (void)
 				_("Dialog"));
 	list_loadconf ("buttons.conf", &button_list, buf);
 
-	snprintf (buf, sizeof (buf),
+	g_snprintf (buf, sizeof (buf),
 		"NAME %s\n"				"CMD whois %%s %%s\n\n"
 		"NAME %s\n"				"CMD send %%s\n\n"
 		"NAME %s\n"				"CMD dcc chat %%s\n\n"
@@ -982,47 +952,12 @@ hexchat_exit (void)
 	fe_exit ();
 }
 
-#ifndef WIN32
-
-static int
-child_handler (gpointer userdata)
-{
-	int pid = GPOINTER_TO_INT (userdata);
-
-	if (waitpid (pid, 0, WNOHANG) == pid)
-		return 0;					  /* remove timeout handler */
-	return 1;						  /* keep the timeout handler */
-}
-
-#endif
-
 void
 hexchat_exec (const char *cmd)
 {
-#ifdef WIN32
 	util_exec (cmd);
-#else
-	int pid = util_exec (cmd);
-	if (pid != -1)
-	/* zombie avoiding system. Don't ask! it has to be like this to work
-      with zvt (which overrides the default handler) */
-		fe_timeout_add (1000, child_handler, GINT_TO_POINTER (pid));
-#endif
 }
 
-void
-hexchat_execv (char * const argv[])
-{
-#ifdef WIN32
-	util_execv (argv);
-#else
-	int pid = util_execv (argv);
-	if (pid != -1)
-	/* zombie avoiding system. Don't ask! it has to be like this to work
-      with zvt (which overrides the default handler) */
-		fe_timeout_add (1000, child_handler, GINT_TO_POINTER (pid));
-#endif
-}
 
 static void
 set_locale (void)
@@ -1047,29 +982,33 @@ main (int argc, char *argv[])
 	int i;
 	int ret;
 
-	srand (time (0));	/* CL: do this only once! */
+	srand ((unsigned int) time (NULL)); /* CL: do this only once! */
 
 	/* We must check for the config dir parameter, otherwise load_config() will behave incorrectly.
 	 * load_config() must come before fe_args() because fe_args() calls gtk_init() which needs to
 	 * know the language which is set in the config. The code below is copy-pasted from fe_args()
 	 * for the most part. */
-	if (argc >= 3)
+	if (argc >= 2)
 	{
-		for (i = 1; i < argc - 1; i++)
+		for (i = 1; i < argc; i++)
 		{
-			if (strcmp (argv[i], "-d") == 0)
+			if ((strcmp (argv[i], "-d") == 0 || strcmp (argv[i], "--cfgdir") == 0)
+				&& i + 1 < argc)
 			{
-				if (xdir)
-				{
-					g_free (xdir);
-				}
-
-				xdir = strdup (argv[i + 1]);
+				xdir = g_strdup (argv[i + 1]);
+			}
+			else if (strncmp (argv[i], "--cfgdir=", 9) == 0)
+			{
+				xdir = g_strdup (argv[i] + 9);
+			}
 
+			if (xdir != NULL)
+			{
 				if (xdir[strlen (xdir) - 1] == G_DIR_SEPARATOR)
 				{
 					xdir[strlen (xdir) - 1] = 0;
 				}
+				break;
 			}
 		}
 	}
@@ -1093,10 +1032,6 @@ main (int argc, char *argv[])
 	/* we MUST do this after load_config () AND before fe_init (thus gtk_init) otherwise it will fail */
 	set_locale ();
 
-#ifdef SOCKS
-	SOCKSinit (argv[0]);
-#endif
-
 	ret = fe_args (argc, argv);
 	if (ret != -1)
 		return ret;
@@ -1105,10 +1040,6 @@ main (int argc, char *argv[])
 	hexchat_remote ();
 #endif
 
-#ifdef USE_LIBPROXY
-	libproxy_factory = px_proxy_factory_new();
-#endif
-
 	fe_init ();
 
 	/* This is done here because cfgfiles.c is too early in
@@ -1136,10 +1067,6 @@ main (int argc, char *argv[])
 
 	fe_main ();
 
-#ifdef USE_LIBPROXY
-	px_proxy_factory_free(libproxy_factory);
-#endif
-
 #ifdef WIN32
 	WSACleanup ();
 #endif

src/common/hexchat.h

@@ -17,14 +17,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifdef WIN32
-#include "../../config-win32.h"
-#else
-#include "../../config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include <time.h>			/* need time_t */
 
@@ -39,33 +37,7 @@
 #endif
 
 #include "history.h"
-
-#ifndef HAVE_SNPRINTF
-#define snprintf g_snprintf
-#endif
-
-#ifndef HAVE_VSNPRINTF
-#define vsnprintf _vsnprintf
-#endif
-
-#ifdef USE_DEBUG
-#define malloc(n) hexchat_malloc(n, __FILE__, __LINE__)
-#define realloc(n, m) hexchat_realloc(n, m, __FILE__, __LINE__)
-#define free(n) hexchat_dfree(n, __FILE__, __LINE__)
-#define strdup(n) hexchat_strdup(n, __FILE__, __LINE__)
-void *hexchat_malloc (int size, char *file, int line);
-void *hexchat_strdup (char *str, char *file, int line);
-void hexchat_dfree (void *buf, char *file, int line);
-void *hexchat_realloc (char *old, int len, char *file, int line);
-#endif
-
-#ifdef SOCKS
-#ifdef __sgi
-#include <sys/time.h>
-#define INCLUDE_PROTOTYPES 1
-#endif
-#include <socks.h>
-#endif
+#include "tree.h"
 
 #ifdef USE_OPENSSL
 #include <openssl/ssl.h>		  /* SSL_() */
@@ -80,9 +52,7 @@ void *hexchat_realloc (char *old, int len, char *file, int line);
 #endif
 
 /* force a 32bit CMP.L */
-#define CMPL(a, c0, c1, c2, c3) (a == (guint32)(c0 | (c1 << 8) | (c2 << 16) | (c3 << 24)))
 #define WORDL(c0, c1, c2, c3) (guint32)(c0 | (c1 << 8) | (c2 << 16) | (c3 << 24))
-#define WORDW(c0, c1) (guint16)(c0 | (c1 << 8))
 
 #ifdef WIN32						/* for win32 */
 #define OFLAGS O_BINARY
@@ -109,20 +79,6 @@ void *hexchat_realloc (char *old, int len, char *file, int line);
 #define USERNAMELEN 10
 #define HIDDEN_CHAR	8			/* invisible character for xtext */
 
-#if defined(ENABLE_NLS) && !defined(_)
-#  include <libintl.h>
-#  define _(x) gettext(x)
-#  ifdef gettext_noop
-#    define N_(String) gettext_noop (String)
-#  else
-#    define N_(String) (String)
-#  endif
-#endif
-#if !defined(_)
-#  define N_(String) (String)
-#  define _(x) (x)
-#endif
-
 struct nbexec
 {
 	int myfd;
@@ -292,6 +248,7 @@ struct hexchatprefs
 	int hex_gui_search_pos;
 	int hex_gui_slist_select;
 	int hex_gui_tab_layout;
+	int hex_gui_tab_middleclose;
 	int hex_gui_tab_newtofront;
 	int hex_gui_tab_pos;
 	int hex_gui_tab_small;
@@ -307,6 +264,7 @@ struct hexchatprefs
 	int hex_gui_win_state;
 	int hex_gui_win_top;
 	int hex_gui_win_width;
+	int hex_identd_port;
 	int hex_input_balloon_time;
 	int hex_irc_ban_type;
 	int hex_irc_join_delay;
@@ -412,12 +370,12 @@ typedef struct session
 	guint8 text_strip;
 
 	struct server *server;
-	void *usertree_alpha;			/* pure alphabetical tree */
-	void *usertree;					/* ordered with Ops first */
+	tree *usertree;					/* alphabetical tree */
 	struct User *me;					/* points to myself in the usertree */
 	char channel[CHANLEN];
 	char waitchannel[CHANLEN];		  /* waiting to join channel (/join sent) */
 	char willjoinchannel[CHANLEN];	  /* will issue /join for this channel */
+	char session_name[CHANLEN];		 /* the name of the session, should not modified */
 	char channelkey[64];			  /* XXX correct max length? */
 	int limit;						  /* channel user limit */
 	int logfd;
@@ -464,14 +422,6 @@ typedef struct session
 	void (*scrollback_replay_marklast) (struct session *sess);
 } session;
 
-struct msproxy_state_t
-{
-	gint32				clientid;
-	gint32				serverid;
-	unsigned char		seq_recv;		/* seq number of last packet recv.	*/
-	unsigned char		seq_sent;		/* seq number of last packet sent.	*/
-};
-
 /* SASL Mechanisms */
 #define MECH_PLAIN 0
 #define MECH_BLOWFISH 1
@@ -521,15 +471,10 @@ typedef struct server
 	int (*p_raw)(struct server *, char *raw);
 	int (*p_cmp)(const char *s1, const char *s2);
 
-	int port;
-	int sok;					/* is equal to sok4 or sok6 (the one we are using) */
-	int sok4;					/* tcp4 socket */
-	int sok6;					/* tcp6 socket */
-	int proxy_type;
-	int proxy_sok;				/* Additional information for MS Proxy beast */
-	int proxy_sok4;
-	int proxy_sok6;
-	struct msproxy_state_t msp_state;
+	guint16 port;
+	GSocket *sok;					/* is equal to sok4 or sok6 (the one we are using) */
+	GSocket *sok4;					/* tcp4 socket */
+	GSocket *sok6;					/* tcp6 socket */
 	int id;					/* unique ID number (for plugin API) */
 #ifdef USE_OPENSSL
 	SSL_CTX *ctx;
@@ -538,9 +483,7 @@ typedef struct server
 #else
 	void *ssl;
 #endif
-	int childread;
-	int childwrite;
-	int childpid;
+	GCancellable *cancellable;      /* to cancel connecting thread */
 	int iotag;
 	int recondelay_tag;				/* reconnect delay timeout */
 	int joindelay_tag;				/* waiting before we send JOIN */
@@ -662,7 +605,4 @@ struct popup
 /* CL: get a random int in the range [0..n-1]. DON'T use rand() % n, it gives terrible results. */
 #define RAND_INT(n) ((int)(rand() / (RAND_MAX + 1.0) * (n)))
 
-#define hexchat_filename_from_utf8 g_filename_from_utf8
-#define hexchat_filename_to_utf8 g_filename_to_utf8
-
 #endif

src/common/hexchatc.h

@@ -57,6 +57,5 @@ void session_free (session *killsess);
 void lag_check (void);
 void hexchat_exit (void);
 void hexchat_exec (const char *cmd);
-void hexchat_execv (char * const argv[]);
 
 #endif

src/common/history.c

@@ -18,14 +18,14 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <glib.h>
 #include "history.h"
 
 void
 history_add (struct history *his, char *text)
 {
-	if (his->lines[his->realpos])
-		free (his->lines[his->realpos]);
-	his->lines[his->realpos] = strdup (text);
+	g_free (his->lines[his->realpos]);
+	his->lines[his->realpos] = g_strdup (text);
 	his->realpos++;
 	if (his->realpos == HISTORY_SIZE)
 		his->realpos = 0;
@@ -40,7 +40,7 @@ history_free (struct history *his)
 	{
 		if (his->lines[i])
 		{
-			free (his->lines[i]);
+			g_free (his->lines[i]);
 			his->lines[i] = 0;
 		}
 	}
@@ -52,7 +52,7 @@ history_down (struct history *his)
 	int next;
 
 	if (his->pos == his->realpos)	/* allow down only after up */
-		return 0;
+		return NULL;
 	if (his->realpos == 0)
 	{
 		if (his->pos == HISTORY_SIZE - 1)
@@ -79,7 +79,7 @@ history_down (struct history *his)
 		return his->lines[his->pos];
 	}
 
-	return 0;
+	return NULL;
 }
 
 char *
@@ -90,11 +90,11 @@ history_up (struct history *his, char *current_text)
 	if (his->realpos == HISTORY_SIZE - 1)
 	{
 		if (his->pos == 0)
-			return 0;
+			return NULL;
 	} else
 	{
 		if (his->pos == his->realpos + 1)
-			return 0;
+			return NULL;
 	}
 
 	next = HISTORY_SIZE - 1;
@@ -117,5 +117,5 @@ history_up (struct history *his, char *current_text)
 		return his->lines[his->pos];
 	}
 
-	return 0;
+	return NULL;
 }

src/common/identd.c

@@ -1,201 +0,0 @@
-/* HexChat
- * Copyright (C) 1998-2010 Peter Zelezny.
- * Copyright (C) 2009-2013 Berke Viktor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/* simple identd server for HexChat under Win32 */
-
-#include "inet.h"
-#include "hexchat.h"
-#include "hexchatc.h"
-#include "text.h"
-
-static int identd_is_running = FALSE;
-#ifdef USE_IPV6
-static int identd_ipv6_is_running = FALSE;
-#endif
-
-static int
-identd (char *username)
-{
-	int sok, read_sok, len;
-	char *p;
-	char buf[256];
-	char outbuf[256];
-	char ipbuf[INET_ADDRSTRLEN];
-	struct sockaddr_in addr;
-
-	sok = socket (AF_INET, SOCK_STREAM, 0);
-	if (sok == INVALID_SOCKET)
-	{
-		free (username);
-		return 0;
-	}
-
-	len = 1;
-	setsockopt (sok, SOL_SOCKET, SO_REUSEADDR, (char *) &len, sizeof (len));
-
-	memset (&addr, 0, sizeof (addr));
-	addr.sin_family = AF_INET;
-	addr.sin_port = htons (113);
-
-	if (bind (sok, (struct sockaddr *) &addr, sizeof (addr)) == SOCKET_ERROR)
-	{
-		closesocket (sok);
-		free (username);
-		return 0;
-	}
-
-	if (listen (sok, 1) == SOCKET_ERROR)
-	{
-		closesocket (sok);
-		free (username);
-		return 0;
-	}
-
-	len = sizeof (addr);
-	read_sok = accept (sok, (struct sockaddr *) &addr, &len);
-	closesocket (sok);
-	if (read_sok == INVALID_SOCKET)
-	{
-		free (username);
-		return 0;
-	}
-
-	identd_is_running = FALSE;
-
-#if 0	/* causes random crashes, probably due to CreateThread */
-	EMIT_SIGNAL (XP_TE_IDENTD, current_sess, inet_ntoa (addr.sin_addr), username, NULL, NULL, 0);
-#endif
-	inet_ntop (AF_INET, &addr.sin_addr, ipbuf, sizeof (ipbuf));
-	snprintf (outbuf, sizeof (outbuf), "*\tServicing ident request from %s as %s\n", ipbuf, username);
-	PrintText (current_sess, outbuf);
-
-	recv (read_sok, buf, sizeof (buf) - 1, 0);
-	buf[sizeof (buf) - 1] = 0;	  /* ensure null termination */
-
-	p = strchr (buf, ',');
-	if (p)
-	{
-		snprintf (outbuf, sizeof (outbuf) - 1, "%d, %d : USERID : UNIX : %s\r\n",
-					 atoi (buf), atoi (p + 1), username);
-		outbuf[sizeof (outbuf) - 1] = 0;	/* ensure null termination */
-		send (read_sok, outbuf, strlen (outbuf), 0);
-	}
-
-	sleep (1);
-	closesocket (read_sok);
-	free (username);
-
-	return 0;
-}
-
-#ifdef USE_IPV6
-static int
-identd_ipv6 (char *username)
-{
-	int sok, read_sok, len;
-	char *p;
-	char buf[256];
-	char outbuf[256];
-	char ipbuf[INET6_ADDRSTRLEN];
-	struct sockaddr_in6 addr;
-
-	sok = socket (AF_INET6, SOCK_STREAM, 0);
-	if (sok == INVALID_SOCKET)
-	{
-		free (username);
-		return 0;
-	}
-
-	len = 1;
-	setsockopt (sok, SOL_SOCKET, SO_REUSEADDR, (char *) &len, sizeof (len));
-
-	memset (&addr, 0, sizeof (addr));
-	addr.sin6_family = AF_INET6;
-	addr.sin6_port = htons (113);
-
-	if (bind (sok, (struct sockaddr *) &addr, sizeof (addr)) == SOCKET_ERROR)
-	{
-		closesocket (sok);
-		free (username);
-		return 0;
-	}
-
-	if (listen (sok, 1) == SOCKET_ERROR)
-	{
-		closesocket (sok);
-		free (username);
-		return 0;
-	}
-
-	len = sizeof (addr);
-	read_sok = accept (sok, (struct sockaddr *) &addr, &len);
-	closesocket (sok);
-	if (read_sok == INVALID_SOCKET)
-	{
-		free (username);
-		return 0;
-	}
-
-	identd_ipv6_is_running = FALSE;
-
-	inet_ntop (AF_INET6, &addr.sin6_addr, ipbuf, sizeof (ipbuf));
-	snprintf (outbuf, sizeof (outbuf), "*\tServicing ident request from %s as %s\n", ipbuf, username);
-	PrintText (current_sess, outbuf);
-
-	recv (read_sok, buf, sizeof (buf) - 1, 0);
-	buf[sizeof (buf) - 1] = 0;	  /* ensure null termination */
-
-	p = strchr (buf, ',');
-	if (p)
-	{
-		snprintf (outbuf, sizeof (outbuf) - 1, "%d, %d : USERID : UNIX : %s\r\n", atoi (buf), atoi (p + 1), username);
-		outbuf[sizeof (outbuf) - 1] = 0;	/* ensure null termination */
-		send (read_sok, outbuf, strlen (outbuf), 0);
-	}
-
-	sleep (1);
-	closesocket (read_sok);
-	free (username);
-
-	return 0;
-}
-#endif
-
-void
-identd_start (char *username)
-{
-	DWORD tid;
-
-#ifdef USE_IPV6
-	DWORD tidv6;
-	if (identd_ipv6_is_running == FALSE)
-	{
-		identd_ipv6_is_running = TRUE;
-		CloseHandle (CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) identd_ipv6,
-						 strdup (username), 0, &tidv6));
-	}
-#endif
-
-	if (identd_is_running == FALSE)
-	{
-		identd_is_running = TRUE;
-		CloseHandle (CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE) identd,
-						 strdup (username), 0, &tid));
-	}
-}

src/common/ignore.c

@@ -53,7 +53,7 @@ static int ignored_total = 0;
 struct ignore *
 ignore_exists (char *mask)
 {
-	struct ignore *ig = 0;
+	struct ignore *ig = NULL;
 	GSList *list;
 
 	list = ignore_list;
@@ -79,7 +79,7 @@ ignore_exists (char *mask)
 int
 ignore_add (char *mask, int type, gboolean overwrite)
 {
-	struct ignore *ig = 0;
+	struct ignore *ig = NULL;
 	int change_only = FALSE;
 
 	/* first check if it's already ignored */
@@ -88,12 +88,9 @@ ignore_add (char *mask, int type, gboolean overwrite)
 		change_only = TRUE;
 
 	if (!change_only)
-		ig = malloc (sizeof (struct ignore));
+		ig = g_new (struct ignore, 1);
 
-	if (!ig)
-		return 0;
-
-	ig->mask = strdup (mask);
+	ig->mask = g_strdup (mask);
 
 	if (!overwrite && change_only)
 		ig->type |= type;
@@ -125,7 +122,7 @@ ignore_showlist (session *sess)
 		ig = list->data;
 		i++;
 
-		snprintf (tbuf, sizeof (tbuf), " %-25s ", ig->mask);
+		g_snprintf (tbuf, sizeof (tbuf), " %-25s ", ig->mask);
 		if (ig->type & IG_PRIV)
 			strcat (tbuf, _("YES  "));
 		else
@@ -192,8 +189,8 @@ ignore_del (char *mask, struct ignore *ig)
 	if (ig)
 	{
 		ignore_list = g_slist_remove (ignore_list, ig);
-		free (ig->mask);
-		free (ig);
+		g_free (ig->mask);
+		g_free (ig);
 		fe_ignore_update (1);
 		return TRUE;
 	}
@@ -265,7 +262,7 @@ ignore_read_next_entry (char *my_cfg, struct ignore *ignore)
 		my_cfg = cfg_get_str (my_cfg, "mask", tbuf, sizeof (tbuf));
 		if (!my_cfg)
 			return NULL;
-		ignore->mask = strdup (tbuf);
+		ignore->mask = g_strdup (tbuf);
 	}
 	if (my_cfg)
 	{
@@ -281,7 +278,7 @@ ignore_load ()
 	struct ignore *ignore;
 	struct stat st;
 	char *cfg, *my_cfg;
-	int fh, i;
+	int fh;
 
 	fh = hexchat_open_file ("ignore.conf", O_RDONLY, 0, 0);
 	if (fh != -1)
@@ -289,22 +286,18 @@ ignore_load ()
 		fstat (fh, &st);
 		if (st.st_size)
 		{
-			cfg = malloc (st.st_size + 1);
-			cfg[0] = '\0';
-			i = read (fh, cfg, st.st_size);
-			if (i >= 0)
-				cfg[i] = '\0';
+			cfg = g_malloc0 (st.st_size + 1);
+			read (fh, cfg, st.st_size);
 			my_cfg = cfg;
 			while (my_cfg)
 			{
-				ignore = malloc (sizeof (struct ignore));
-				memset (ignore, 0, sizeof (struct ignore));
+				ignore = g_new0 (struct ignore, 1);
 				if ((my_cfg = ignore_read_next_entry (my_cfg, ignore)))
 					ignore_list = g_slist_prepend (ignore_list, ignore);
 				else
-					free (ignore);
+					g_free (ignore);
 			}
-			free (cfg);
+			g_free (cfg);
 		}
 		close (fh);
 	}
@@ -326,7 +319,7 @@ ignore_save ()
 			ig = (struct ignore *) temp->data;
 			if (!(ig->type & IG_NOSAVE))
 			{
-				snprintf (buf, sizeof (buf), "mask = %s\ntype = %u\n\n",
+				g_snprintf (buf, sizeof (buf), "mask = %s\ntype = %u\n\n",
 							 ig->mask, ig->type);
 				write (fh, buf, strlen (buf));
 			}
@@ -379,9 +372,9 @@ flood_check (char *nick, char *ip, server *serv, session *sess, int what)	/*0=ct
 					for (i = 0; i < 128; i++)
 						if (ip[i] == '@')
 							break;
-					snprintf (real_ip, sizeof (real_ip), "*!*%s", &ip[i]);
+					g_snprintf (real_ip, sizeof (real_ip), "*!*%s", &ip[i]);
 
-					snprintf (buf, sizeof (buf),
+					g_snprintf (buf, sizeof (buf),
 								 _("You are being CTCP flooded from %s, ignoring %s\n"),
 								 nick, real_ip);
 					PrintText (sess, buf);
@@ -406,7 +399,7 @@ flood_check (char *nick, char *ip, server *serv, session *sess, int what)	/*0=ct
 				serv->msg_counter++;
 				if (serv->msg_counter == prefs.hex_flood_msg_num)	/*if we reached the maximun numbers of ctcp in the seconds limits */
 				{
-					snprintf (buf, sizeof (buf),
+					g_snprintf (buf, sizeof (buf),
 					 _("You are being MSG flooded from %s, setting gui_autoopen_dialog OFF.\n"),
 								 ip);
 					PrintText (sess, buf);

src/common/inbound.c

@@ -33,8 +33,6 @@
 #define WANTDNS
 #include "inet.h"
 
-#include <gio/gio.h>
-
 #include "hexchat.h"
 #include "util.h"
 #include "ignore.h"
@@ -64,7 +62,7 @@ clear_channel (session *sess)
 
 	if (sess->current_modes)
 	{
-		free (sess->current_modes);
+		g_free (sess->current_modes);
 		sess->current_modes = NULL;
 	}
 
@@ -83,9 +81,8 @@ clear_channel (session *sess)
 void
 set_topic (session *sess, char *topic, char *stripped_topic)
 {
-	if (sess->topic)
-		free (sess->topic);
-	sess->topic = strdup (stripped_topic);
+	g_free (sess->topic);
+	sess->topic = g_strdup (stripped_topic);
 	fe_set_topic (sess, topic, stripped_topic);
 }
 
@@ -121,7 +118,7 @@ find_session_from_nick (char *nick, server *serv)
 		}
 		list = list->next;
 	}
-	return 0;
+	return NULL;
 }
 
 static session *
@@ -187,7 +184,7 @@ inbound_privmsg (server *serv, char *from, char *ip, char *text, int id,
 				(!sess->topic || strcmp(sess->topic, ip)))
 			{
 				char tbuf[1024];
-				snprintf (tbuf, sizeof (tbuf), "[%s has address %s]\n", from, ip);
+				g_snprintf (tbuf, sizeof (tbuf), "[%s has address %s]\n", from, ip);
 				write (sess->logfd, tbuf, strlen (tbuf));
 			}
 			set_topic (sess, ip, ip);
@@ -558,7 +555,7 @@ find_unused_session (server *serv)
 		}
 		list = list->next;
 	}
-	return 0;
+	return NULL;
 }
 
 static session *
@@ -576,7 +573,7 @@ find_session_from_waitchannel (char *chan, struct server *serv)
 		}
 		list = list->next;
 	}
-	return 0;
+	return NULL;
 }
 
 void
@@ -682,7 +679,8 @@ inbound_nameslist (server *serv, char *chan, char *names,
 	char **name_list;
 	char *host, *nopre_name;
 	char name[NICKLEN];
-	int i, offset;
+	int i;
+	size_t offset;
 
 	sess = find_channel (serv, chan);
 	if (!sess)
@@ -916,7 +914,7 @@ inbound_ping_reply (session *sess, char *timestring, char *from,
 										  tags_data->timestamp);
 	} else
 	{
-		snprintf (outbuf, sizeof (outbuf), "%ld.%03ld", dif / 1000, dif % 1000);
+		g_snprintf (outbuf, sizeof (outbuf), "%ld.%03ld", dif / 1000, dif % 1000);
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_PINGREP, sess, from, outbuf, NULL, NULL, 0,
 									  tags_data->timestamp);
 	}
@@ -934,7 +932,7 @@ find_session_from_type (int type, server *serv)
 			return sess;
 		list = list->next;
 	}
-	return 0;
+	return NULL;
 }
 
 void
@@ -969,14 +967,14 @@ inbound_notice (server *serv, char *to, char *nick, char *msg, char *ip, int id,
 				/* guess where chanserv meant to post this -sigh- */
 				if (!g_ascii_strcasecmp (nick, "ChanServ") && !find_dialog (serv, nick))
 				{
-					char *dest = strdup (msg + 1);
+					char *dest = g_strdup (msg + 1);
 					char *end = strchr (dest, ']');
 					if (end)
 					{
 						*end = 0;
 						sess = find_channel (serv, dest);
 					}
-					free (dest);
+					g_free (dest);
 				}
 			}
 			if (!sess)
@@ -1455,8 +1453,7 @@ inbound_user_info (session *sess, char *chan, char *user, char *host,
 
 	if (user && host)
 	{
-		uhost = g_malloc (strlen (user) + strlen (host) + 2);
-		sprintf (uhost, "%s@%s", user, host);
+		uhost = g_strdup_printf ("%s@%s", user, host);
 	}
 
 	if (chan)

src/common/inet.h

@@ -47,13 +47,9 @@
 
 #else
 
-#include "../../config-win32.h"
-#ifdef USE_IPV6
+#include "config.h"
 #include <winsock2.h>
 #include <ws2tcpip.h>
-#else
-#include <winsock2.h>
-#endif
 
 #define set_blocking(sok)	{ \
 									unsigned long zero = 0; \

src/common/make-te.c

@@ -42,7 +42,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-int main()
+int main(void)
 {
 	char name[512];
 	char num[512];
@@ -87,9 +87,11 @@ int main()
 		if (i + 1 < max)
 		{
 			fprintf(stderr, "\t%s,\t\t%s,\n", defines[i], defines[i+1]);
+			free (defines[i]);
 			i++;
 		} else
 			fprintf(stderr, "\t%s,\n", defines[i]);
+		free (defines[i]);
 		i++;
 	}
 	fprintf(stderr, "\tNUM_XP\n};\n");

src/common/modes.c

@@ -331,7 +331,7 @@ record_chan_mode (session *sess, char sign, char mode, char *arg)
 				current = g_string_erase(current, argument_offset+1, argument_length-1);
 				current = g_string_insert(current, argument_offset+1, arg);
 
-				free(sess->current_modes);
+				g_free(sess->current_modes);
 				sess->current_modes = g_string_free(current, FALSE);
 			}
 		}
@@ -348,7 +348,7 @@ record_chan_mode (session *sess, char sign, char mode, char *arg)
 				current = g_string_append(current, arg);
 			}
 
-			free(sess->current_modes);
+			g_free(sess->current_modes);
 			sess->current_modes = g_string_free(current, FALSE);
 		}
 	}
@@ -361,7 +361,7 @@ record_chan_mode (session *sess, char sign, char mode, char *arg)
 		/* remove the mode character */
 		current = g_string_erase(current, mode_pos, 1);
 
-		free(sess->current_modes);
+		g_free(sess->current_modes);
 		sess->current_modes = g_string_free(current, FALSE);
 	}
 }
@@ -374,12 +374,13 @@ mode_cat (char *str, char *addition)
 	if (str)
 	{
 		len = strlen (str) + strlen (addition) + 2;
-		str = realloc (str, len);
+		str = g_realloc (str, len);
 		strcat (str, " ");
 		strcat (str, addition);
-	} else
+	}
+	else
 	{
-		str = strdup (addition);
+		str = g_strdup (addition);
 	}
 
 	return str;
@@ -560,12 +561,12 @@ handle_single_mode (mode_run *mr, char sign, char mode, char *nick,
 	{
 		if (*arg)
 		{
-			char *buf = malloc (strlen (chan) + strlen (arg) + 2);
-			sprintf (buf, "%s %s", chan, arg);
+			char *buf = g_strdup_printf ("%s %s", chan, arg);
 			EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANMODEGEN, sess, nick, outbuf,
 										  outbuf + 2, buf, 0, tags_data->timestamp);
-			free (buf);
-		} else
+			g_free (buf);
+		}
+		else
 			EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANMODEGEN, sess, nick, outbuf,
 										  outbuf + 2, chan, 0, tags_data->timestamp);
 	}
@@ -635,7 +636,7 @@ mode_print_grouped (session *sess, char *nick, mode_run *mr,
 	{
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANOP, sess, nick, mr->op, NULL, NULL, 0,
 									  tags_data->timestamp);
-		free (mr->op);
+		g_free(mr->op);
 		mr->op = NULL;
 	}
 
@@ -643,7 +644,7 @@ mode_print_grouped (session *sess, char *nick, mode_run *mr,
 	{
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANDEOP, sess, nick, mr->deop, NULL, NULL,
 									  0, tags_data->timestamp);
-		free (mr->deop);
+		g_free(mr->deop);
 		mr->deop = NULL;
 	}
 
@@ -651,7 +652,7 @@ mode_print_grouped (session *sess, char *nick, mode_run *mr,
 	{
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANVOICE, sess, nick, mr->voice, NULL, NULL,
 									  0, tags_data->timestamp);
-		free (mr->voice);
+		g_free(mr->voice);
 		mr->voice = NULL;
 	}
 
@@ -659,7 +660,7 @@ mode_print_grouped (session *sess, char *nick, mode_run *mr,
 	{
 		EMIT_SIGNAL_TIMESTAMP (XP_TE_CHANDEVOICE, sess, nick, mr->devoice, NULL,
 									  NULL, 0, tags_data->timestamp);
-		free (mr->devoice);
+		g_free(mr->devoice);
 		mr->devoice = NULL;
 	}
 }
@@ -677,10 +678,10 @@ handle_mode (server * serv, char *word[], char *word_eol[],
 	char *argstr;
 	char sign;
 	int len;
-	int arg;
-	int i, num_args;
+	size_t arg;
+	size_t i, num_args;
 	int num_modes;
-	int offset = 3;
+	size_t offset = 3;
 	int all_modes_have_args = FALSE;
 	int using_front_tab = FALSE;
 	mode_run mr;
@@ -717,9 +718,8 @@ handle_mode (server * serv, char *word[], char *word_eol[],
 
 	if (numeric_324 && !using_front_tab)
 	{
-		if (sess->current_modes)
-			free (sess->current_modes);
-		sess->current_modes = strdup (word_eol[offset+1]);
+		g_free (sess->current_modes);
+		sess->current_modes = g_strdup (word_eol[offset+1]);
 	}
 
 	sign = *modes;
@@ -762,7 +762,7 @@ handle_mode (server * serv, char *word[], char *word_eol[],
 			break;
 		default:
 			argstr = "";
-			if ((all_modes_have_args || mode_has_arg (serv, sign, *modes)) && arg < (num_args+1))
+			if ((all_modes_have_args || mode_has_arg (serv, sign, *modes)) && arg < (num_args + 1))
 			{
 				arg++;
 				argstr = word[arg + offset];
@@ -799,30 +799,29 @@ inbound_005 (server * serv, char *word[], const message_tags_data *tags_data)
 			serv->modes_per_line = atoi (word[w] + 6);
 		} else if (strncmp (word[w], "CHANTYPES=", 10) == 0)
 		{
-			free (serv->chantypes);
-			serv->chantypes = strdup (word[w] + 10);
+			g_free (serv->chantypes);
+			serv->chantypes = g_strdup (word[w] + 10);
 		} else if (strncmp (word[w], "CHANMODES=", 10) == 0)
 		{
-			free (serv->chanmodes);
-			serv->chanmodes = strdup (word[w] + 10);
+			g_free (serv->chanmodes);
+			serv->chanmodes = g_strdup (word[w] + 10);
 		} else if (strncmp (word[w], "PREFIX=", 7) == 0)
 		{
 			pre = strchr (word[w] + 7, ')');
 			if (pre)
 			{
 				pre[0] = 0;			  /* NULL out the ')' */
-				free (serv->nick_prefixes);
-				free (serv->nick_modes);
-				serv->nick_prefixes = strdup (pre + 1);
-				serv->nick_modes = strdup (word[w] + 8);
+				g_free (serv->nick_prefixes);
+				g_free (serv->nick_modes);
+				serv->nick_prefixes = g_strdup (pre + 1);
+				serv->nick_modes = g_strdup (word[w] + 8);
 			} else
 			{
 				/* bad! some ircds don't give us the modes. */
 				/* in this case, we use it only to strip /NAMES */
 				serv->bad_prefix = TRUE;
-				if (serv->bad_nick_prefixes)
-					free (serv->bad_nick_prefixes);
-				serv->bad_nick_prefixes = strdup (word[w] + 7);
+				g_free (serv->bad_nick_prefixes);
+				serv->bad_nick_prefixes = g_strdup (word[w] + 7);
 			}
 		} else if (strncmp (word[w], "WATCH=", 6) == 0)
 		{
@@ -832,10 +831,6 @@ inbound_005 (server * serv, char *word[], const message_tags_data *tags_data)
 			serv->supports_monitor = TRUE;
 		} else if (strncmp (word[w], "NETWORK=", 8) == 0)
 		{
-/*			if (serv->networkname)
-				free (serv->networkname);
-			serv->networkname = strdup (word[w] + 8);*/
-
 			if (serv->server_session->type == SESS_SERVER)
 			{
 				safe_strcpy (serv->server_session->channel, word[w] + 8, CHANLEN);

src/common/msproxy.c

@@ -1,470 +0,0 @@
-/* X-Chat
- * Copyright (C) 1998 Peter Zelezny.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- * MS Proxy (ISA server) support is (c) 2006 Pavel Fedin <sonic_amiga@rambler.ru>
- * based on Dante source code
- * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
- *      Inferno Nettverk A/S, Norway.  All rights reserved.
- */
-
-/*#define DEBUG_MSPROXY*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#define WANTSOCKET
-#define WANTARPA
-#include "inet.h"
-
-#include "hexchat.h"
-#include "network.h"
-#include "hexchatc.h"
-#include "server.h"
-#include "msproxy.h"
-
-
-#ifdef USE_MSPROXY
-#include <ntlm.h>
-
-static int
-send_msprequest(s, state, request, end)
-	int s;
-	struct msproxy_state_t *state;
-	struct msproxy_request_t *request;
-	char *end;
-{
-	ssize_t w;
-	size_t l;
-
-	request->magic25 = htonl(MSPROXY_VERSION);
-	request->serverack = state->seq_recv;
-	/* don't start incrementing sequence until we are acking packet #2. */
-	request->sequence	= (unsigned char)(request->serverack >= 2 ? state->seq_sent + 1 : 0);
-
-	memcpy(request->RWSP, "RWSP", sizeof(request->RWSP));
-
-	l = end - (char *)request;
-	/* all requests must be atleast MSPROXY_MINLENGTH it seems. */
-	if (l < MSPROXY_MINLENGTH) {
-		bzero(end, (size_t)(MSPROXY_MINLENGTH - l));
-		l = MSPROXY_MINLENGTH;
-	}
-
-	if ((w = send(s, request, l, 0)) != l) {
-#ifdef DEBUG_MSPROXY
-		printf ("send_msprequest(): send() failed (%ld bytes sent instead of %Iu\n", w, l);
-		perror ("Error is");
-#endif
-		return -1;
-	}
-	state->seq_sent = request->sequence;
-
-	return w;
-}
-
-static int
-recv_mspresponse(s, state, response)
-	int s;
-	struct msproxy_state_t *state;
-	struct msproxy_response_t *response;
-{
-	ssize_t r;
-
-	do {
-		if ((r = recv (s, response, sizeof (*response), 0)) < MSPROXY_MINLENGTH) {
-#ifdef DEBUG_MSPROXY
-			printf ("recv_mspresponse(): expected to read atleast %d, read %ld\n", MSPROXY_MINLENGTH, r);
-#endif
-			return -1;
-		}
-		if (state->seq_recv == 0)
-			break; /* not started incrementing yet. */
-#ifdef DEBUG_MSPROXY
-		if (response->sequence == state->seq_recv)
-			printf ("seq_recv: %d, dup response, seqnumber: 0x%x\n", state->seq_recv, response->sequence);
-#endif
-	} while (response->sequence == state->seq_recv);
-
-	state->seq_recv = response->sequence;
-
-	return r;
-}
-
-int
-traverse_msproxy (int sok, char *serverAddr, int port, struct msproxy_state_t *state, netstore *ns_proxy, int csok4, int csok6, int *csok, char bound)
-{
-	struct msproxy_request_t req;
-	struct msproxy_response_t res;
-	char *data, *p;
-	char hostname[NT_MAXNAMELEN];
-	char ntdomain[NT_MAXNAMELEN];
-	char challenge[8];
-	netstore *ns_client;
-	int clientport;
-	guint32 destaddr;
-	guint32 flags;
-
-	if (!prefs.hex_net_proxy_auth || !prefs.hex_net_proxy_user[0] || !prefs.hex_net_proxy_pass[0] )
-		return 1;
-
-	/* MS proxy protocol implementation currently doesn't support IPv6 */
-	destaddr = net_getsockaddr_v4 (ns_proxy);
-	if (!destaddr)
-		return 1;
-
-	state->seq_recv = 0;
-	state->seq_sent = 0;
-
-#ifdef DEBUG_MSPROXY
-	printf ("Connecting to %s:%d via MS proxy\n", serverAddr, port);
-#endif
-
-	gethostname (hostname, NT_MAXNAMELEN);
-	p = strchr (hostname, '.');
-        if (p)
-        	*p = '\0';
-
-	bzero (&req, sizeof(req));
-	req.clientid		= htonl(0x0a000000);	/* Initial client ID is always 0x0a		*/
-	req.command		= htons(MSPROXY_HELLO);	/* HELLO command					*/
-	req.packet.hello.magic5	= htons(0x4b00);	/* Fill in magic values				*/
-	req.packet.hello.magic10	= htons(0x1400);
-	req.packet.hello.magic15	= htons(0x0400);
-	req.packet.hello.magic20	= htons(0x5704);
-	req.packet.hello.magic25	= htons(0x0004);
-	req.packet.hello.magic30	= htons(0x0100);
-	req.packet.hello.magic35	= htons(0x4a02);
-	req.packet.hello.magic40	= htons(0x3000);
-	req.packet.hello.magic45	= htons(0x4400);
-	req.packet.hello.magic50	= htons(0x3900);
-	data = req.packet.hello.data;
-	strcpy (data, prefs.hex_net_proxy_user);		/* Append a username				*/
-	data += strlen (prefs.hex_net_proxy_user)+2;		/* +2 automatically creates second empty string	*/
-	strcpy (data, MSPROXY_EXECUTABLE);		/* Append an application name			*/
-	data += strlen (MSPROXY_EXECUTABLE)+1;
-	strcpy (data, hostname);				/* Append a hostname				*/
-	data += strlen (hostname)+1;
-
-	if (send_msprequest(sok, state, &req, data) == -1)
-		return 1;
-
-	if (recv_mspresponse(sok, state, &res) == -1)
-		return 1;
-
-	if (strcmp(res.RWSP, "RWSP") != 0) {
-#ifdef DEBUG_MSPROXY
-		printf ("Received mailformed packet (no RWSP signature)\n");
-#endif
-		return 1;
-	}
-
-	if (ntohs(res.command) >> 8 != 0x10) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.command = 10??, is %x", ntohs(res.command));
-#endif
-		return 1;
-	}
-
-	state->clientid	= htonl(rand());
-	state->serverid	= res.serverid;
-
-#ifdef DEBUG_MSPROXY
-	printf ("clientid: 0x%x, serverid: 0x%0x\n", state->clientid, state->serverid);
-	printf ("packet #2\n");
-#endif
-
-	/* almost identical. */
-	req.clientid	= state->clientid;
-	req.serverid	= state->serverid;
-
-	if (send_msprequest(sok, state, &req, data) == -1)
-		return 1;
-
-	if (recv_mspresponse(sok, state, &res) == -1)
-		return 1;
-
-	if (res.serverid != state->serverid) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected serverid = 0x%x, is 0x%x\n",state->serverid, res.serverid);
-#endif
-		return 1;
-	}
-
-	if (res.sequence != 0x01) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.sequence = 0x01, is 0x%x\n", res.sequence);
-#endif
-		return 1;
-	}
-
-	if (ntohs(res.command) != MSPROXY_USERINFO_ACK) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.command = 0x%x, is 0x%x\n", MSPROXY_USERINFO_ACK, ntohs(res.command));
-#endif
-		return 1;
-	}
-
-#ifdef DEBUG_MSPROXY
-	printf ("packet #3\n");
-#endif
-
-	bzero(&req, sizeof(req));
-	req.clientid			= state->clientid;
-	req.serverid			= state->serverid;
-	req.command			= htons(MSPROXY_AUTHENTICATE);
-	memcpy(req.packet.auth.NTLMSSP, "NTLMSSP", sizeof("NTLMSSP"));
-	req.packet.auth.bindaddr	= htonl(0x02000000);
-	req.packet.auth.msgtype		= htonl(0x01000000);
-	/* NTLM flags:	0x80000000 Negotiate LAN Manager key
-			0x10000000 Negotiate sign
-			0x04000000 Request target
-			0x02000000 Negotiate OEM
-			0x00800000 Always sign
-			0x00020000 Negotiate NTLM
-	*/
-	req.packet.auth.flags		= htonl(0x06020000);
-
-	if (send_msprequest(sok, state, &req, &req.packet.auth.data) == -1)
-		return 1;
-
-	if (recv_mspresponse(sok, state, &res) == -1)
-		return 1;
-
-	if (res.serverid != state->serverid) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected serverid = 0x%x, is 0x%x\n", state->serverid, res.serverid);
-#endif
-		return 1;
-	}
-
-	if (ntohs(res.command) != MSPROXY_AUTHENTICATE_ACK) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.command = 0x%x, is 0x%x\n", MSPROXY_AUTHENTICATE_ACK, ntohs(res.command));
-#endif
-		return 1;
-	}
-
-	flags = res.packet.auth.flags & htonl(0x00020000);			/* Remember if the server supports NTLM */
-	memcpy(challenge, &res.packet.auth.challenge, sizeof(challenge));
-	memcpy(ntdomain, &res.packet.auth.NTLMSSP[res.packet.auth.target.offset], res.packet.auth.target.len);
-	ntdomain[res.packet.auth.target.len] = 0;
-
-#ifdef DEBUG_MSPROXY
-	printf ("ntdomain: \"%s\"\n", ntdomain);
-	printf ("packet #4\n");
-#endif
-
-	bzero(&req, sizeof(req));
-	req.clientid			= state->clientid;
-	req.serverid			= state->serverid;
-	req.command			= htons(MSPROXY_AUTHENTICATE_2);	/* Authentication response			*/
-	req.packet.auth2.magic3		= htons(0x0200);			/* Something					*/
-	memcpy(req.packet.auth2.NTLMSSP, "NTLMSSP", sizeof("NTLMSSP"));		/* Start of NTLM message				*/
-	req.packet.auth2.msgtype		= htonl(0x03000000);			/* Message type 2				*/
-	req.packet.auth2.flags		= flags | htonl(0x02000000);		/* Choose authentication method			*/
-	data = req.packet.auth2.data;
-	if (flags) {
-		req.packet.auth2.lm_resp.len	= 0;				/* We are here if NTLM is supported,		*/
-		req.packet.auth2.lm_resp.alloc	= 0;				/* Do not fill in insecure LM response		*/
-		req.packet.auth2.lm_resp.offset	= data - req.packet.auth2.NTLMSSP;
-		req.packet.auth2.ntlm_resp.len = 24;				/* Fill in NTLM response security buffer	*/
-		req.packet.auth2.ntlm_resp.alloc = 24;
-		req.packet.auth2.ntlm_resp.offset = data - req.packet.auth2.NTLMSSP;
-		ntlm_smb_nt_encrypt(prefs.hex_net_proxy_pass, challenge, data);		/* Append an NTLM response			*/
-		data += 24;	
-	} else {
-		req.packet.auth2.lm_resp.len	= 24;				/* Fill in LM response security buffer		*/
-		req.packet.auth2.lm_resp.alloc	= 24;
-		req.packet.auth2.lm_resp.offset	= data - req.packet.auth2.NTLMSSP;
-		ntlm_smb_encrypt(prefs.hex_net_proxy_pass, challenge, data);		/* Append an LM response			*/
-		data += 24;
-		req.packet.auth2.ntlm_resp.len = 0;				/* NTLM response is empty			*/
-		req.packet.auth2.ntlm_resp.alloc = 0;
-		req.packet.auth2.ntlm_resp.offset = data - req.packet.auth2.NTLMSSP;
-	}
-	req.packet.auth2.ntdomain_buf.len = strlen(ntdomain);			/* Domain name					*/
-	req.packet.auth2.ntdomain_buf.alloc = req.packet.auth2.ntdomain_buf.len;
-	req.packet.auth2.ntdomain_buf.offset = data - req.packet.auth2.NTLMSSP;
-	strcpy(data, ntdomain);
-	data += req.packet.auth2.ntdomain_buf.len;
-	req.packet.auth2.username_buf.len = strlen(prefs.hex_net_proxy_user);		/* Username					*/
-	req.packet.auth2.username_buf.alloc = req.packet.auth2.username_buf.len;
-	req.packet.auth2.username_buf.offset = data - req.packet.auth2.NTLMSSP;
-	strcpy(data, prefs.hex_net_proxy_user);
-	data += req.packet.auth2.username_buf.len;
-	req.packet.auth2.clienthost_buf.len = strlen(hostname);			/* Hostname					*/
-	req.packet.auth2.clienthost_buf.alloc = req.packet.auth2.clienthost_buf.len;
-	req.packet.auth2.clienthost_buf.offset = data - req.packet.auth2.NTLMSSP;
-	strcpy(data, hostname);
-	data += req.packet.auth2.clienthost_buf.len;
-	req.packet.auth2.sessionkey_buf.len = 0;				/* Session key (we don't use it)		*/
-	req.packet.auth2.sessionkey_buf.alloc = 0;
-	req.packet.auth2.sessionkey_buf.offset = data - req.packet.auth2.NTLMSSP;
-
-	if (send_msprequest(sok, state, &req, data) == -1)
-		return 1;
-
-	if (recv_mspresponse(sok, state, &res) == -1)
-		return 1;
-
-	if (res.serverid != state->serverid) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.serverid = 0x%x, is 0x%x\n", state->serverid, res.serverid);
-#endif
-		return 1;
-	}
-
-	if (res.clientack != 0x01) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.clientack = 0x01, is 0x%x\n", res.clientack);
-#endif
-		return 1;
-	}
-
-	if (ntohs(res.command) >> 8 != 0x47) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.command = 47??, is 0x%x\n", ntohs(res.command));
-#endif
-		return 1;
-	}
-
-	if (ntohs(res.command) ==  MSPROXY_AUTHENTICATE_2_NAK) {
-#ifdef DEBUG_MSPROXY
-		printf ("Authentication failed\n");
-#endif
-		return -1;
-	}
-
-#ifdef DEBUG_MSPROXY
-	printf ("packet #5\n");
-#endif
-
-	bzero(&req, sizeof(req));
-	req.clientid			= state->clientid;
-	req.serverid			= state->serverid;
-	req.command			= htons(MSPROXY_CONNECT);
-	req.packet.connect.magic2	= htons(0x0200);
-	req.packet.connect.magic6	= htons(0x0200);
-	req.packet.connect.destport	= htons(port);
-	req.packet.connect.destaddr	= destaddr;
-	data = req.packet.connect.executable;
-	strcpy(data, MSPROXY_EXECUTABLE);
-	data += strlen(MSPROXY_EXECUTABLE) + 1;
-
-	/*
-	 * need to tell server what port we will connect from, so we bind our sockets.
-	 */
-	ns_client = net_store_new ();
-	if (!bound) {
-		net_store_fill_any (ns_client);
-		net_bind(ns_client, csok4, csok6);
-#ifdef DEBUG_MSPROXY
-		perror ("bind() result");
-#endif
-	}
- 	clientport = net_getsockport(csok4, csok6);
-	if (clientport == -1) {
-#ifdef DEBUG_MSPROXY
-		printf ("Unable to obtain source port\n");
-#endif
-		return 1;
-	}
-	req.packet.connect.srcport = clientport;
-
-	if (send_msprequest(sok, state, &req, data) == -1)
-		return 1;
-
-	if (recv_mspresponse(sok, state, &res) == -1)
-		return 1;
-
-	if (ntohs(res.command) != MSPROXY_CONNECT_ACK) {
-#ifdef DEBUG_MSPROXY
-		printf ("expected res.command = 0x%x, is 0x%x\n",MSPROXY_CONNECT_ACK, ntohs(res.command));
-#endif
-		return 1;
-	}
-
-	net_store_fill_v4 (ns_client, res.packet.connect.clientaddr, res.packet.connect.clientport);
-
-#ifdef DEBUG_MSPROXY
-	printf ("Connecting...\n");
-#endif
-	if (net_connect (ns_client, csok4, csok6, csok) != 0) {
-#ifdef DEBUG_MSPROXY
-		printf ("Failed to connect to port %d\n", htons(res.packet.connect.clientport));
-#endif
-		net_store_destroy (ns_client);
-		return 1;
-	}
-	net_store_destroy (ns_client);
-#ifdef DEBUG_MSPROXY
-	printf ("packet #6\n");
-#endif
-
-	req.clientid	= state->clientid;
-	req.serverid	= state->serverid;
-	req.command	= htons(MSPROXY_USERINFO_ACK);		
-
-	if (send_msprequest(sok, state, &req, req.packet.connack.data) == -1)
-		return 1;
-
-	return 0;
-}
-
-void
-msproxy_keepalive (void)
-{
-	server *serv;
-	GSList *list = serv_list;
-	struct msproxy_request_t req;
-	struct msproxy_response_t res;
-
-	while (list)
-	{
-		serv = list->data;
-		if (serv->connected && (serv->proxy_sok != -1))
-		{
-#ifdef DEBUG_MSPROXY
-			printf ("sending MS proxy keepalive packet\n");
-#endif
-
-			bzero(&req, sizeof(req));
-			req.clientid	= serv->msp_state.clientid;
-			req.serverid	= serv->msp_state.serverid;
-			req.command	= htons(MSPROXY_HELLO);
-			
-			if (send_msprequest(serv->proxy_sok, &serv->msp_state, &req, req.packet.hello.data) == -1)
-				continue;
-
-			recv_mspresponse(serv->proxy_sok, &serv->msp_state, &res);
-
-#ifdef DEBUG_MSPROXY
-			if (ntohs(res.command) != MSPROXY_USERINFO_ACK)
-				printf ("expected res.command = 0x%x, is 0x%x\n", MSPROXY_USERINFO_ACK, ntohs(res.command));
-#endif
-		}
-		list = list->next;
-	}
-}
-
-#endif