diff -u -N -r gnapster-1.4.0.old/aclocal.m4 gnapster-1.4.0/aclocal.m4
--- gnapster-1.4.0.old/aclocal.m4	Wed Sep 27 08:50:24 2000
+++ gnapster-1.4.0/aclocal.m4	Wed Oct 25 09:59:40 2000
@@ -1589,3 +1589,11 @@
     fi
   fi])
 
+dnl Based on a posting by Akim Demaille <akim@epita.fr>
+dnl 
+AC_DEFUN([AC_caolan_EXPAND_DIR],[
+$2=`(
+test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+eval echo \""[$]$1"\"
+)`])                                
diff -u -N -r gnapster-1.4.0.old/autoconf/ac_caolan_expand_dir.m4 gnapster-1.4.0/autoconf/ac_caolan_expand_dir.m4
--- gnapster-1.4.0.old/autoconf/ac_caolan_expand_dir.m4	Thu Jan  1 01:00:00 1970
+++ gnapster-1.4.0/autoconf/ac_caolan_expand_dir.m4	Wed Oct 25 09:59:00 2000
@@ -0,0 +1,8 @@
+dnl Based on a posting by Akim Demaille <akim@epita.fr>
+dnl 
+AC_DEFUN([AC_caolan_EXPAND_DIR],[
+$2=`(
+test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+test "x$exec_prefix" = xNONE && exec_prefix="${prefix}"
+eval echo \""[$]$1"\"
+)`])                                
diff -u -N -r gnapster-1.4.0.old/configure.in gnapster-1.4.0/configure.in
--- gnapster-1.4.0.old/configure.in	Mon Oct 16 09:11:11 2000
+++ gnapster-1.4.0/configure.in	Wed Oct 25 10:35:23 2000
@@ -109,7 +109,12 @@
  AC_MSG_RESULT($prefix)
 fi
 
