From ad6d9f7ab1b6c31f80396ea032d905d0cca600d9 Mon Sep 17 00:00:00 2001
From: Bernhard Walle <bernhard@bwalle.de>
Date: Sun, 1 Aug 2004 09:16:58 +0000
Subject: [PATCH] New version 0.2.3: Make it thread save for recent
 developement versions of Xfce

(Old svn revision: 329)
---
 ChangeLog                |   5 +
 Makefile.in              |   4 +-
 aclocal.m4               |  92 ++++++++++++++----
 config.guess             |  81 +++++++++++-----
 config.sub               |  41 ++++----
 configure                | 198 +++++++++++++++++++++++++++------------
 configure.ac             |   2 +-
 depcomp                  |  22 +++--
 install-sh               |   4 +-
 ltmain.sh                |  20 +---
 panel-plugin/Makefile.in |   2 +-
 panel-plugin/netload.c   |   6 +-
 po/ca.po                 |  34 +++----
 po/de.po                 |  31 +++---
 po/lt.po                 |  31 +++---
 po/pl.po                 |  31 +++---
 po/uk.gmo                | Bin 1998 -> 2021 bytes
 po/uk.po                 |  31 +++---
 po/xfce4-netload.pot     |  31 +++---
 19 files changed, 425 insertions(+), 241 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 647812d..4e07edb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-01 Bernhard Walle
+    * Made the plugin thread-safe and so compatible with recent developement
+      versions of Xfce
+    * Released 0.2.3
+
 2004-06-27 Bernhard Walle
     * Updated Catalan translation, thanks to Carles Mu�oz Gorriz
 
