* Remove all bindings

4 files changed, 3 insertions, 372 deletions

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 74657ee7..5ceb89d2 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,20 +1,6 @@
 
 INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
 
-if HAVE_GLIB
-DBUS_GLIB_BUILT_INCLUDES=			\
-	dbus-glib-error-enum.h
-
-GLIB_INCLUDES=					\
-	dbus-glib.h				\
-	dbus-glib-lowlevel.h			\
-	$(DBUS_GLIB_BUILT_INCLUDES)
-
-dbus-glib-error-enum.h: dbus-protocol.h make-dbus-glib-error-enum.sh
-	$(srcdir)/make-dbus-glib-error-enum.sh $(srcdir)/dbus-protocol.h $@
-
-endif
-
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus
 
@@ -35,8 +21,7 @@ dbusinclude_HEADERS=				\
 	dbus-shared.h				\
 	dbus-signature.h			\
 	dbus-threads.h				\
-	dbus-types.h				\
-	$(GLIB_INCLUDES)
+	dbus-types.h
 
 
 dbusarchinclude_HEADERS=			\
@@ -158,9 +143,8 @@ libdbus_convenience_la_SOURCES=			\
 	$(DBUS_UTIL_SOURCES)
 
 
-BUILT_SOURCES=$(dbusarchinclude_HEADERS) $(DBUS_GLIB_BUILT_INCLUDES)
-EXTRA_DIST=dbus-arch-deps.h.in make-dbus-glib-error-enum.sh
-CLEANFILES=$(DBUS_GLIB_BUILT_INCLUDES)
+BUILT_SOURCES=$(dbusarchinclude_HEADERS)
+EXTRA_DIST=dbus-arch-deps.h.in
 
 ## this library is the same as libdbus, but exports all the symbols
 ## and is only used for static linking within the dbus package.
