more stats

7 files changed, 187 insertions, 187 deletions

diff --git a/ChangeLog b/ChangeLog
index 8daf256f..0b63d8c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar  1 23:07:18 MST 2008
+        Added DHT (dstore) utilization statistics.
+        Added trust (earned/spend/awarded) statistics.
+
 Sat Feb  9 19:39:24 MST 2008
         Fixed lifelock caused by buggy semaphore operations
         in event thread handler.  Added suspend/resume for
diff --git a/TODO b/TODO
index 50244b20..2c3a436d 100644
--- a/TODO
+++ b/TODO
@@ -3,25 +3,7 @@ This is just the current plan, plans change.
 Annotations:
   RC == Release Critical
 
-
-0.7.4 (goal: polish):
-- CRASH (was this with IPv6 and ADNS, or not?)
-(gdb) ba
-#0  0xb73d3057 in adns__internal_check () from /usr/lib/libadns.so.1
-#1  0xb73d33a9 in adns_check () from /usr/lib/libadns.so.1
-#2  0xb78937ba in cache_resolve (cache=0x844bf90) at dns.c:89
-#3  0xb7893dc2 in GNUNET_get_ip_as_string (sav=0x84518b4, salen=16, do_resolve=1) at dns.c:256
-#4  0xb6ec3714 in collector (data=0x83e9640, identity=0x8451868, address=0x84518b4,
-    addr_len=16, last_message=0, trust=59, bpmFromPeer=0) at peers.c:115
-#5  0xb6e4c177 in GNUNET_IDENTITY_request_peer_infos (sock=0x844a478,
-    callback=0xb6ec34fc <collector>, cls=0x83e9640) at clientapi.c:216
-#6  0xb6ec3db1 in getPeerModel () at peers.c:227
-#7  0xb6ec3f02 in updatePeerInfo (dummy=0x0) at peers.c:268
-#8  0xb7884ec3 in runJob (cron=0x806cf08) at cron.c:529
-#9  0xb7884fad in cron_main_method (ctx=0x806cf08) at cron.c:569
-#10 0xb76b2383 in start_thread () from /lib/libpthread.so.0
-#11 0xb763673e in clone () from /lib/libc.so.6
-
+0.8.0 (goal: expand features):
 - improve collection handling [RC]
   + show content of current collection somewhere
   + does it make sense to have "no update" for collections?
@@ -32,9 +14,6 @@ Annotations:
 - for potentially long clists, add option to specify a string
   pattern that must be matched for the lines to be displayed
   (to further prune search results, for example)