diff --git a/Makefile.in b/Makefile.in
index 4cf37d8..aff4ec7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -535,7 +535,7 @@ installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf autom4te.cache
+	-rm -rf $(top_srcdir)/autom4te.cache
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
diff --git a/aclocal.m4 b/aclocal.m4
index c5ef82b..0f57a27 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -189,7 +189,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7.5])])
+	 [AM_AUTOMAKE_VERSION([1.7.6])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -571,18 +571,32 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_$1_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -600,11 +614,12 @@ AC_CACHE_CHECK([dependency style of $depcc],
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # (even with -Werror).  So we grep stderr for any message
@@ -1363,7 +1378,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -2290,6 +2305,13 @@ linux*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  case $LD in # libtool.m4 will add one of these switches to LD
+  *"-m elf_x86_64"*|*"-m elf64ppc"*|*"-m elf64_s390"*|*"-m elf64_sparc"*)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -2882,7 +2904,7 @@ AC_DEFUN([AC_PROG_LD_GNU],
 [AC_REQUIRE([AC_PROG_EGREP])dnl
 AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
 [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
   ;;
@@ -3030,7 +3052,7 @@ irix5* | irix6* | nonstopux*)
 # This must be Linux ELF.
 linux*)
   case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64)
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
@@ -4662,7 +4684,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM SED SHELL \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -4855,7 +4877,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS="$AS"
+AS=$lt_AS
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -7022,7 +7044,7 @@ glib_DEFUN([GLIB_WITH_NLS],
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
-glib_DEFUN(GLIB_GNU_GETTEXT,
+glib_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
    
@@ -7099,7 +7121,7 @@ glib_DEFUN(GLIB_GNU_GETTEXT,
 # -------------------------------
 # Define VARIABLE to the location where catalog files will
 # be installed by po/Makefile.
-glib_DEFUN(GLIB_DEFINE_LOCALEDIR,
+glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
 [glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
 glib_save_prefix="$prefix"
 glib_save_exec_prefix="$exec_prefix"
@@ -7120,8 +7142,8 @@ dnl
 dnl Now the definitions that aclocal will find
 dnl
 ifdef(glib_configure_in,[],[
-AC_DEFUN(AM_GLIB_GNU_GETTEXT,[GLIB_GNU_GETTEXT($@)])
-AC_DEFUN(AM_GLIB_DEFINE_LOCALEDIR,[GLIB_DEFINE_LOCALEDIR($@)])
+AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
 ])dnl
 
 dnl From Benedikt Meurer (benedikt.meurer@unix-ag.uni-siegen.de)
@@ -7151,6 +7173,7 @@ AC_HELP_STRING([--disable-$4], [Disable checking for $5]),
       AC_MSG_RESULT([yes])
       BM_DEPEND([$1], [$2], [$3])
       AC_DEFINE([HAVE_$1], [1], [Define if you have $2 >= $3])
+      $1_FOUND="yes"
     else
       AC_MSG_RESULT([no])
     fi
@@ -7166,9 +7189,40 @@ AC_DEFUN([XFCE_PANEL_PLUGIN],
 [
   BM_DEPEND([$1], [xfce4-panel-1.0], [$2])
 
+  dnl Check if the panel is threaded
+  ac_CFLAGS=$$1_CFLAGS
+  AC_MSG_CHECKING([whether the panel is threaded])
+  if $PKG_CONFIG --atleast-version=4.1.7 xfce4-panel-1.0; then
+    $1_CFLAGS="$ac_CFLAGS -DXFCE_PANEL_THREADED=1 -DXFCE_PANEL_LOCK\(\)=gdk_threads_enter\(\) -DXFCE_PANEL_UNLOCK\(\)=gdk_threads_leave\(\)"
+    AC_MSG_RESULT([yes])
+  else
+    $1_CFLAGS="$ac_CFLAGS -DXFCE_PANEL_LOCK\(\)=do{}while\(0\) -DXFCE_PANEL_UNLOCK\(\)=do{}while\(0\)"
+    AC_MSG_RESULT([no])
+  fi
+
   dnl Check where to put the plugins to
+  AC_ARG_WITH([pluginsdir],
+AC_HELP_STRING([--with-pluginsdir=DIR], [Install plugins dir DIR]),
+[$1_PLUGINSDIR=$withval],
+[$1_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`])
+
   AC_MSG_CHECKING([where to install panel plugins])
-  $1_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
+  AC_SUBST([$1_PLUGINSDIR])
+  AC_MSG_RESULT([$$1_PLUGINSDIR])
+])
+
+dnl
+dnl XFCE_MCS_PLUGIN(var, version)
+dnl
+dnl sets $var_CFLAGS, $var_LIBS and $var_PLUGINSDIR
+dnl
+AC_DEFUN([XFCE_MCS_PLUGIN],
+[
+  BM_DEPEND([$1], [xfce-mcs-manager], [$2])
+
+  dnl Check where to put the plugins to
+  AC_MSG_CHECKING([where to install MCS plugins])
+  $1_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce-mcs-manager`
   AC_SUBST([$1_PLUGINSDIR])
   AC_MSG_RESULT([$$1_PLUGINSDIR])
 ])
diff --git a/config.guess b/config.guess
index 6bdac8d..c8fc683 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-05-09'
+timestamp='2003-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,6 +106,7 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 dummy=$tmp/dummy ;
 tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
@@ -135,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_MACHINE}" in
+    i?86)
+	test -z "$VENDOR" && VENDOR=pc
+	;;
+    *)
+	test -z "$VENDOR" && VENDOR=unknown
+	;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -282,6 +293,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
+	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -320,6 +334,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -756,7 +773,10 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only='k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -767,8 +787,8 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -795,13 +815,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -820,7 +843,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -839,13 +862,13 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-${VENDOR}-linux
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-${VENDOR}-linux
 	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -858,31 +881,34 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
+	  *)    echo hppa-${VENDOR}-linux ;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-${VENDOR}-linux
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	exit 0 ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo x86_64-${VENDOR}-linux
 	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -897,18 +923,18 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
 		exit 0 ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
 		exit 0 ;;
 	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# Either a pre-BFD a.out linker (linuxoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -934,7 +960,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)
@@ -1189,6 +1215,9 @@ EOF
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index fe4f1ed..9952c14 100755
--- a/config.sub
+++ b/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
-timestamp='2003-05-09'
+timestamp='2003-07-04'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,7 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | kfreebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -229,7 +229,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
@@ -261,7 +261,7 @@ case $basic_machine in
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -771,18 +771,24 @@ case $basic_machine in
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -841,6 +847,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
@@ -848,6 +858,9 @@ case $basic_machine in
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
@@ -922,10 +935,6 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-        tic4x | c4x*)
-		basic_machine=tic4x-unknown
-		os=-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=tic54x-unknown
 		os=-coff
@@ -1119,19 +1128,19 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1155,9 +1164,6 @@ case $os in
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
@@ -1277,6 +1283,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
+    c4x-* | tic4x-*)
+        os=-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
diff --git a/configure b/configure
index a5c066d..e0b97c0 100755
--- a/configure
+++ b/configure
@@ -1050,6 +1050,7 @@ Optional Packages:
   --with-tags[=TAGS]
                           include additional configurations [automatic]
   --with-locales-dir=DIR  Install locales into DIR
+  --with-pluginsdir=DIR   Install plugins dir DIR
 
 Some influential environment variables:
   CC          C compiler command
@@ -1748,7 +1749,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=xfce4-netload-plugin
- VERSION=0.2.2
+ VERSION=0.2.3
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2851,18 +2852,32 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -2880,11 +2895,12 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # (even with -Werror).  So we grep stderr for any message
@@ -3288,7 +3304,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
   ;;
@@ -3492,7 +3508,7 @@ irix5* | irix6* | nonstopux*)
 # This must be Linux ELF.
 linux*)
   case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh* | x86_64)
     lt_cv_deplibs_check_method=pass_all ;;
   *)
     # glibc up to 2.1.1 does not perform some relocations on ARM
@@ -3622,7 +3638,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3625 "configure"' > conftest.$ac_ext
+  echo '#line 3641 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -3671,7 +3687,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
         x86_64-*linux*)
           LD="${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD="${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -4712,18 +4728,32 @@ else
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
 
   am_cv_CXX_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     case $depmode in
     nosideeffect)