diff --git a/dbus/dbus-glib-lowlevel.h b/dbus/dbus-glib-lowlevel.h
deleted file mode 100644
index cb015ccb..00000000
--- a/dbus/dbus-glib-lowlevel.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-glib-lowlevel.h GLib integration details that require dbus/dbus.h
- *
- * Copyright (C) 2002, 2003  CodeFactory AB
- * Copyright (C) 2003, 2004 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifndef DBUS_GLIB_LOWLEVEL_H
-#define DBUS_GLIB_LOWLEVEL_H
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
-
-G_BEGIN_DECLS
-
-void dbus_set_g_error (GError   **gerror,
-                       DBusError *derror);
-
-#define DBUS_TYPE_CONNECTION      (dbus_connection_get_g_type ())
-#define DBUS_TYPE_MESSAGE         (dbus_message_get_g_type ())
-#define DBUS_TYPE_PENDING_CALL    (dbus_pending_call_get_g_type ())
-GType dbus_connection_get_g_type   (void) G_GNUC_CONST;
-GType dbus_message_get_g_type      (void) G_GNUC_CONST;
-GType dbus_pending_call_get_g_type (void) G_GNUC_CONST;
-
-void            dbus_connection_setup_with_g_main (DBusConnection  *connection,
-                                                   GMainContext    *context);
-void            dbus_server_setup_with_g_main     (DBusServer      *server,
-                                                   GMainContext    *context);
-
-void dbus_g_proxy_send (DBusGProxy    *proxy,
-                        DBusMessage   *message,
-                        dbus_uint32_t *client_serial);
-
-DBusConnection*  dbus_g_connection_get_connection (DBusGConnection *gconnection);
-DBusMessage*     dbus_g_message_get_message       (DBusGMessage    *gmessage);
-
-/* dbus_g_pending_call_get_pending_call() deliberately skipped for now;
- * not sure it makes sense to use any of the DBusPendingCall functions
- * on the wrapped pending call (once we have the right exported
- * g-functions anyhow)
- */
-
-gchar*            dbus_g_method_get_sender    (DBusGMethodInvocation *context);
-
-DBusMessage*      dbus_g_method_get_reply     (DBusGMethodInvocation *context);
-
-void              dbus_g_method_send_reply    (DBusGMethodInvocation *context, 
-                                               DBusMessage *reply);
-
-G_END_DECLS
-
-#endif /* DBUS_GLIB_LOWLEVEL_H */
-
-
-
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h
deleted file mode 100644
index 1c319259..00000000
--- a/dbus/dbus-glib.h
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
-/* dbus-glib.h GLib integration
- *
- * Copyright (C) 2002, 2003  CodeFactory AB
- * Copyright (C) 2003, 2004 Red Hat, Inc.
- *
- * Licensed under the Academic Free License version 2.1
- * 
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-#ifndef DBUS_GLIB_H
-#define DBUS_GLIB_H
-
-#include <glib-object.h>
-#include <dbus/dbus-shared.h>
-
-G_BEGIN_DECLS
-
-#define DBUS_INSIDE_DBUS_GLIB_H 1
-
-
-/**
- * Convert to DBusConnection with dbus_g_connection_get_connection() in dbus-glib-lowlevel.h
- */
-typedef struct _DBusGConnection DBusGConnection;
-/**
- * Convert to DBusMessage with dbus_g_message_get_message() in dbus-glib-lowlevel.h
- */
-typedef struct _DBusGMessage DBusGMessage;
-
-
-#define DBUS_TYPE_G_CONNECTION   (dbus_g_connection_get_g_type ())
-#define DBUS_TYPE_G_MESSAGE      (dbus_g_message_get_g_type ())
-GType dbus_g_connection_get_g_type   (void) G_GNUC_CONST;
-GType dbus_g_message_get_g_type      (void) G_GNUC_CONST;
-
-
-DBusGConnection*  dbus_g_connection_ref          (DBusGConnection        *connection);
-void              dbus_g_connection_unref        (DBusGConnection        *connection);
-DBusGMessage*     dbus_g_message_ref             (DBusGMessage           *message);
-void              dbus_g_message_unref           (DBusGMessage           *message);
-
-void              dbus_g_connection_flush        (DBusGConnection        *connection);
-
-GQuark dbus_g_error_quark (void);
-#define DBUS_GERROR dbus_g_error_quark ()
-
-typedef enum
-{
-#include <dbus/dbus-glib-error-enum.h>    
-} DBusGError;
-
-gboolean         dbus_g_error_has_name    (GError      *error,
-					   const char  *name);
-const char *     dbus_g_error_get_name    (GError      *error);
-
-void             dbus_g_thread_init (void);
-
-DBusGConnection* dbus_g_connection_open (const gchar  *address,
-                                         GError      **error);
-DBusGConnection* dbus_g_bus_get         (DBusBusType   type,
-                                         GError      **error);
-
-typedef struct _DBusGObjectInfo DBusGObjectInfo;
-typedef struct _DBusGMethodInfo DBusGMethodInfo;
-
-/**
- * Object typically generated by dbus-binding-tool that
- * stores a mapping from introspection data to a
- * function pointer for a C method to be invoked.
- */
-struct _DBusGMethodInfo
-{
-  GCallback                 function;    /**< C method to invoke */
-  GClosureMarshal           marshaller;  /**< Marshaller to invoke method */
-  int                       data_offset; /**< Offset into the introspection data */
-};
-
-/**
- * Introspection data for a GObject, normally autogenerated by
- * a tool such as dbus-binding-tool.
- */
-struct _DBusGObjectInfo
-{
-  int   format_version;         /**< Allows us to change the rest of this struct
-                                 *   by adding DBusGObjectInfo2, DBusGObjectInfo3, etc.
-                                 */
-  const DBusGMethodInfo *method_infos; /**< Array of method pointers */
-  int   n_method_infos;                /**< Length of the infos array */
-  const char *data;             /**< Introspection data */
-  const char *exported_signals;  /**< Exported signals */
-  const char *exported_properties;  /**< Exported properties */
-};
-
-void       dbus_g_object_type_install_info     (GType                 object_type,
-                                                const DBusGObjectInfo *info);
-
-void       dbus_g_error_domain_register        (GQuark                domain,
-						const char *          default_iface,
-						GType                 code_enum);
-
-void       dbus_g_connection_register_g_object (DBusGConnection       *connection,
-						const char            *at_path,
-						GObject               *object);
-GObject *  dbus_g_connection_lookup_g_object   (DBusGConnection       *connection,
-						const char            *at_path);
-
-#ifdef DBUS_COMPILATION
-#include "glib/dbus-gtype-specialized.h"
-#else
-#include <dbus/dbus-gtype-specialized.h>
-#endif
-
-/* definitions for some basic array types */
-#define DBUS_TYPE_G_BOOLEAN_ARRAY  (dbus_g_type_get_collection ("GArray", G_TYPE_BOOLEAN))
-#define DBUS_TYPE_G_UCHAR_ARRAY    (dbus_g_type_get_collection ("GArray", G_TYPE_UCHAR))
-#define DBUS_TYPE_G_UINT_ARRAY     (dbus_g_type_get_collection ("GArray", G_TYPE_UINT))
-#define DBUS_TYPE_G_INT_ARRAY      (dbus_g_type_get_collection ("GArray", G_TYPE_INT))
-#define DBUS_TYPE_G_UINT64_ARRAY   (dbus_g_type_get_collection ("GArray", G_TYPE_UINT64))
-#define DBUS_TYPE_G_INT64_ARRAY    (dbus_g_type_get_collection ("GArray", G_TYPE_INT64))
-#define DBUS_TYPE_G_OBJECT_ARRAY   (dbus_g_type_get_collection ("GPtrArray", G_TYPE_OBJECT))
-
-#define DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
-
-GType        dbus_g_object_path_get_g_type         (void) G_GNUC_CONST;
-#define DBUS_TYPE_G_OBJECT_PATH (dbus_g_object_path_get_g_type ())
-
-void         dbus_g_object_register_marshaller      (GClosureMarshal  marshaller,
-						     GType            rettype,
-						     ...);
-void         dbus_g_object_register_marshaller_array(GClosureMarshal  marshaller,
-						     GType            rettype,
-						     guint            n_types,
-						     const GType*     types);
-
-typedef struct _DBusGProxy       DBusGProxy;
-typedef struct _DBusGProxyClass  DBusGProxyClass;
-
-#define DBUS_TYPE_G_PROXY              (dbus_g_proxy_get_type ())
-#define DBUS_G_PROXY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), DBUS_TYPE_G_PROXY, DBusGProxy))
-#define DBUS_G_PROXY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), DBUS_TYPE_G_PROXY, DBusGProxyClass))
-#define DBUS_IS_G_PROXY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), DBUS_TYPE_G_PROXY))
-#define DBUS_IS_G_PROXY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUS_TYPE_G_PROXY))
-#define DBUS_G_PROXY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUS_TYPE_G_PROXY, DBusGProxyClass))
-
-struct _DBusGProxy
-{
-  GObject parent;
-};
-
-struct _DBusGProxyClass
-{
-  GObjectClass parent_class;  /**< Parent class */
-};
-
-typedef struct _DBusGProxyCall DBusGProxyCall;
-typedef void (* DBusGProxyCallNotify) (DBusGProxy       *proxy,
-				       DBusGProxyCall   *call_id,
-				       void             *user_data);
-
-GType             dbus_g_proxy_get_type              (void) G_GNUC_CONST;
-DBusGProxy*       dbus_g_proxy_new_for_name          (DBusGConnection   *connection,
-                                                      const char        *name,
-                                                      const char        *path,
-                                                      const char        *interface);
-DBusGProxy*       dbus_g_proxy_new_for_name_owner    (DBusGConnection   *connection,
-                                                      const char        *name,
-                                                      const char        *path,
-                                                      const char        *interface,
-                                                      GError           **error);
-DBusGProxy*       dbus_g_proxy_new_from_proxy        (DBusGProxy        *proxy,
-                                                      const char        *interface,
-                                                      const char        *path_name);
-DBusGProxy*       dbus_g_proxy_new_for_peer          (DBusGConnection   *connection,
-                                                      const char        *path_name,
-                                                      const char        *interface_name);
-
-void              dbus_g_proxy_set_interface         (DBusGProxy        *proxy,
-						      const char        *interface_name);
-void              dbus_g_proxy_add_signal            (DBusGProxy        *proxy,
-						      const char        *signal_name,
-						      GType              first_type, 
-						      ...);
-
-void              dbus_g_proxy_connect_signal        (DBusGProxy        *proxy,
-                                                      const char        *signal_name,
-                                                      GCallback          handler,
-                                                      void              *data,
-                                                      GClosureNotify     free_data_func);
-void              dbus_g_proxy_disconnect_signal     (DBusGProxy        *proxy,
-                                                      const char        *signal_name,
-                                                      GCallback          handler,
-                                                      void              *data);
-
-gboolean          dbus_g_proxy_call                  (DBusGProxy        *proxy,
-						      const char        *method,
-						      GError           **error,
-						      GType              first_arg_type,
-						      ...);
-
-void              dbus_g_proxy_call_no_reply         (DBusGProxy        *proxy,
-                                                      const char        *method,
-                                                      GType              first_arg_type,
-                                                      ...);
-
-DBusGProxyCall *  dbus_g_proxy_begin_call            (DBusGProxy        *proxy,
-                                                      const char        *method,
-						      DBusGProxyCallNotify notify,
-						      gpointer           data,
-						      GDestroyNotify     destroy,
-                                                      GType              first_arg_type,
-                                                      ...);
-gboolean          dbus_g_proxy_end_call              (DBusGProxy        *proxy,
-                                                      DBusGProxyCall    *call,
-                                                      GError           **error,
-                                                      GType              first_arg_type,
-                                                      ...);
-void              dbus_g_proxy_cancel_call           (DBusGProxy        *proxy,
-                                                      DBusGProxyCall    *call);
-
-const char*       dbus_g_proxy_get_path              (DBusGProxy        *proxy);
-
-const char*       dbus_g_proxy_get_bus_name          (DBusGProxy        *proxy);
-
-const char*       dbus_g_proxy_get_interface         (DBusGProxy        *proxy);
-
-typedef struct _DBusGMethodInvocation DBusGMethodInvocation;
-
-void              dbus_g_method_return               (DBusGMethodInvocation *context, ...);
-
-void              dbus_g_method_return_error         (DBusGMethodInvocation *context, GError *error);
-
-/* Probably possible to replace this with a closure */
-typedef struct {
-  GCallback cb;
-  gpointer userdata;
-} DBusGAsyncData;
-
-#undef DBUS_INSIDE_DBUS_GLIB_H
-
-G_END_DECLS
-
-#endif /* DBUS_GLIB_H */
diff --git a/dbus/make-dbus-glib-error-enum.sh b/dbus/make-dbus-glib-error-enum.sh
deleted file mode 100755
index 55362ded..00000000
--- a/dbus/make-dbus-glib-error-enum.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-SRC=$1
-DEST=$2
-
-die()
-{
-    echo $1 1>&2
-    /bin/rm $DEST.tmp
-    exit 1
-}
-
-cat $SRC | grep '#define DBUS_ERROR' | sed -e 's/#define //g' | \
-  sed -e 's/".*//g' | sed -e 's/DBUS_ERROR/DBUS_GERROR/g' | sed -e 's/ *$/,/g' > $DEST.tmp
-
-if ! test -s $DEST.tmp ; then
-    die "$DEST.tmp is empty, something went wrong, see any preceding error message"
-fi
-echo "DBUS_GERROR_REMOTE_EXCEPTION" >> $DEST.tmp
-
-echo "#ifndef DBUS_INSIDE_DBUS_GLIB_H" >> $DEST.tmp
-echo '#error "' "$DEST" 'may only be included by dbus-glib.h"' >> $DEST.tmp
-echo "#endif" >> $DEST.tmp
-
-mv $DEST.tmp $DEST || die "could not move $DEST.tmp to $DEST"