Removed. Split into glibtop-backend.h and glibtop-backend-info.h.

2000-11-26  Martin Baulig  <martin@home-of-linux.org>

	* include/glibtop/backend.h: Removed. Split into glibtop-backend.h
	and glibtop-backend-info.h.

	* include/glibtop/glibtop-backend.h: New file. Switched
	glibtop_backend to a GObject.

	* include/glibtop/glibtop-backend-info.h: New file.

	* lib/backend.c, lib/init-backends.c, lib/open-backend.c: Removed.

	* lib/glibtop-backend.c: New file.
	* lib/glibtop-backend-info.c: New file.

include/glibtop/Makefile.am

@@ -9,8 +9,9 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  mountlist.h fsusage.h procmap.h signal.h \
 			  inodedb.h sysinfo.h ppp.h procargs.h netload.h \
 			  netinfo.h interfaces.h limits.h array.h compat_10.h \
-			  glib-arrays.h backend.h call-vector.h \
-			  glibtop-client.h glibtop-server.h
+			  glib-arrays.h call-vector.h \
+			  glibtop-client.h glibtop-server.h glibtop-backend.h \
+			  glibtop-backend-info.h
 
 BUILT_SOURCES		= call-vector.h
 

include/glibtop/glibtop-backend-info.h

@@ -23,8 +23,8 @@
    Boston, MA 02111-1307, USA.
 */
 
-#ifndef __GLIBTOP_BACKEND_H__
-#define __GLIBTOP_BACKEND_H__
+#ifndef __GLIBTOP_BACKEND_INFO_H__
+#define __GLIBTOP_BACKEND_INFO_H__
 
 #include <glibtop.h>
 #include <glibtop/global.h>
@@ -36,12 +36,9 @@ BEGIN_LIBGTOP_DECLS
 typedef struct _glibtop_backend_info	glibtop_backend_info;
 typedef struct _glibtop_backend_entry	glibtop_backend_entry;
 typedef struct _glibtop_backend_module	glibtop_backend_module;
-typedef struct _glibtop_backend_private	glibtop_backend_private;
 
 typedef struct _glibtop_call_vector	glibtop_call_vector;
 
-typedef struct _glibtop_backend		glibtop_backend;
-
 typedef int (*glibtop_backend_open_func_t) (glibtop_server *, glibtop_backend *,
 					    u_int64_t, const char **);
 typedef int (*glibtop_backend_close_func_t) (glibtop_server *, glibtop_backend *);
@@ -66,8 +63,6 @@ struct _glibtop_backend_module
     GSList *extra_modules;
 };
 
-#endif /* _IN_LIBGTOP */
-
 struct _glibtop_backend_entry
 {
     char *name;
@@ -84,16 +79,7 @@ struct _glibtop_backend_entry
     glibtop_backend_module *_priv;
 };
 
-struct _glibtop_backend
-{
-    const glibtop_backend_info *info;
-
-    glibtop_server *server;
-
-    /* private pointers */
-    glibtop_backend_private *_priv;
-    glibtop_backend_module *_priv_module;
-};
+#endif /* _IN_LIBGTOP */
 
 long
 glibtop_register_backend (glibtop_backend_entry *entry);
@@ -110,10 +96,6 @@ glibtop_backend_by_name (const char *backend_name);
 void
 glibtop_init_backends (void);
 
-glibtop_backend *
-glibtop_open_backend (const char *backend_name, u_int64_t features,
-		      const char **backend_args, GError **error);
-
 END_LIBGTOP_DECLS
 
 #endif

include/glibtop/glibtop-backend.h

@@ -0,0 +1,71 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 2.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_BACKEND_H__
+#define __GLIBTOP_BACKEND_H__
+
+#include <glibtop.h>
+#include <gobject/gobject.h>
+
+BEGIN_LIBGTOP_DECLS
+
+#define	GLIBTOP_TYPE_BACKEND		(glibtop_backend_get_type ())
+#define GLIBTOP_BACKEND(backend)	(G_TYPE_CHECK_INSTANCE_CAST ((backend), GLIBTOP_TYPE_BACKEND, glibtop_backend))
+#define GLIBTOP_BACKEND_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GLIBTOP_TYPE_BACKEND, glibtop_backend_class))
+#define GLIBTOP_IS_BACKEND(backend)	(G_TYPE_CHECK_INSTANCE_TYPE ((backend), GLIBTOP_TYPE_BACKEND))
+#define GLIBTOP_IS_BACKEND_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GLIBTOP_TYPE_BACKEND))
+#define	GLIBTOP_BACKEND_GET_CLASS(backend)(G_TYPE_INSTANCE_GET_CLASS ((backend), GLIBTOP_TYPE_BACKEND, glibtop_backend_class))
+
+#define GLIBTOP_BACKEND_TYPE(backend)	(G_TYPE_FROM_INSTANCE (backend))
+#define GLIBTOP_BACKEND_TYPE_NAME(backend)(g_type_name (GLIBTOP_BACKEND_TYPE (backend)))
+
+/* --- typedefs & structures --- */
+typedef struct _glibtop_backend		glibtop_backend;
+typedef struct _glibtop_backend_class	glibtop_backend_class;
+typedef struct _glibtop_backend_private	glibtop_backend_private;
+
+struct	_glibtop_backend
+{
+    GObject object;
+
+    /* <private> */
+    glibtop_backend_private *_priv;
+};
+
+struct	_glibtop_backend_class
+{
+    GObjectClass parent_class;;
+};
+
+GType
+glibtop_backend_get_type (void);
+
+glibtop_backend *
+glibtop_backend_open (const char *backend_name, u_int64_t features,
+		      const char **backend_args, GError **error);
+
+END_LIBGTOP_DECLS
+
+#endif

include/glibtop/glibtop-client.h

@@ -29,7 +29,7 @@
 #include <glibtop.h>
 #include <gobject/gobject.h>
 
-#include <glibtop/backend.h>
+#include <glibtop/glibtop-backend.h>
 
 BEGIN_LIBGTOP_DECLS