@@ -4741,11 +4771,12 @@ else
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=conftest.c object=conftest.o \
-       depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # (even with -Werror).  So we grep stderr for any message
@@ -5104,7 +5135,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5107:" \
+echo "$as_me:5138:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6109,11 +6140,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6112: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6143: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6116: \$? = $ac_status" >&5
+   echo "$as_me:6147: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6341,11 +6372,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6344: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6375: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6348: \$? = $ac_status" >&5
+   echo "$as_me:6379: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6408,11 +6439,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6411: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6442: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6415: \$? = $ac_status" >&5
+   echo "$as_me:6446: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7736,6 +7767,13 @@ linux*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  case $LD in # libtool.m4 will add one of these switches to LD
+  *"-m elf_x86_64"*|*"-m elf64ppc"*|*"-m elf64_s390"*|*"-m elf64_sparc"*)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -8420,7 +8458,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8423 "configure"
+#line 8461 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8518,7 +8556,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8521 "configure"
+#line 8559 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8700,7 +8738,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM SED SHELL \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -8890,7 +8928,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS="$AS"
+AS=$lt_AS
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -9401,7 +9439,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
   ;;
@@ -10650,11 +10688,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10653: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10691: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10657: \$? = $ac_status" >&5
+   echo "$as_me:10695: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10717,11 +10755,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10720: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10758: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10724: \$? = $ac_status" >&5
+   echo "$as_me:10762: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11276,6 +11314,13 @@ linux*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  case $LD in # libtool.m4 will add one of these switches to LD
+  *"-m elf_x86_64"*|*"-m elf64ppc"*|*"-m elf64_s390"*|*"-m elf64_sparc"*)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -11960,7 +12005,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11963 "configure"
+#line 12008 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12058,7 +12103,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12061 "configure"
+#line 12106 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12175,7 +12220,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM SED SHELL \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -12317,7 +12362,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS="$AS"
+AS=$lt_AS
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -12880,11 +12925,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12883: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12928: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12887: \$? = $ac_status" >&5
+   echo "$as_me:12932: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12947,11 +12992,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12950: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12995: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12954: \$? = $ac_status" >&5
+   echo "$as_me:12999: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14253,6 +14298,13 @@ linux*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  case $LD in # libtool.m4 will add one of these switches to LD
+  *"-m elf_x86_64"*|*"-m elf64ppc"*|*"-m elf64_s390"*|*"-m elf64_sparc"*)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -14432,7 +14484,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM SED SHELL \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -14574,7 +14626,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS="$AS"
+AS=$lt_AS
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -14887,11 +14939,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14890: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14942: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14894: \$? = $ac_status" >&5
+   echo "$as_me:14946: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15119,11 +15171,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15122: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15174: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15126: \$? = $ac_status" >&5
+   echo "$as_me:15178: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15186,11 +15238,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15189: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15241: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15193: \$? = $ac_status" >&5
+   echo "$as_me:15245: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16514,6 +16566,13 @@ linux*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  case $LD in # libtool.m4 will add one of these switches to LD
+  *"-m elf_x86_64"*|*"-m elf64ppc"*|*"-m elf64_s390"*|*"-m elf64_sparc"*)
+    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64"
+    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64"
+    ;;
+  esac
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -17198,7 +17257,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17201 "configure"
+#line 17260 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17296,7 +17355,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17299 "configure"
+#line 17358 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17413,7 +17472,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM SED SHELL \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -17555,7 +17614,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS="$AS"
+AS=$lt_AS
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -17854,7 +17913,7 @@ if test -f "$ltmain"; then
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS AS EGREP RANLIB LN_S LTCC NM SED SHELL \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -17996,7 +18055,7 @@ DLLTOOL="$DLLTOOL"
 OBJDUMP="$OBJDUMP"
 
 # Used on cygwin: assembler.
-AS="$AS"
+AS=$lt_AS
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
@@ -21909,9 +21968,30 @@ echo "$as_me: error: Library requirements (xfce4-panel-1.0 >= 3.99.2) not met; c
 
 
 
-    echo "$as_me:$LINENO: checking where to install panel plugins" >&5
-echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
+    ac_CFLAGS=$XFCE4_PANEL_CFLAGS
+  echo "$as_me:$LINENO: checking whether the panel is threaded" >&5
+echo $ECHO_N "checking whether the panel is threaded... $ECHO_C" >&6
+  if $PKG_CONFIG --atleast-version=4.1.7 xfce4-panel-1.0; then
+    XFCE4_PANEL_CFLAGS="$ac_CFLAGS -DXFCE_PANEL_THREADED=1 -DXFCE_PANEL_LOCK\(\)=gdk_threads_enter\(\) -DXFCE_PANEL_UNLOCK\(\)=gdk_threads_leave\(\)"
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  else
+    XFCE4_PANEL_CFLAGS="$ac_CFLAGS -DXFCE_PANEL_LOCK\(\)=do{}while\(0\) -DXFCE_PANEL_UNLOCK\(\)=do{}while\(0\)"
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+  fi
+
+
+# Check whether --with-pluginsdir or --without-pluginsdir was given.
+if test "${with_pluginsdir+set}" = set; then
+  withval="$with_pluginsdir"
+  XFCE4_PANEL_PLUGINSDIR=$withval
+else
   XFCE4_PANEL_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