-- #747: sharing stats for gnunet-gtk
-
-0.8.0 (goal: expand features):
 - chat [RC]
 - add option to list all indexed files and delete from them
   (ECRS now supports listing of indexed files!
@@ -42,6 +21,8 @@ Annotations:
 - implement search bookmarking (e.g. user could add/edit/delete
   favourite namespace/key etc combinations)
 
+
+
 1.0.0 (goal: "userfriendly"):
 - a completely new interactive directory building
   module that would allow importing files/directories from
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 6b3c844a..0e0e8296 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -53,7 +53,7 @@
                               <widget class="GtkLabel" id="titleLabel">
                                 <property name="visible">True</property>
                                 <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;span size="x-large"&gt;Welcome to gnunet-gtk 0.7.3&lt;/span&gt;</property>
+                                <property name="label" translatable="yes">&lt;span size="x-large"&gt;Welcome to gnunet-gtk 0.8.0pre0&lt;/span&gt;</property>
                                 <property name="use_markup">True</property>
                                 <property name="justify">GTK_JUSTIFY_CENTER</property>
                               </widget>
@@ -81,6 +81,10 @@ Thank you,
 
     The GNUnet Team
 
+&lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.3:&lt;/span&gt;
+
+This release fixes a deadlock and improves visualization of the current connectivity status of gnunetd (including visualization using the tray icon).  Searches can now be paused and resumed.  Various useless and confusing features were removed (or at least are invisible with the default GLADE skin).  The GLADE file was updated to Glade version 3.  The code was updated to work with GNUnet 0.8.0pre0 (and will not work with previous GNUnet versions).
+
 &lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.2c:&lt;/span&gt;
 
 This release adds support for starting gnunetd and gnunet-setup with gksu support.  The code was updated to work with GNUnet 0.7.3 (and will not work with previous GNUnet versions).  The release also fixes some memory leaks.
@@ -92,23 +96,6 @@ This version implements the advanced file-sharing features (in particular intera
 &lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.1:&lt;/span&gt;
 
 This release adds context-menus (right-click) which allow copying the URI of search results and uploads to the clipboard.
-
-&lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.0e:&lt;/span&gt;
-
-Made code compatible with GNUnet 0.7.1 APIs.
-
-&lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.0d:&lt;/span&gt;
-
-This release adds some additional statistics and includes various minor cosmetic improvements. Also, a stack overflow problem on some architectures was fixed.
-
-&lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.0c:&lt;/span&gt;
-
-This release improves responsiveness of various operations.  Closing searches, aborting downloads and terminating gnunet-gtk should be much faster.  Resuming downloads should work properly in this version.
-
-&lt;span size="x-large"&gt;Changes from gnunet-gtk 0.7.0b:&lt;/span&gt;
-
-This release fixes downloads of files from directories.  The previous version had some issues with where to copy the completed downloads.  Now all downloads (pending and completed) are stored in the directory specified in the configuration file (by default, that directory is ~/gnunet-downloads).
-
 </property>
                             <property name="use_markup">True</property>
                             <property name="wrap">True</property>
diff --git a/ltmain.sh b/ltmain.sh
index 13c5494d..5def3516 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -2,7 +2,7 @@
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007  Free Software Foundation, Inc.
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="1.5.24 Debian 1.5.24-2"
-TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
+VERSION="1.5.26 Debian 1.5.26-1"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -113,15 +113,21 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 do
   eval "if test \"\${$lt_var+set}\" = set; then
           save_$lt_var=\$$lt_var
+          lt_env=\"$lt_var=\$$lt_var \$lt_env\"
           $lt_var=C
           export $lt_var
         fi"
 done
 
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
+fi
+
 # Make sure IFS has a sensible default
 lt_nl='
 '
@@ -485,7 +491,7 @@ do
     echo "\
 $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
 
-Copyright (C) 2007  Free Software Foundation, Inc.
+Copyright (C) 2008  Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
@@ -788,6 +794,7 @@ if test -z "$show_help"; then
     *.for) xform=for ;;
     *.java) xform=java ;;
     *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -956,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
         test -n "$output_obj" && $run $rm $removelist
         exit $EXIT_FAILURE
@@ -1028,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
         $run $rm $removelist
         exit $EXIT_FAILURE
@@ -1161,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1646,6 +1654,11 @@ EOF
         continue
         ;;
 
+      -multi_module)
+        single_module="${wl}-multi_module"
+        continue
+        ;;
+
       -module)
         module=yes
         continue
@@ -2152,7 +2165,12 @@ EOF
             continue
           fi
           name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-          for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+          if test "$linkmode" = lib; then
+            searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+          else
+            searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+          fi
+          for searchdir in $searchdirs; do
             for search_ext in .la $std_shrext .so .a; do
               # Search the libtool library
               lib="$searchdir/lib${name}${search_ext}"
@@ -2948,12 +2966,18 @@ EOF
                   # we do not want to link against static libs,
                   # but need to link against shared
                   eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+                  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
                   if test -n "$deplibrary_names" ; then
                     for tmp in $deplibrary_names ; do
                       depdepl=$tmp
                     done
-                    if test -f "$path/$depdepl" ; then
+                    if test -f "$deplibdir/$depdepl" ; then
+                      depdepl="$deplibdir/$depdepl"
+                    elif test -f "$path/$depdepl" ; then
                       depdepl="$path/$depdepl"
