Removed some dead files. Don't install private headers.

	* backends/server/server.h:
	* configure.in:
	* glibtop.h:
	* include/glibtop/Makefile.am:
	* include/glibtop/gnuserv.h:
	* include/glibtop/open.h:
	* include/glibtop/read.h:
	* include/glibtop/read_data.h:
	* include/glibtop/types.h:
	* include/glibtop/write.h:
	* lib/close.c:
	* lib/init.c:
	* lib/lib.pl:
	* lib/open.c:
	* lib/parameter.c:
	* lib/read.c:
	* lib/read_data.c:
	* lib/write.c:
	* src/daemon/daemon.h:
	* src/daemon/io.c:
	* src/daemon/main.c: (handle_parent_connection):
	* src/daemon/slave.c: (handle_slave_connection),
	(handle_slave_command):
	* sysdeps/common/gnuslib.c:
	* sysdeps/solaris/glibtop_private.h: Removed some dead files.
	Don't install private headers.

25 files changed, 60 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index b86dd2ff..a6a78179 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,34 @@
 2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
 
+	* backends/server/server.h:
+	* configure.in:
+	* glibtop.h:
+	* include/glibtop/Makefile.am:
+	* include/glibtop/gnuserv.h:
+	* include/glibtop/open.h:
+	* include/glibtop/read.h:
+	* include/glibtop/read_data.h:
+	* include/glibtop/types.h:
+	* include/glibtop/write.h:
+	* lib/close.c:
+	* lib/init.c:
+	* lib/lib.pl:
+	* lib/open.c:
+	* lib/parameter.c:
+	* lib/read.c:
+	* lib/read_data.c:
+	* lib/write.c:
+	* src/daemon/daemon.h:
+	* src/daemon/io.c:
+	* src/daemon/main.c: (handle_parent_connection):
+	* src/daemon/slave.c: (handle_slave_connection),
+	(handle_slave_command):
+	* sysdeps/common/gnuslib.c:
+	* sysdeps/solaris/glibtop_private.h: Removed some dead files.
+	Don't install private headers.
+
+2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
+
 	* include/glibtop/error.h: Don't export private symbols.
 
 2005-02-15  Benoît Dejean  <TazForEver@dlfp.org>
diff --git a/backends/server/server.h b/backends/server/server.h
index 605f4704..419ca349 100644
--- a/backends/server/server.h
+++ b/backends/server/server.h
@@ -27,7 +27,6 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 #include <glibtop/open.h>
 #include <glibtop/union.h>
diff --git a/configure.in b/configure.in
index b20981fb..6fe584ab 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM
 
 LIBGTOP_MAJOR_VERSION=2
 LIBGTOP_MINOR_VERSION=9
-LIBGTOP_MICRO_VERSION=91
+LIBGTOP_MICRO_VERSION=92
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
 
@@ -133,7 +133,7 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
 
-GLIB_REQUIRED=2.4.0
+GLIB_REQUIRED=2.6.0
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
diff --git a/glibtop.h b/glibtop.h
index c90ae18b..4b4da1aa 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -51,7 +51,6 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 #include <glibtop/global.h>
 
 #include <glibtop_server.h>
-#include <glibtop/types.h>
 
 #ifdef HAVE_GLIBTOP_MACHINE_H
 #include <glibtop_machine.h>
diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
index 8e4d36b2..60748ebe 100644
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -3,9 +3,11 @@ glibtopdir		= $(includedir)/libgtop-2.0/glibtop
 glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
 			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
-			  procmem.h procuid.h swap.h write.h error.h open.h \
-			  procsegment.h read.h sysdeps.h global.h \
-			  procsignal.h read_data.h union.h types.h gnuserv.h \
+			  procmem.h procuid.h swap.h \
+			  procsegment.h sysdeps.h global.h \
+			  procsignal.h union.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
 			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
 			  netlist.h procopenfiles.h
+
+noinst_HEADERS		= error.h write.h open.h read_data.h read.h
diff --git a/include/glibtop/gnuserv.h b/include/glibtop/gnuserv.h
index 66e97074..aa24e1b3 100644
--- a/include/glibtop/gnuserv.h
+++ b/include/glibtop/gnuserv.h
@@ -42,7 +42,6 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 /* gnuserv should not be compiled using SOCKS */
 #define DO_NOT_SOCKSIFY
 #include <glibtop.h>
-#include <glibtop/error.h>
 #undef read
 #undef write
 #undef open
diff --git a/include/glibtop/open.h b/include/glibtop/open.h
index 77cf8dd1..8e7a49e0 100644
--- a/include/glibtop/open.h
+++ b/include/glibtop/open.h
@@ -23,8 +23,6 @@
 #define __GLIBTOP_OPEN_H__
 
 #include <glibtop.h>