+fi;
+
+  echo "$as_me:$LINENO: checking where to install panel plugins" >&5
+echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
 
   echo "$as_me:$LINENO: result: $XFCE4_PANEL_PLUGINSDIR" >&5
 echo "${ECHO_T}$XFCE4_PANEL_PLUGINSDIR" >&6
diff --git a/configure.ac b/configure.ac
index 17ba524..2f1a9f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ AC_INIT([panel-plugin/netload.c])
 
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.2])
+AM_INIT_AUTOMAKE([xfce4-netload-plugin], [0.2.3])
 
 AM_MAINTAINER_MODE
 
diff --git a/depcomp b/depcomp
index 51606f8..aea3d00 100755
--- a/depcomp
+++ b/depcomp
@@ -207,11 +207,9 @@ aix)
   ;;
 
 icc)
-  # Must come before tru64.
-
-  # Intel's C compiler understands `-MD -MF file'.  However
+  # Intel's C compiler understands `-MD -MF file'.  However on
   #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # will fill foo.d with something like
+  # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
   # which is wrong.  We want:
@@ -219,6 +217,12 @@ icc)
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
+  # ICC 7.1 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using \ :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
 
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
@@ -228,11 +232,15 @@ icc)
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h'.
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
   # Do two passes, one to just change these to
   # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
+    sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/install-sh b/install-sh
index 0ec27bc..6ce63b9 100755
--- a/install-sh
+++ b/install-sh
@@ -239,8 +239,8 @@ else
 
 # Make a couple of temp file names in the proper directory.
 
-	dsttmp=$dstdir/#inst.$$#
-	rmtmp=$dstdir/#rm.$$#
+	dsttmp=$dstdir/_inst.$$_
+	rmtmp=$dstdir/_rm.$$_
 
 # Trap to clean up temp files at exit.
 
diff --git a/ltmain.sh b/ltmain.sh
index 7a29e55..8bf1b20 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -56,7 +56,7 @@ modename="$progname"
 PROGRAM=ltmain.sh
 PACKAGE=libtool
 VERSION=1.5
-TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
+TIMESTAMP=" (1.1220.2.1 2003/04/14 22:48:00)"
 
 default_mode=
 help="Try \`$progname --help' for more information."
@@ -3783,18 +3783,7 @@ EOF
 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	    eval cmds=\"$archive_expsym_cmds\"
 	  else
-	    save_deplibs="$deplibs"
-	    for conv in $convenience; do
-	      tmp_deplibs=
-	      for test_deplib in $deplibs; do
-		if test "$test_deplib" != "$conv"; then
-		  tmp_deplibs="$tmp_deplibs $test_deplib"
-		fi
-	      done
-	      deplibs="$tmp_deplibs"
-	    done
 	    eval cmds=\"$archive_cmds\"
-	    deplibs="$save_deplibs"
 	  fi
 
 	  # Append the command to remove the reloadable object files
@@ -5580,7 +5569,8 @@ relink_command=\"$relink_command\""
 	    if test "$finalize" = yes && test -z "$run"; then
 	      tmpdir="/tmp"
 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
