diff options
author | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
commit | 961e6ca41c1e9433055130569ce3492866e2126b (patch) | |
tree | 053a3e24565665462a498dee93762a83b5598004 /glib/dbus-glib.h | |
parent | eed3989ea35a62e5f58ee7fc3f50a23ad0821800 (diff) |
2004-06-20 Havoc Pennington <hp@redhat.com>
* dbus/dbus-glib-error-enum.h: autogenerate the GError enum
codes from the dbus error names
* glib/dbus-glib.h: move to subdir dbus/ since it's included
as dbus/dbus-glib.h and that breakage is now visible due to
including dbus/dbus-glib.h in dbus-glib-lowlevel.h
* glib/dbus-glib.h: s/gproxy/g_proxy/
* dbus/dbus-shared.h: new header to hold stuff shared with
binding APIs
* dbus/dbus-protocol.h (DBUS_ERROR_*): move errors here rather
than dbus-errors.h
* glib/dbus-glib.h (dbus_set_g_error): move to
dbus-glib-lowlevel.h
* glib/dbus-glib.h: remove dbus/dbus.h from here; change a bunch
of stuff to enable this
* dbus/dbus-glib-lowlevel.h: put dbus/dbus.h here
* a bunch of other changes with the same basic "separate glib
bindings from dbus.h" theme
Diffstat (limited to 'glib/dbus-glib.h')
-rw-r--r-- | glib/dbus-glib.h | 159 |
1 files changed, 0 insertions, 159 deletions
diff --git a/glib/dbus-glib.h b/glib/dbus-glib.h deleted file mode 100644 index 483a6e81..00000000 --- a/glib/dbus-glib.h +++ /dev/null @@ -1,159 +0,0 @@ -/* -*- mode: C; c-file-style: "gnu" -*- */ -/* dbus-glib.h GLib integration - * - * Copyright (C) 2002, 2003 CodeFactory AB - * Copyright (C) 2003 Red Hat, Inc. - * - * Licensed under the Academic Free License version 2.0 - * - * 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 <dbus/dbus.h> -#include <glib-object.h> - -G_BEGIN_DECLS - -#define DBUS_INSIDE_DBUS_GLIB_H 1 - -GQuark dbus_g_error_quark (void); -#define DBUS_GERROR dbus_g_error_quark () - -#define DBUS_TYPE_CONNECTION (dbus_connection_get_g_type ()) -#define DBUS_TYPE_MESSAGE (dbus_message_get_g_type ()) -GType dbus_connection_get_g_type (void) G_GNUC_CONST; -GType dbus_message_get_g_type (void) G_GNUC_CONST; - -typedef enum -{ - /* FIXME map all the DBUS_ERROR to DBUS_GERROR, should - * probably be automated in some way, perhaps - * via lame perl script - */ - DBUS_GERROR_FAILED -} DBusGError; - -void dbus_set_g_error (GError **gerror, - DBusError *derror); - -void dbus_g_thread_init (void); -void dbus_connection_setup_with_g_main (DBusConnection *connection, - GMainContext *context); -void dbus_server_setup_with_g_main (DBusServer *server, - GMainContext *context); -DBusConnection* dbus_bus_get_with_g_main (DBusBusType type, - GError **error); - -typedef struct DBusGObjectInfo DBusGObjectInfo; -typedef struct DBusGMethodInfo DBusGMethodInfo; - -/** - * Object typically generated by dbus-glib-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 */ - DBusHandleMessageFunction marshaller; /**< Marshaller to go DBusMessage to C method */ - int data_offset; /**< Offset into the introspection data */ -}; - -/** - * Introspection data for a GObject, normally autogenerated by - * a tool such as dbus-glib-tool. - */ -struct DBusGObjectInfo -{ - int format_version; /**< Allows us to change the rest of this struct - * by adding DBusGObjectInfo2, DBusGObjectInfo3, etc. - */ - const DBusGMethodInfo *infos; /**< Array of method pointers */ - const unsigned char *data; /**< Introspection data */ -}; - -void dbus_g_object_class_install_info (GObjectClass *object_class, - const DBusGObjectInfo *info); -void dbus_connection_register_g_object (DBusConnection *connection, - const char *at_path, - GObject *object); - - -typedef struct DBusGProxy DBusGProxy; -typedef struct DBusGProxyClass DBusGProxyClass; - -typedef void (* DBusGProxySignalHandler) (DBusGProxy *proxy, - DBusMessage *signal, - void *user_data); - -#define DBUS_TYPE_GPROXY (dbus_gproxy_get_type ()) -#define DBUS_GPROXY(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), DBUS_TYPE_GPROXY, DBusGProxy)) -#define DBUS_GPROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DBUS_TYPE_GPROXY, DBusGProxyClass)) -#define DBUS_IS_GPROXY(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), DBUS_TYPE_GPROXY)) -#define DBUS_IS_GPROXY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DBUS_TYPE_GPROXY)) -#define DBUS_GPROXY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUS_TYPE_GPROXY, DBusGProxyClass)) - - -GType dbus_gproxy_get_type (void) G_GNUC_CONST; -DBusGProxy* dbus_gproxy_new_for_service (DBusConnection *connection, - const char *service_name, - const char *path_name, - const char *interface_name); -DBusGProxy* dbus_gproxy_new_for_service_owner (DBusConnection *connection, - const char *service_name, - const char *path_name, - const char *interface_name, - GError **error); -DBusGProxy* dbus_gproxy_new_for_peer (DBusConnection *connection, - const char *path_name, - const char *interface_name); -void dbus_gproxy_connect_signal (DBusGProxy *proxy, - const char *signal_name, - DBusGProxySignalHandler handler, - void *data, - GClosureNotify free_data_func); -void dbus_gproxy_disconnect_signal (DBusGProxy *proxy, - const char *signal_name, - DBusGProxySignalHandler handler, - void *data); -DBusPendingCall* dbus_gproxy_begin_call (DBusGProxy *proxy, - const char *method, - int first_arg_type, - ...); -gboolean dbus_gproxy_end_call (DBusGProxy *proxy, - DBusPendingCall *pending, - GError **error, - int first_arg_type, - ...); -void dbus_gproxy_call_no_reply (DBusGProxy *proxy, - const char *method, - int first_arg_type, - ...); -void dbus_gproxy_send (DBusGProxy *proxy, - DBusMessage *message, - dbus_uint32_t *client_serial); - - -#undef DBUS_INSIDE_DBUS_GLIB_H - -G_END_DECLS - -#endif /* DBUS_GLIB_H */ - - - |