-AC_DEFINE_UNQUOTED(CONFIG_PATH, "${prefix}/share/gnapster")
+dnl AC_DEFINE_UNQUOTED(CONFIG_PATH, "${prefix}/share/gnapster")
+dnl "${prefix}/share/gnapster")
+dnl this is really defined as the PACKAGE subdir of DATADIR from --datadir
+dnl which defaults to ${prefix}/share
+AC_caolan_EXPAND_DIR(datadir,DATADIR)
+AC_DEFINE_UNQUOTED(CONFIG_PATH,"$DATADIR/$PACKAGE")
 
 AC_OUTPUT(
 Makefile
diff -u -N -r gnapster-1.4.0.old/src/commands.c gnapster-1.4.0/src/commands.c
--- gnapster-1.4.0.old/src/commands.c	Fri Oct 20 04:38:49 2000
+++ gnapster-1.4.0/src/commands.c	Wed Oct 25 10:56:34 2000
@@ -779,7 +779,7 @@
    char *str;
    int page_num;
    /* 16k should be enough... */
-   char buf[4096 * 4];
+   char buf[4096 * 4]={0};
 
    page_num = gnapster_get_pagenum();
    
@@ -787,8 +787,6 @@
    if (!ptr)
      return;
 
-   bzero(buf, sizeof(buf));
-   
    while(ptr) {
       str = ptr->data;
       if (!str)
diff -u -N -r gnapster-1.4.0.old/src/connect.c gnapster-1.4.0/src/connect.c
--- gnapster-1.4.0.old/src/connect.c	Wed Oct 18 22:22:56 2000
+++ gnapster-1.4.0/src/connect.c	Wed Oct 25 10:36:58 2000
@@ -60,10 +60,10 @@
       buf[i++] = 0x04; /* protocol version: SOCKS4 */
       buf[i++] = 0x01; /* command: CONNECT */
       
-      *((u_int16_t *)(buf + i)) = s->dest_port;
+      *((guint16 *)(buf + i)) = s->dest_port;
       i += 2;
       
-      *((u_int32_t *)(buf + i)) = s->dest_ip;
+      *((guint32 *)(buf + i)) = s->dest_ip;
       i += 4;
       
       /* add ident userid stuff here */
@@ -221,10 +221,10 @@
       buf[i++] = 0x00; /* reserved */
       buf[i++] = 0x01; /* address type: IP V4 */
       
-      *((u_int32_t *)(buf + i)) = s->dest_ip;
+      *((guint32 *)(buf + i)) = s->dest_ip;
       i += 4;
       
-      *((u_int16_t *)(buf + i)) = s->dest_port;
+      *((guint16 *)(buf + i)) = s->dest_port;
       i += 2;
       
       send(source, buf, i, 0);
diff -u -N -r gnapster-1.4.0.old/src/gnapster.h gnapster-1.4.0/src/gnapster.h
--- gnapster-1.4.0.old/src/gnapster.h	Thu Oct 19 04:25:51 2000
+++ gnapster-1.4.0/src/gnapster.h	Wed Oct 25 10:44:08 2000
@@ -113,7 +113,7 @@
     * E - searching
     * F - browsing
     * G - safe exit */
-   u_int32_t state;
+   guint32 state;
 
    int sock;
    int sock_input;
diff -u -N -r gnapster-1.4.0.old/src/napster.h gnapster-1.4.0/src/napster.h
--- gnapster-1.4.0.old/src/napster.h	Mon Oct 16 03:25:38 2000
+++ gnapster-1.4.0/src/napster.h	Wed Oct 25 10:47:04 2000
@@ -2,6 +2,7 @@
 #define __NAPSTER_H
 
 #include <stdio.h>
+#include <glib.h>
 
 #define NAPSTER_ERROR 0
 
@@ -244,7 +245,7 @@
 
 int opennap_version(int, int);
 int user_ignored(char *);
-void napster_dns_cb(u_int32_t, int *);
+void napster_dns_cb(guint32, int *);
 void napster_get_best_host();
 void napster_connect(char *, int);
 void napster_connect_user(Transfer *);
diff -u -N -r gnapster-1.4.0.old/src/text.c gnapster-1.4.0/src/text.c
--- gnapster-1.4.0.old/src/text.c	Mon Oct  9 21:36:30 2000
+++ gnapster-1.4.0/src/text.c	Wed Oct 25 10:55:52 2000
@@ -137,10 +137,8 @@
 char *real_text_insert(GtkWidget *text, char *fmt) {
    char *ret = NULL, *fmtptr, *ptr = NULL;
    int col = -1, next_col = 1;
-   char buf[1024], b_str[2048];
+   char buf[1024]={0}, b_str[2048]={0};
    
-   bzero(buf, sizeof(buf));
-   bzero(b_str, sizeof(b_str));
    fmtptr = fmt;
    while(ptr || col == -1) {
       if (col == -1)
diff -u -N -r gnapster-1.4.0.old/src/upload.c gnapster-1.4.0/src/upload.c
--- gnapster-1.4.0.old/src/upload.c	Sun Oct 22 09:29:24 2000
+++ gnapster-1.4.0/src/upload.c	Wed Oct 25 10:37:20 2000
@@ -153,7 +153,7 @@
    return (g_strcasecmp(ext, ".mp3") == 0);
 }
 
-int read_byte(int fd, u_int32_t *hdr) {
+int read_byte(int fd, guint32 *hdr) {
    unsigned char c;
    int n;
    
@@ -168,7 +168,7 @@
    return n;
 }
 
-int find_header(int fd, u_int32_t *hdr) {
+int find_header(int fd, guint32 *hdr) {
    int offs, n;
    
    offs = 0;
@@ -186,7 +186,7 @@
    return -1;
 }
 
-int get_bits(u_int32_t *hdr, int bits) {
+int get_bits(guint32 *hdr, int bits) {
    int x;
    
    x = (*hdr >> (32 - bits));
@@ -196,7 +196,7 @@
    return x;
 }
 
-void get_header(u_int32_t hdr, MP3Header **h) {
+void get_header(guint32 hdr, MP3Header **h) {
    MP3Header *hd;
    
    hd = *h;
@@ -219,7 +219,7 @@
    hd->emphasis = get_bits(&hdr, 2);   
 }
 
-int process_header(int fd, u_int32_t hdr, MP3Stats **stats) {
+int process_header(int fd, guint32 hdr, MP3Stats **stats) {
    MP3Stats *s;
    MP3Header *h;
    struct stat st;
@@ -279,7 +279,7 @@
 
 int process_mp3(int fd, MP3Stats **stats) {
    int offs;
-   u_int32_t hdr;
+   guint32 hdr;
    
    hdr = 0;
    offs = find_header(fd, &hdr);