+              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` ||
+                tmpdir="$tmpdir/libtool-$$"
 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
 	      else
 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
@@ -5871,14 +5861,14 @@ relink_command=\"$relink_command\""
       fi
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
+      exec_cmd="\"\$cmd\"$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 	$echo "export $shlibpath_var"
       fi
-      $echo "$cmd$args"
+      eval \$echo \"\$cmd\"$args
       exit 0
     fi
     ;;
diff --git a/panel-plugin/Makefile.in b/panel-plugin/Makefile.in
index 9481fa5..de27e6c 100644
--- a/panel-plugin/Makefile.in
+++ b/panel-plugin/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5 from Makefile.am.
+# Makefile.in generated by automake 1.7.6 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c
index 44c82ce..faf8202 100644
--- a/panel-plugin/netload.c
+++ b/panel-plugin/netload.c
@@ -1,7 +1,7 @@
 /*  XFce 4 - Netload Plugin
  *    Copyright (c) 2003 Bernhard Walle <bernhard.walle@gmx.de>
  *  
- *  Id: $Id: netload.c,v 1.9 2003/10/01 19:16:03 bwalle Exp $
+ *  Id: $Id: netload.c,v 1.10 2004/08/01 09:16:58 bwalle Exp $
  *  
  *  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
@@ -144,6 +144,8 @@ static gboolean update_monitors(t_global_monitor *global)
     double temp;
     gint i, j;
 
+    XFCE_PANEL_LOCK();
+
     get_current_netload( &(global->monitor->data), &(net[IN]), &(net[OUT]), &(net[TOT]) );
     
 
@@ -225,6 +227,8 @@ static gboolean update_monitors(t_global_monitor *global)
                 HISTSIZE_CALCULATE, buffer[IN], buffer[OUT], buffer[TOT]);
     gtk_tooltips_set_tip(tooltips, GTK_WIDGET(global->monitor->ebox), caption, NULL);
 
+    XFCE_PANEL_UNLOCK();
+
     return TRUE;
 }
 
diff --git a/po/ca.po b/po/ca.po
index dfa7165..1cd7171 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-netload-plugin\n"
-"POT-Creation-Date: 2003-10-01 21:17+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-01 11:07+0200\n"
 "PO-Revision-Date: 2004-06-27 12:52+0100\n"
 "Last-Translator: Carles Muñoz Gorriz <carlesmu@internautas.org>\n"
-"Language-Team: catal� <ca@li.org>\n"
+"Language-Team: catal <ca@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,7 @@ msgstr "No s'ha trobat el dispositiu linux «/proc/net/dev»."
 msgid "Interface was not found."
 msgstr "No s'ha trobat la interfície."
 
-#: panel-plugin/netload.c:223
+#: panel-plugin/netload.c:225
 #, c-format
 msgid ""
 "Average of last %d measures:\n"
@@ -46,7 +47,7 @@ msgstr ""
 "Sortida: %s kBytes/s\n"
 "Total: %s kBytes/s"
 
-#: panel-plugin/netload.c:522
+#: panel-plugin/netload.c:526
 #, c-format
 msgid ""
 "%s: Error in initalizing:\n"
@@ -55,51 +56,50 @@ msgstr ""
 "%s: Error d'inicialització:\n"
 "%s"
 
-#: panel-plugin/netload.c:867
+#: panel-plugin/netload.c:871
 msgid "Select color"
 msgstr "Seleccioneu el color"
 
-#: panel-plugin/netload.c:922
+#: panel-plugin/netload.c:926
 msgid "Bar color (incoming):"
 msgstr "Color de la barra (entrada):"
 
-#: panel-plugin/netload.c:923
+#: panel-plugin/netload.c:927
 msgid "Bar color (outgoing):"
 msgstr "Color de la barra (sortida):"
 
-#: panel-plugin/netload.c:926
+#: panel-plugin/netload.c:930
 msgid "Maximum (incoming):"
 msgstr "Màxim (entrada):"
 
-#: panel-plugin/netload.c:927
+#: panel-plugin/netload.c:931
 msgid "Maximum (outgoing):"
 msgstr "Màxim (sortida):"
 
-#: panel-plugin/netload.c:951
+#: panel-plugin/netload.c:955
 msgid "Text to display:"
 msgstr "Text a mostrar:"
 
-#: panel-plugin/netload.c:982
+#: panel-plugin/netload.c:986
 msgid "Network device:"
 msgstr "Dispositiu de xarxa:"
 
-#: panel-plugin/netload.c:1008
+#: panel-plugin/netload.c:1012
 msgid "Update interval:"
 msgstr "Interval d'actualització:"
 
-#: panel-plugin/netload.c:1019
+#: panel-plugin/netload.c:1023
 msgid "s"
 msgstr "s"
 
-#: panel-plugin/netload.c:1032
+#: panel-plugin/netload.c:1036
 msgid "Automatic maximum"
 msgstr "Màxim automàtic"
 
-#: panel-plugin/netload.c:1064
+#: panel-plugin/netload.c:1068
 msgid "kByte/s"
 msgstr "kBytes/s"
 
-#: panel-plugin/netload.c:1152
+#: panel-plugin/netload.c:1156
 msgid "Netload"
 msgstr "Càrrega de xarxa"
-
diff --git a/po/de.po b/po/de.po
index cefb44e..fec6987 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
-"POT-Creation-Date: 2003-10-01 21:17+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-01 11:07+0200\n"
 "PO-Revision-Date: 2003-09-06 14:25+0200\n"
 "Last-Translator: Bernhard Walle <bernhard.walle@gmx.de>\n"
 "Language-Team: Deutsch <www.xfce.org>\n"
@@ -27,7 +28,7 @@ msgstr "Linux Prozessdatei '/proc/net/dev' nicht gefunden."
 msgid "Interface was not found."
 msgstr "Schnittstelle nicht gefunden."
 
-#: panel-plugin/netload.c:223
+#: panel-plugin/netload.c:225
 #, c-format
 msgid ""
 "Average of last %d measures:\n"
@@ -40,7 +41,7 @@ msgstr ""
 "Ausgehend: %s kByte/s\n"
 "Gesamt: %s kByte/s"
 
-#: panel-plugin/netload.c:522
+#: panel-plugin/netload.c:526
 #, c-format
 msgid ""
 "%s: Error in initalizing:\n"
@@ -49,50 +50,50 @@ msgstr ""
 "%s: Fehler beim Initialisieren:\n"
 "%s"
 
-#: panel-plugin/netload.c:867
+#: panel-plugin/netload.c:871
 msgid "Select color"
 msgstr "Farbe auswählen"
 
-#: panel-plugin/netload.c:922
+#: panel-plugin/netload.c:926
 msgid "Bar color (incoming):"
 msgstr "Balkenfarbe (eingehend):"
 
-#: panel-plugin/netload.c:923
+#: panel-plugin/netload.c:927
 msgid "Bar color (outgoing):"
 msgstr "Balkenfarbe (ausgehend):"
 
-#: panel-plugin/netload.c:926
+#: panel-plugin/netload.c:930
 msgid "Maximum (incoming):"
 msgstr "Maximum (eingehend):"
 
-#: panel-plugin/netload.c:927
+#: panel-plugin/netload.c:931
 msgid "Maximum (outgoing):"
 msgstr "Maximum (ausgehend):"
 
-#: panel-plugin/netload.c:951
+#: panel-plugin/netload.c:955
 msgid "Text to display:"
 msgstr "Angezeigter Text:"
 
-#: panel-plugin/netload.c:982
+#: panel-plugin/netload.c:986
 msgid "Network device:"
 msgstr "Netzwerkschnittstelle:"
 
-#: panel-plugin/netload.c:1008
+#: panel-plugin/netload.c:1012
 msgid "Update interval:"
 msgstr "Aktualisierungsintervall:"
 
-#: panel-plugin/netload.c:1019
+#: panel-plugin/netload.c:1023
 msgid "s"
 msgstr "s"
 
-#: panel-plugin/netload.c:1032
+#: panel-plugin/netload.c:1036
 msgid "Automatic maximum"
 msgstr "Automatisches Maximum"
 
-#: panel-plugin/netload.c:1064
+#: panel-plugin/netload.c:1068
 msgid "kByte/s"
 msgstr "kByte/s"
 
-#: panel-plugin/netload.c:1152
+#: panel-plugin/netload.c:1156
 msgid "Netload"
 msgstr "Netzlast"
diff --git a/po/lt.po b/po/lt.po
index 6b3a6d6..052625a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-netload 1.0\n"
-"POT-Creation-Date: 2003-10-01 21:17+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-01 11:07+0200\n"
 "PO-Revision-Date: 2003-08-15 11:08+0300\n"
 "Last-Translator: Mantas <zaz@xxx.lt>\n"
 "Language-Team:  <komp_lt@konferencijos.lt>\n"
@@ -30,7 +31,7 @@ msgstr ""
 msgid "Interface was not found."
 msgstr ""
 
-#: panel-plugin/netload.c:223
+#: panel-plugin/netload.c:225
 #, fuzzy, c-format
 msgid ""
 "Average of last %d measures:\n"
@@ -42,59 +43,59 @@ msgstr ""
 "Siunčiami: %lld bitų/s\n"
 "Viso: %lld bitų/s"
 
-#: panel-plugin/netload.c:522
+#: panel-plugin/netload.c:526
 #, c-format
 msgid ""
 "%s: Error in initalizing:\n"
 "%s"
 msgstr ""
 
-#: panel-plugin/netload.c:867
+#: panel-plugin/netload.c:871
 msgid "Select color"
 msgstr "Pasirinkite spalvą"
 
-#: panel-plugin/netload.c:922
+#: panel-plugin/netload.c:926
 msgid "Bar color (incoming):"
 msgstr "Juostos spalva (gaunami duomenys)"
 
-#: panel-plugin/netload.c:923
+#: panel-plugin/netload.c:927
 msgid "Bar color (outgoing):"
 msgstr "Juostos spalva (siunčiami duomenys)"
 
-#: panel-plugin/netload.c:926
+#: panel-plugin/netload.c:930
 #, fuzzy
 msgid "Maximum (incoming):"
 msgstr "Juostos spalva (gaunami duomenys)"
 
-#: panel-plugin/netload.c:927
+#: panel-plugin/netload.c:931
 #, fuzzy
 msgid "Maximum (outgoing):"
 msgstr "Juostos spalva (siunčiami duomenys)"
 
-#: panel-plugin/netload.c:951
+#: panel-plugin/netload.c:955
 msgid "Text to display:"
 msgstr "Rodomas tekstas:"
 
-#: panel-plugin/netload.c:982
+#: panel-plugin/netload.c:986
 msgid "Network device:"
 msgstr "Tinklo įrenginys"
 
-#: panel-plugin/netload.c:1008
+#: panel-plugin/netload.c:1012
 msgid "Update interval:"
 msgstr ""
 
-#: panel-plugin/netload.c:1019
+#: panel-plugin/netload.c:1023
 msgid "s"
 msgstr ""
 
-#: panel-plugin/netload.c:1032
+#: panel-plugin/netload.c:1036
 msgid "Automatic maximum"
 msgstr ""
 
-#: panel-plugin/netload.c:1064
+#: panel-plugin/netload.c:1068
 msgid "kByte/s"
 msgstr ""
 
-#: panel-plugin/netload.c:1152
+#: panel-plugin/netload.c:1156
 msgid "Netload"
 msgstr "Tinklo apkrovimas"
diff --git a/po/pl.po b/po/pl.po
index 651d09c..a0e0a7e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce-netload 2.1\n"
-"POT-Creation-Date: 2003-10-01 21:17+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-01 11:07+0200\n"
 "PO-Revision-Date: 2003-10-19 10:34+0200\n"
 "Last-Translator: Michał Chruszcz <troll@troll.one.pl>\n"
 "Language-Team: pl <LL@li.org>\n"
@@ -28,7 +29,7 @@ msgstr "Nie znaleziono urządzenia '/proc/net/dev'."
 msgid "Interface was not found."
 msgstr "Interfejs nie został odnaleziony."
 
-#: panel-plugin/netload.c:223
+#: panel-plugin/netload.c:225
 #, c-format
 msgid ""
 "Average of last %d measures:\n"
@@ -41,7 +42,7 @@ msgstr ""
 "Wychodzące: %s kB/s\n"
 "Łącznie: %s kB/s"
 
-#: panel-plugin/netload.c:522
+#: panel-plugin/netload.c:526
 #, c-format
 msgid ""
 "%s: Error in initalizing:\n"
@@ -50,50 +51,50 @@ msgstr ""
 "%s: Błąd inicjalizacji:\n"
 "%s"
 
-#: panel-plugin/netload.c:867
+#: panel-plugin/netload.c:871
 msgid "Select color"
 msgstr "Wybierz kolor"
 
-#: panel-plugin/netload.c:922
+#: panel-plugin/netload.c:926
 msgid "Bar color (incoming):"
 msgstr "Kolor słupka (przychodzące):"
 
-#: panel-plugin/netload.c:923
+#: panel-plugin/netload.c:927
 msgid "Bar color (outgoing):"
 msgstr "Kolor słupka (wychodzące):"
 
-#: panel-plugin/netload.c:926
+#: panel-plugin/netload.c:930
 msgid "Maximum (incoming):"
 msgstr "Maksimum (przychodzące):"
 
-#: panel-plugin/netload.c:927
+#: panel-plugin/netload.c:931
 msgid "Maximum (outgoing):"
 msgstr "Maksimum (wychodzące):"
 
-#: panel-plugin/netload.c:951
+#: panel-plugin/netload.c:955
 msgid "Text to display:"
 msgstr "Tekst do wyświetlenia:"
 
-#: panel-plugin/netload.c:982
+#: panel-plugin/netload.c:986
 msgid "Network device:"
 msgstr "Urządzenie sieciowe:"
 
-#: panel-plugin/netload.c:1008
+#: panel-plugin/netload.c:1012
 msgid "Update interval:"
 msgstr "Interwał odświeżania:"
 
-#: panel-plugin/netload.c:1019
+#: panel-plugin/netload.c:1023
 msgid "s"
 msgstr ""
 
-#: panel-plugin/netload.c:1032
+#: panel-plugin/netload.c:1036
 msgid "Automatic maximum"
 msgstr "Automatyczne maksimum"
 
-#: panel-plugin/netload.c:1064
+#: panel-plugin/netload.c:1068
 msgid "kByte/s"
 msgstr "kB/s"
 
-#: panel-plugin/netload.c:1152
+#: panel-plugin/netload.c:1156
 msgid "Netload"
 msgstr "Obciążenie sieci"
diff --git a/po/uk.gmo b/po/uk.gmo
index b5ec488c3eaca2dd69e854028f6ea526c0ce2f94..cde24eba1d2df4df207b88f1e68ab3d008318289 100644
GIT binary patch
delta 207
zcmX@d|CE2imU<6H28IY`1_nb028M+!3=En;`ZADy1*HE1X=xz+f|Y?m7D%(OF)%0t
zX(b?S3#8qEv?7phfr>8!(jaxGfV2vbegUK<fiy2W1A_*TRtM4wKso?OgX9a@8N?XO
zfsAQD0bwA04oEWr=|`JA87-K^f>I0ei%N8Ti_<exbe&4mi*-ZttrR9VFpKk;=o(n)
R8W<`V8d@1_Ud*h`0swj=AGiPj