-#include <glibtop/read.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 
diff --git a/include/glibtop/read.h b/include/glibtop/read.h
index c7ea13ab..78c8d417 100644
--- a/include/glibtop/read.h
+++ b/include/glibtop/read.h
@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 
diff --git a/include/glibtop/read_data.h b/include/glibtop/read_data.h
index aa1dbb5d..25a1556e 100644
--- a/include/glibtop/read_data.h
+++ b/include/glibtop/read_data.h
@@ -25,7 +25,6 @@
 #define __GLIBTOP_READ_DATA_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 
diff --git a/include/glibtop/types.h b/include/glibtop/types.h
deleted file mode 100644
index 28cea3ff..00000000
--- a/include/glibtop/types.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* $Id$ */
-
-/* Copyright (C) 1998-99 Martin Baulig
-   This file is part of LibGTop 1.0.
-
-   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-
-   LibGTop is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License,
-   or (at your option) any later version.
-
-   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with LibGTop; see the file COPYING. If not, write to the
-   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __GLIBTOP_TYPES_H__
-#define __GLIBTOP_TYPES_H__
-
-G_BEGIN_DECLS
-
-#define GLIBTOP_TYPE_LONG	1
-#define GLIBTOP_TYPE_ULONG	2
-#define GLIBTOP_TYPE_DOUBLE	3
-#define GLIBTOP_TYPE_INT	4
-#define GLIBTOP_TYPE_CHAR	5
-#define GLIBTOP_TYPE_STRING	6
-
-G_END_DECLS
-
-#endif
diff --git a/include/glibtop/write.h b/include/glibtop/write.h
index 36d11e68..fe31ae25 100644
--- a/include/glibtop/write.h
+++ b/include/glibtop/write.h
@@ -25,7 +25,6 @@
 #define __GLIBTOP_WRITE_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/close.c b/lib/close.c
index 2d851c70..c0c919c2 100644
--- a/lib/close.c
+++ b/lib/close.c
@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/error.h>
 #include <glibtop/close.h>
 #include <glibtop/command.h>
 
diff --git a/lib/init.c b/lib/init.c
index 17fe540c..e023374f 100644
--- a/lib/init.c
+++ b/lib/init.c
@@ -22,6 +22,7 @@
 */
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 #include <glibtop/sysdeps.h>
 #include <glibtop/parameter.h>
 
diff --git a/lib/lib.pl b/lib/lib.pl
index 0ef8e7bf..5d490919 100755
--- a/lib/lib.pl
+++ b/lib/lib.pl
@@ -23,6 +23,7 @@ print '';
 print '#include <config.h>';
 print '';
 print '#include <glibtop.h>';
+print '#include <glibtop/error.h>';
 print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
diff --git a/lib/open.c b/lib/open.c
index 69a484dd..37547274 100644
--- a/lib/open.c
+++ b/lib/open.c
@@ -23,6 +23,8 @@
 
 #include <glibtop.h>
 #include <glibtop/open.h>
+#include <glibtop/read.h>
+#include <glibtop/error.h>
 #include <glibtop/version.h>
 #include <glibtop/sysdeps.h>
 #include <glibtop/command.h>
diff --git a/lib/parameter.c b/lib/parameter.c
index 399c43db..e09aba93 100644
--- a/lib/parameter.c
+++ b/lib/parameter.c
@@ -23,6 +23,7 @@
 
 #include <glibtop.h>
 #include <glibtop/parameter.h>
+#include <glibtop/error.h>
 
 #define _write_data(ptr,size)	\
 	if ((data_ptr == NULL) || (data_size < size)) return -size; \
diff --git a/lib/read.c b/lib/read.c
index 562f121c..a2700975 100644
--- a/lib/read.c
+++ b/lib/read.c
@@ -23,6 +23,7 @@
 
 #include <config.h>
 #include <glibtop/read.h>
+#include <glibtop/error.h>
 #include "libgtop-i18n.h"
 
 
diff --git a/lib/read_data.c b/lib/read_data.c
index 3159566a..13205c11 100644
--- a/lib/read_data.c
+++ b/lib/read_data.c
@@ -23,6 +23,7 @@
 
 #include <config.h>
 
+#include <glibtop/error.h>
 #include <glibtop/read_data.h>
 #include "libgtop-i18n.h"
 
diff --git a/lib/write.c b/lib/write.c
index fce7489b..76c7d963 100644
--- a/lib/write.c
+++ b/lib/write.c
@@ -24,6 +24,7 @@
 #include <config.h>
 
 #include <glibtop/write.h>
+#include <glibtop/error.h>
 #include "libgtop-i18n.h"
 
 /* Writes some data to server. */
diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h
index f62cbe7c..a585b32c 100644
--- a/src/daemon/daemon.h
+++ b/src/daemon/daemon.h
@@ -25,7 +25,6 @@
 #define __GLIBTOP_DAEMON_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 #include <glibtop/gnuserv.h>
 
 #include <glibtop/open.h>