+                    else
+                      # Can't find it, oh well...
+                      depdepl=
                     fi
                     # do not add paths which are already there
                     case " $newlib_search_path " in
@@ -3101,9 +3125,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+        $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
         $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -4245,9 +4270,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+        $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
         $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -6486,7 +6512,7 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
       do
         eval "if test \"\${save_$lt_var+set}\" = set; then
                 $lt_var=\$save_$lt_var; export $lt_var
diff --git a/src/plugins/chat/.deps/chat.Plo b/src/plugins/chat/.deps/chat.Plo
index f49a02f7..5ef43952 100644
--- a/src/plugins/chat/.deps/chat.Plo
+++ b/src/plugins/chat/.deps/chat.Plo
@@ -1,49 +1,48 @@
-chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
-  ../../../config.h ../../../src/include/gettext.h /usr/include/libintl.h \
+chat.lo: chat.c ../../../src/include/platform.h ../../../config.h \
+  ../../../src/include/gettext.h /usr/include/libintl.h \
   /usr/include/features.h /usr/include/sys/cdefs.h \
   /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
-  /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h \
-  /usr/include/locale.h /usr/include/bits/locale.h /usr/include/xlocale.h \
-  ../../../src/include/plibc.h /usr/include/pthread.h \
+  /usr/include/gnu/stubs-32.h ../../../src/include/plibc.h \
+  /usr/include/pthread.h /usr/include/endian.h /usr/include/bits/endian.h \
   /usr/include/sched.h /usr/include/bits/types.h \
-  /usr/include/bits/typesizes.h /usr/include/time.h \
+  /usr/include/bits/typesizes.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.0/include/stddef.h /usr/include/time.h \
   /usr/include/bits/sched.h /usr/include/bits/time.h \
-  /usr/include/signal.h /usr/include/bits/sigset.h \
+  /usr/include/xlocale.h /usr/include/signal.h /usr/include/bits/sigset.h \
   /usr/include/bits/pthreadtypes.h /usr/include/bits/setjmp.h \
   /usr/include/netdb.h /usr/include/netinet/in.h /usr/include/stdint.h \
   /usr/include/bits/wchar.h /usr/include/sys/socket.h \
-  /usr/include/sys/uio.h /usr/include/sys/types.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/sys/sysmacros.h \
-  /usr/include/bits/uio.h /usr/include/bits/socket.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h \
+  /usr/include/sys/uio.h /usr/include/sys/types.h \
+  /usr/include/sys/select.h /usr/include/bits/select.h \
+  /usr/include/sys/sysmacros.h /usr/include/bits/uio.h \
+  /usr/include/bits/socket.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.0/include-fixed/limits.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.0/include-fixed/syslimits.h \
   /usr/include/limits.h /usr/include/bits/posix1_lim.h \
   /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
   /usr/include/bits/posix2_lim.h /usr/include/bits/xopen_lim.h \
   /usr/include/bits/stdio_lim.h /usr/include/bits/sockaddr.h \
-  /usr/include/asm/socket.h /usr/include/asm/sockios.h \
+  /usr/include/asm/socket.h /usr/include/asm-i386/socket.h \
+  /usr/include/asm/sockios.h /usr/include/asm-i386/sockios.h \
   /usr/include/bits/in.h /usr/include/bits/byteswap.h \
   /usr/include/rpc/netdb.h /usr/include/bits/siginfo.h \
   /usr/include/bits/netdb.h /usr/include/arpa/inet.h \
   /usr/include/netinet/tcp.h /usr/include/pwd.h /usr/include/stdio.h \
   /usr/include/sys/ioctl.h /usr/include/bits/ioctls.h \
-  /usr/include/asm/ioctls.h /usr/include/asm/ioctl.h \
+  /usr/include/asm/ioctls.h /usr/include/asm-i386/ioctls.h \
+  /usr/include/asm/ioctl.h /usr/include/asm-i386/ioctl.h \
   /usr/include/asm-generic/ioctl.h /usr/include/bits/ioctl-types.h \
   /usr/include/sys/ttydefaults.h /usr/include/string.h \