delta 202
zcmaFLe~y2`mU=@*28IY`1_nb028J#c1_n(ay$49Y0@BZbv^0>u$jZPV3#8uyX=NbI
z&BnlB3#9ddv?7qs1=1k#ejp7}w;4#Q0O^ZBS`tWq1JW8mT7aE_K><ix0%?$Z6gz_$
zgE^2<4-^mv(%XSF6OcZ=*^|+NNh!cTMAx|}HL)Z!KTp>su_V<>!N|bCSl7T(*U(tO
N(Adg!^Dbs>769@d9y|a5

diff --git a/po/uk.po b/po/uk.po
index bdde145..146943f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: xfce4-netload-plugin\n"
-"POT-Creation-Date: 2003-09-13 13:57+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-01 11:07+0200\n"
 "PO-Revision-Date: 2003-10-21 12:13+0200\n"
 "Last-Translator: Maxim Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -31,7 +32,7 @@ msgstr "Не знайдено Linux пристрій '/proc/net/dev'."
 msgid "Interface was not found."
 msgstr "Інтерфейс не існує."
 
-#: panel-plugin/netload.c:223
+#: panel-plugin/netload.c:225
 #, c-format
 msgid ""
 "Average of last %d measures:\n"
@@ -44,7 +45,7 @@ msgstr ""
 "Трафік на виході: %s кілобайт/с\n"
 "Загальний трафік: %s кілобайт/с"
 
-#: panel-plugin/netload.c:521
+#: panel-plugin/netload.c:526
 #, c-format
 msgid ""
 "%s: Error in initalizing:\n"
@@ -53,50 +54,50 @@ msgstr ""
 "%s: Помилка ініціалізації:\n"
 "%s"
 
-#: panel-plugin/netload.c:842
+#: panel-plugin/netload.c:871
 msgid "Select color"
 msgstr "Вибір кольору"
 
-#: panel-plugin/netload.c:895
+#: panel-plugin/netload.c:926
 msgid "Bar color (incoming):"
 msgstr "Колір (на вхід):"
 
-#: panel-plugin/netload.c:896
+#: panel-plugin/netload.c:927
 msgid "Bar color (outgoing):"
 msgstr "Колір (на вихід):"
 
-#: panel-plugin/netload.c:899
+#: panel-plugin/netload.c:930
 msgid "Maximum (incoming):"
 msgstr "Максимум (на вхід):"
 
-#: panel-plugin/netload.c:900
+#: panel-plugin/netload.c:931
 msgid "Maximum (outgoing):"
 msgstr "Максимум (на вихід):"
 
-#: panel-plugin/netload.c:924
+#: panel-plugin/netload.c:955
 msgid "Text to display:"
 msgstr "Відображуваний текст:"
 
-#: panel-plugin/netload.c:955
+#: panel-plugin/netload.c:986
 msgid "Network device:"
 msgstr "Мережевий пристрій:"
 
-#: panel-plugin/netload.c:981
+#: panel-plugin/netload.c:1012
 msgid "Update interval:"
 msgstr "Інтервал оновлення:"
 
-#: panel-plugin/netload.c:992
+#: panel-plugin/netload.c:1023
 msgid "s"
 msgstr "с"
 
-#: panel-plugin/netload.c:1005
+#: panel-plugin/netload.c:1036
 msgid "Automatic maximum"
 msgstr "Автоматичний максимум"
 
-#: panel-plugin/netload.c:1037
+#: panel-plugin/netload.c:1068
 msgid "kByte/s"
 msgstr "кілобайт/с"
 
-#: panel-plugin/netload.c:1125
+#: panel-plugin/netload.c:1156
 msgid "Netload"
 msgstr "Контроль мережі"
diff --git a/po/xfce4-netload.pot b/po/xfce4-netload.pot
index 757e508..fd8054a 100644
--- a/po/xfce4-netload.pot
+++ b/po/xfce4-netload.pot
@@ -7,7 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-10-01 21:17+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-01 11:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +32,7 @@ msgstr ""
 msgid "Interface was not found."
 msgstr ""
 
-#: panel-plugin/netload.c:223
+#: panel-plugin/netload.c:225
 #, c-format
 msgid ""
 "Average of last %d measures:\n"
@@ -40,57 +41,57 @@ msgid ""
 "Total: %s kByte/s"
 msgstr ""
 
-#: panel-plugin/netload.c:522
+#: panel-plugin/netload.c:526
 #, c-format
 msgid ""
 "%s: Error in initalizing:\n"
 "%s"
 msgstr ""
 
-#: panel-plugin/netload.c:867
+#: panel-plugin/netload.c:871
 msgid "Select color"
 msgstr ""
 
-#: panel-plugin/netload.c:922
+#: panel-plugin/netload.c:926
 msgid "Bar color (incoming):"
 msgstr ""
 
-#: panel-plugin/netload.c:923
+#: panel-plugin/netload.c:927
 msgid "Bar color (outgoing):"
 msgstr ""
 
-#: panel-plugin/netload.c:926
+#: panel-plugin/netload.c:930
 msgid "Maximum (incoming):"
 msgstr ""
 
-#: panel-plugin/netload.c:927
+#: panel-plugin/netload.c:931
 msgid "Maximum (outgoing):"
 msgstr ""
 
-#: panel-plugin/netload.c:951
+#: panel-plugin/netload.c:955
 msgid "Text to display:"
 msgstr ""
 
-#: panel-plugin/netload.c:982
+#: panel-plugin/netload.c:986
 msgid "Network device:"
 msgstr ""
 
-#: panel-plugin/netload.c:1008
+#: panel-plugin/netload.c:1012
 msgid "Update interval:"
 msgstr ""
 
-#: panel-plugin/netload.c:1019
+#: panel-plugin/netload.c:1023
 msgid "s"
 msgstr ""
 
-#: panel-plugin/netload.c:1032
+#: panel-plugin/netload.c:1036
 msgid "Automatic maximum"
 msgstr ""
 
-#: panel-plugin/netload.c:1064
+#: panel-plugin/netload.c:1068
 msgid "kByte/s"
 msgstr ""
 
-#: panel-plugin/netload.c:1152
+#: panel-plugin/netload.c:1156
 msgid "Netload"
 msgstr ""