diff --git a/src/daemon/io.c b/src/daemon/io.c
index aa38dd40..3f7d115d 100644
--- a/src/daemon/io.c
+++ b/src/daemon/io.c
@@ -22,6 +22,7 @@
 */
 
 #include "daemon.h"
+#include <glibtop/error.h>
 
 void
 do_output (int s, glibtop_response *resp, off_t offset,
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 0822bb7b..2cf9fa1e 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -62,13 +62,13 @@ handle_parent_connection (int s)
     while (do_read (s, cmnd, sizeof (glibtop_command))) {
 	if (enable_debug)
 	    syslog_message (LOG_DEBUG,
-			    "Parent (%d) received command %d from client.",
-			    getpid (), (int)cmnd->command);
+			    "Parent (%d) received command %llu from client.",
+			    getpid (), cmnd->command);
 
 	if (cmnd->data_size >= BUFSIZ) {
 	    syslog_message (LOG_WARNING,
-			    "Client sent %d bytes, but buffer is %lu",
-			    (int)cmnd->data_size, (unsigned long)BUFSIZ);
+			    "Client sent %llu bytes, but buffer is %lu",
+			    cmnd->data_size, (unsigned long)BUFSIZ);
 	    return;
 	}
 
@@ -78,8 +78,8 @@ handle_parent_connection (int s)
 
 	if (cmnd->data_size) {
 	    if (enable_debug)
-		syslog_message (LOG_DEBUG, "Client has %d bytes of data.",
-				(int) cmnd->data_size);
+		syslog_message (LOG_DEBUG, "Client has %llu bytes of data.",
+				cmnd->data_size);
 
 	    do_read (s, parameter, cmnd->data_size);
 
@@ -229,8 +229,8 @@ handle_parent_connection (int s)
 		       0, NULL);
 	    break;
 	default:
-	    syslog_message (LOG_ERR, "Parent received unknown command %d.",
-			    (int)cmnd->command);
+	    syslog_message (LOG_ERR, "Parent received unknown command %llu.",
+			    cmnd->command);
 	    break;
 	}
     }
diff --git a/src/daemon/slave.c b/src/daemon/slave.c
index 6dd615f5..4d3762da 100644
--- a/src/daemon/slave.c
+++ b/src/daemon/slave.c
@@ -22,6 +22,7 @@
 */
 
 #include "daemon.h"
+#include <glibtop/error.h>
 
 void
 handle_slave_connection (int input, int output)
@@ -42,11 +43,11 @@ handle_slave_connection (int input, int output)
 	while (do_read (input, cmnd, sizeof (glibtop_command))) {
 #ifdef SLAVE_DEBUG
 		fprintf (stderr, "Slave %d received command "
-			 "%d from client.\n", getpid (), cmnd->command);
+			 "%llu from client.\n", getpid (), cmnd->command);
 #endif
 
 		if (cmnd->data_size >= BUFSIZ)
-			glibtop_error ("Client sent %d bytes, "
+			glibtop_error ("Client sent %llu bytes, "
 				       "but buffer is %lu",
 				       cmnd->size, (unsigned long)BUFSIZ);
 
@@ -56,7 +57,7 @@ handle_slave_connection (int input, int output)
 
 		if (cmnd->data_size) {
 #ifdef SLAVE_DEBUG
-			fprintf (stderr, "Client has %d bytes of data.\n",
+			fprintf (stderr, "Client has %llu bytes of data.\n",
 				 cmnd->data_size);
 #endif
 
@@ -249,7 +250,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
 		break;
 #endif
 	default:
-		glibtop_error ("Child received unknown command %d",
+		glibtop_error ("Child received unknown command %llu",
 			       cmnd->command);
 		break;
 	}
diff --git a/sysdeps/common/gnuslib.c b/sysdeps/common/gnuslib.c
index 23581b07..3c35773a 100644
--- a/sysdeps/common/gnuslib.c
+++ b/sysdeps/common/gnuslib.c
@@ -30,6 +30,7 @@
  */
 
 #include <glibtop.h>
+#include <glibtop/error.h>
 #include <glibtop/gnuserv.h>
 
 #include <fcntl.h>
diff --git a/sysdeps/solaris/glibtop_private.h b/sysdeps/solaris/glibtop_private.h
index 043ab018..b2a63fed 100644
--- a/sysdeps/solaris/glibtop_private.h
+++ b/sysdeps/solaris/glibtop_private.h
@@ -25,7 +25,6 @@
 #define __GLIBTOP_PRIVATE_H__
 
 #include <glibtop.h>
-#include <glibtop/error.h>
 
 #include <sys/param.h>
 #include <kstat.h>