-  /usr/include/bits/string.h /usr/include/bits/string2.h \
-  /usr/include/stdlib.h /usr/include/libio.h /usr/include/_G_config.h \
-  /usr/include/wchar.h /usr/include/gconv.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h \
-  /usr/include/bits/sys_errlist.h /usr/include/bits/stdio.h \
+  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.0/include/stdarg.h \
+  /usr/include/bits/sys_errlist.h /usr/include/stdlib.h \
   /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
   /usr/include/alloca.h /usr/include/ltdl.h /usr/include/errno.h \
   /usr/include/bits/errno.h /usr/include/linux/errno.h \
-  /usr/include/asm/errno.h /usr/include/asm-generic/errno.h \
-  /usr/include/asm-generic/errno-base.h /usr/include/bits/signum.h \
-  /usr/include/bits/sigaction.h /usr/include/bits/sigcontext.h \
-  /usr/include/asm/sigcontext.h /usr/include/bits/sigstack.h \
+  /usr/include/asm/errno.h /usr/include/asm-i386/errno.h \
+  /usr/include/asm-generic/errno.h /usr/include/asm-generic/errno-base.h \
+  /usr/include/bits/signum.h /usr/include/bits/sigaction.h \
+  /usr/include/bits/sigcontext.h /usr/include/bits/sigstack.h \
   /usr/include/sys/ucontext.h /usr/include/bits/sigthread.h \
   /usr/include/unistd.h /usr/include/bits/posix_opt.h \
   /usr/include/bits/environments.h /usr/include/bits/confname.h \
@@ -53,26 +52,27 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
   /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
   /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
   /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
-  /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \
-  /usr/include/net/if.h /usr/include/ctype.h /usr/include/sys/mman.h \
-  /usr/include/bits/mman.h /usr/include/langinfo.h \
-  /usr/include/nl_types.h /root/GNUnetData//include/GNUnet/gnunet_util.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_error.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_common.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_config.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_string.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_disk.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_threads.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_getopt.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_network.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_os.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_network_client.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_crypto.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_error_loggers.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_containers.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_cron.h \
-  /root/GNUnetData//include/GNUnet/gnunet_util_boot.h \
+  /usr/include/bits/mathcalls.h /usr/include/net/if.h \
+  /usr/include/ctype.h /usr/include/locale.h /usr/include/bits/locale.h \
+  /usr/include/sys/mman.h /usr/include/bits/mman.h \
+  /usr/include/langinfo.h /usr/include/nl_types.h \
+  /home/grothoff/include/GNUnet/gnunet_util.h \
+  /home/grothoff/include/GNUnet/gnunet_util_error.h \
+  /home/grothoff/include/GNUnet/gnunet_util_common.h \
+  /home/grothoff/include/GNUnet/gnunet_util_config.h \
+  /home/grothoff/include/GNUnet/gnunet_util_string.h \
+  /home/grothoff/include/GNUnet/gnunet_util_disk.h \
+  /home/grothoff/include/GNUnet/gnunet_util_threads.h \
+  /home/grothoff/include/GNUnet/gnunet_util_getopt.h \
+  /home/grothoff/include/GNUnet/gnunet_util_network.h \
+  /home/grothoff/include/GNUnet/gnunet_util_os.h \
+  /home/grothoff/include/GNUnet/gnunet_util_network_client.h \
+  /home/grothoff/include/GNUnet/gnunet_util_crypto.h \
+  /home/grothoff/include/GNUnet/gnunet_util.h \
+  /home/grothoff/include/GNUnet/gnunet_util_error_loggers.h \
+  /home/grothoff/include/GNUnet/gnunet_util_containers.h \
+  /home/grothoff/include/GNUnet/gnunet_util_cron.h \
+  /home/grothoff/include/GNUnet/gnunet_util_boot.h \
   /usr/include/gtk-2.0/gtk/gtk.h /usr/include/gtk-2.0/gdk/gdk.h \
   /usr/include/gtk-2.0/gdk/gdkcairo.h /usr/include/gtk-2.0/gdk/gdkcolor.h \
   /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \
@@ -82,7 +82,7 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
   /usr/include/glib-2.0/glib/gtypes.h \
   /usr/lib/glib-2.0/include/glibconfig.h \
   /usr/include/glib-2.0/glib/gmacros.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h \
+  /usr/lib/gcc/i486-linux-gnu/4.3.0/include/float.h \
   /usr/include/glib-2.0/glib/garray.h \
   /usr/include/glib-2.0/glib/gasyncqueue.h \
   /usr/include/glib-2.0/glib/gthread.h \
@@ -398,7 +398,6 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
   /usr/include/gtk-2.0/gtk/gtktipsquery.h \
   /usr/include/gtk-2.0/gtk/gtktoggletoolbutton.h \
   /usr/include/gtk-2.0/gtk/gtktoolbar.h \
-  /usr/include/gtk-2.0/gtk/gtktoolbutton.h \
   /usr/include/gtk-2.0/gtk/gtktoolitem.h \
   /usr/include/gtk-2.0/gtk/gtktree.h \
   /usr/include/gtk-2.0/gtk/gtktreednd.h \
@@ -437,30 +436,30 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/gnu/stubs-32.h:
 
-/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stddef.h:
-
-/usr/include/locale.h:
-
-/usr/include/bits/locale.h:
-
-/usr/include/xlocale.h:
-
 ../../../src/include/plibc.h:
 
 /usr/include/pthread.h:
 
+/usr/include/endian.h:
+
+/usr/include/bits/endian.h:
+
 /usr/include/sched.h:
 
 /usr/include/bits/types.h:
 
 /usr/include/bits/typesizes.h:
 
+/usr/lib/gcc/i486-linux-gnu/4.3.0/include/stddef.h:
+
 /usr/include/time.h:
 
 /usr/include/bits/sched.h:
 
 /usr/include/bits/time.h:
 
+/usr/include/xlocale.h:
+
 /usr/include/signal.h:
 
 /usr/include/bits/sigset.h:
@@ -483,10 +482,6 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/sys/types.h:
 
-/usr/include/endian.h:
-
-/usr/include/bits/endian.h:
-
 /usr/include/sys/select.h:
 
 /usr/include/bits/select.h:
@@ -497,9 +492,9 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/bits/socket.h:
 
-/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/limits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.0/include-fixed/limits.h:
 
-/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/syslimits.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.0/include-fixed/syslimits.h:
 
 /usr/include/limits.h:
 
@@ -519,8 +514,12 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/asm/socket.h:
 
+/usr/include/asm-i386/socket.h:
+
 /usr/include/asm/sockios.h:
 
+/usr/include/asm-i386/sockios.h:
+
 /usr/include/bits/in.h:
 
 /usr/include/bits/byteswap.h:
@@ -545,8 +544,12 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/asm/ioctls.h:
 
+/usr/include/asm-i386/ioctls.h:
+
 /usr/include/asm/ioctl.h:
 
+/usr/include/asm-i386/ioctl.h:
+
 /usr/include/asm-generic/ioctl.h:
 
 /usr/include/bits/ioctl-types.h:
@@ -555,25 +558,17 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/string.h:
 
-/usr/include/bits/string.h:
-
-/usr/include/bits/string2.h:
-
-/usr/include/stdlib.h:
-
 /usr/include/libio.h:
 
 /usr/include/_G_config.h:
 
 /usr/include/wchar.h:
 
-/usr/include/gconv.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/stdarg.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.0/include/stdarg.h:
 
 /usr/include/bits/sys_errlist.h:
 
-/usr/include/bits/stdio.h:
+/usr/include/stdlib.h:
 
 /usr/include/bits/waitflags.h:
 
@@ -591,6 +586,8 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/asm/errno.h:
 
+/usr/include/asm-i386/errno.h:
+
 /usr/include/asm-generic/errno.h:
 
 /usr/include/asm-generic/errno-base.h:
@@ -601,8 +598,6 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/bits/sigcontext.h:
 
-/usr/include/asm/sigcontext.h:
-
 /usr/include/bits/sigstack.h:
 
 /usr/include/sys/ucontext.h:
@@ -647,12 +642,14 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/bits/mathcalls.h:
 
-/usr/include/bits/mathinline.h:
-
 /usr/include/net/if.h:
 
 /usr/include/ctype.h:
 
+/usr/include/locale.h:
+
+/usr/include/bits/locale.h:
+
 /usr/include/sys/mman.h:
 
 /usr/include/bits/mman.h:
@@ -661,39 +658,39 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/nl_types.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util.h:
+/home/grothoff/include/GNUnet/gnunet_util.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_error.h:
+/home/grothoff/include/GNUnet/gnunet_util_error.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_common.h:
+/home/grothoff/include/GNUnet/gnunet_util_common.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_config.h:
+/home/grothoff/include/GNUnet/gnunet_util_config.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_string.h:
+/home/grothoff/include/GNUnet/gnunet_util_string.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_disk.h:
+/home/grothoff/include/GNUnet/gnunet_util_disk.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_threads.h:
+/home/grothoff/include/GNUnet/gnunet_util_threads.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_getopt.h:
+/home/grothoff/include/GNUnet/gnunet_util_getopt.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_network.h:
+/home/grothoff/include/GNUnet/gnunet_util_network.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_os.h:
+/home/grothoff/include/GNUnet/gnunet_util_os.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_network_client.h:
+/home/grothoff/include/GNUnet/gnunet_util_network_client.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_crypto.h:
+/home/grothoff/include/GNUnet/gnunet_util_crypto.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util.h:
+/home/grothoff/include/GNUnet/gnunet_util.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_error_loggers.h:
+/home/grothoff/include/GNUnet/gnunet_util_error_loggers.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_containers.h:
+/home/grothoff/include/GNUnet/gnunet_util_containers.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_cron.h:
+/home/grothoff/include/GNUnet/gnunet_util_cron.h:
 
-/root/GNUnetData//include/GNUnet/gnunet_util_boot.h:
+/home/grothoff/include/GNUnet/gnunet_util_boot.h:
 
 /usr/include/gtk-2.0/gtk/gtk.h:
 
@@ -721,7 +718,7 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/glib-2.0/glib/gmacros.h:
 
-/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/include/float.h:
+/usr/lib/gcc/i486-linux-gnu/4.3.0/include/float.h:
 
 /usr/include/glib-2.0/glib/garray.h:
 
@@ -1409,8 +1406,6 @@ chat.lo .libs/chat.o: chat.c ../../../src/include/platform.h \
 
 /usr/include/gtk-2.0/gtk/gtktoolbar.h:
 
-/usr/include/gtk-2.0/gtk/gtktoolbutton.h:
-
 /usr/include/gtk-2.0/gtk/gtktoolitem.h:
 
 /usr/include/gtk-2.0/gtk/gtktree.h:
diff --git a/src/plugins/chat/Makefile b/src/plugins/chat/Makefile
index 85d70781..4d0f755e 100644
--- a/src/plugins/chat/Makefile
+++ b/src/plugins/chat/Makefile
@@ -77,23 +77,23 @@ DIST_SOURCES = $(libgnunetgtkmodule_chat_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /root/gnunet-gtk/missing --run aclocal-1.8
+ACLOCAL = aclocal-1.8
 AMDEP_FALSE = #
 AMDEP_TRUE = 
-AMTAR = ${SHELL} /root/gnunet-gtk/missing --run tar
+AMTAR = ${SHELL} /home/grothoff/svn/gnunet-gtk/missing --run tar
 AR = ar
 AS = as
-AUTOCONF = ${SHELL} /root/gnunet-gtk/missing --run autoconf
-AUTOHEADER = ${SHELL} /root/gnunet-gtk/missing --run autoheader
-AUTOMAKE = ${SHELL} /root/gnunet-gtk/missing --run automake-1.8
-AWK = gawk
+AUTOCONF = ${SHELL} /home/grothoff/svn/gnunet-gtk/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/grothoff/svn/gnunet-gtk/missing --run autoheader
+AUTOMAKE = automake-1.8
+AWK = mawk
 CC = gcc
 CCDEPMODE = depmode=gcc3
-CFLAGS = -fno-strict-aliasing -Wall -g -O2
+CFLAGS = -fno-strict-aliasing -Wall -g -Wall -Werror -O0
 CONVENIENCE_LTDL_FALSE = 
 CONVENIENCE_LTDL_TRUE = #
 CPP = gcc -E
-CPPFLAGS = -I/root/GNUnetData//include 
+CPPFLAGS = -I/home/grothoff/include -I/home/grothoff/include 
 CXX = g++
 CXXCPP = g++ -E
 CXXDEPMODE = depmode=gcc3
@@ -102,24 +102,25 @@ CYGPATH_W = echo
 DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
 DLLTOOL = dlltool
+DSYMUTIL = 
 ECHO = echo
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
 EGREP = /bin/grep -E
 EXEEXT = 
-F77 = gfortran
+F77 = f77
 FFLAGS = -g -O2
-GMSGFMT = /usr/bin/gmsgfmt
+GMSGFMT = /usr/bin/msgfmt
 GNUNETGTK_CFLAGS = -I/usr/include/libglade-2.0 -I/usr/include/gtk-2.0 -I/usr/include/libxml2 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12  
-GNUNETGTK_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+GNUNETGTK_LIBS = -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 GREP = /bin/grep
 GTK_CFLAGS = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng12  
-GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+GTK_LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 HAVE_GTK_FALSE = #
 HAVE_GTK_TRUE = 
-HAVE_LIBGKSU2_FALSE = 
-HAVE_LIBGKSU2_TRUE = #
+HAVE_LIBGKSU2_FALSE = #
+HAVE_LIBGKSU2_TRUE = 
 HAVE_LIBNOTIFY_FALSE = 
 HAVE_LIBNOTIFY_TRUE = #
 INSTALL_DATA = ${INSTALL} -m 644
@@ -129,34 +130,35 @@ INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
 INTLLIBS = 
-LDFLAGS = -L/root/GNUnetData//lib 
+LDFLAGS = -L/home/grothoff/lib 
 LIBADD_DL = -ldl
-LIBGKSU2_CFLAGS = 
-LIBGKSU2_LIBS = 
+LIBGKSU2_CFLAGS = -DORBIT2=1 -pthread -I/usr/include/libgksu -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/startup-notification-1.0 -I/usr/include/gnome-keyring-1 -I/usr/include/gconf/2 -I/usr/include/orbit-2.0  
+LIBGKSU2_LIBS = -pthread -lgksu2 -lstartup-notification-1 -lgnome-keyring -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0  
 LIBICONV = -liconv
 LIBINTL = 
 LIBLTDL = -lltdl
 LIBNOTIFY_CFLAGS = 
 LIBNOTIFY_LIBS = 
 LIBOBJS = 
-LIBS = -lm -lnsl 
+LIBS = -lnsl 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool
 LN_S = ln -s
 LTDLINCL = 
 LTLIBICONV = -liconv
 LTLIBINTL = 
 LTLIBOBJS = 
-MAKEINFO = ${SHELL} /root/gnunet-gtk/missing --run makeinfo
+MAKEINFO = ${SHELL} /home/grothoff/svn/gnunet-gtk/missing --run makeinfo
 MINGW_FALSE = 
 MINGW_TRUE = #
 MKINSTALLDIRS = $(top_builddir)/./mkinstalldirs
 MSGFMT = /usr/bin/msgfmt
 MSGMERGE = /usr/bin/msgmerge
+NMEDIT = 
 OBJDUMP = objdump
 OBJEXT = o
 PACKAGE = gnunet-gtk
 PACKAGE_BUGREPORT = bug-gnunet@gnu.org
-PACKAGE_DATA = /root/GNUnetData//share
+PACKAGE_DATA = /home/grothoff/share
 PACKAGE_NAME = gnunet-gtk
 PACKAGE_STRING = gnunet-gtk 0.7.3
 PACKAGE_TARNAME = gnunet-gtk
@@ -174,7 +176,7 @@ VERSION = 0.7.3
 XGETTEXT = /usr/bin/xgettext
 ac_ct_CC = gcc
 ac_ct_CXX = g++
-ac_ct_F77 = gfortran
+ac_ct_F77 = f77
 am__fastdepCC_FALSE = #
 am__fastdepCC_TRUE = 
 am__fastdepCXX_FALSE = #
@@ -201,7 +203,7 @@ host_vendor = pc
 htmldir = ${docdir}
 includedir = ${prefix}/include
 infodir = ${datarootdir}/info
-install_sh = /root/gnunet-gtk/install-sh
+install_sh = /home/grothoff/svn/gnunet-gtk/install-sh
 libdir = ${exec_prefix}/lib
 libexecdir = ${exec_prefix}/libexec
 localedir = ${datarootdir}/locale
@@ -210,7 +212,7 @@ mandir = ${datarootdir}/man
 mkdir_p = mkdir -p -- .
 oldincludedir = /usr/include
 pdfdir = ${docdir}
-prefix = /root/GNUnetData/
+prefix = /home/grothoff
 program_transform_name = s,x,x,
 psdir = ${docdir}
 sbindir = ${exec_prefix}/sbin
@@ -233,7 +235,7 @@ libgnunetgtkmodule_chat_la_SOURCES = \
 
 libgnunetgtkmodule_chat_la_LIBADD = \
   $(top_builddir)/src/common/libgnunetgtk_common.la \
-  -lgnunetutil -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0   -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
+  -lgnunetutil -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0   -lglade-2.0 -lgtk-x11-2.0 -lxml2 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
 
 libgnunetgtkmodule_chat_la_LDFLAGS = \
   -export-dynamic -avoid-version -module
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 71d46e08..d8a459aa 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -167,16 +167,21 @@ getQuotaStat (const void *closure, gfloat ** data)
   unsigned long long allowed;
   unsigned long long have;
 
-  if (GNUNET_OK != getStatValue (&allowed,
-                                 NULL, NULL, "# bytes allowed in datastore",
-                                 GNUNET_NO))
-    return GNUNET_SYSERR;
-  if (allowed == 0)
-    return GNUNET_SYSERR;
-  if (GNUNET_OK !=
-      getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO))
-    return GNUNET_SYSERR;
-  data[0][0] = ((gfloat) have) / allowed;
+  data[0][0] = 0;
+  data[0][1] = 0;
+  if ( (GNUNET_OK == getStatValue (&allowed,
+                                   NULL, NULL, "# bytes allowed in datastore",
+                                   GNUNET_NO)) &&
+       (allowed != 0) &&
+       (GNUNET_OK == getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO)) )
+    data[0][0] = ((gfloat) have) / allowed;
+  if ( (GNUNET_OK == getStatValue (&allowed,
+                                   NULL, NULL, "# max bytes allowed in dstore",
+                                   GNUNET_NO)) &&
+       (allowed != 0) &&
+       (GNUNET_OK ==
+        getStatValue (&have, NULL, NULL, "# bytes in dstore", GNUNET_NO)) )
+    data[0][1] = ((gfloat) have) / allowed;
   return GNUNET_OK;
 }
 
@@ -665,10 +670,10 @@ StatEntry stats[] = {
   ,
   {
    gettext_noop ("Datastore capacity"),
-   gettext_noop ("Data in datastore (in percent of allowed quota)"),
+   gettext_noop ("Persistent file-sharing data (red) and DHT cache (green)"),
    &getQuotaStat,
    NULL,
-   1,
+   2,
    GNUNET_NO,
    }
   ,