From a1b0bd33408f03894987ac32b4e6b46c6a15a594 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 15 Aug 2003 23:10:12 +0000 Subject: 2003-08-15 Havoc Pennington * dbus/dbus-pending-call.c (dbus_pending_call_block): implement * dbus/dbus-connection.c (dbus_connection_send_with_reply_and_block): factor out internals; change to convert any error replies to DBusError instead of returning them as a message --- glib/dbus-gproxy.h | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'glib') diff --git a/glib/dbus-gproxy.h b/glib/dbus-gproxy.h index bebcd1ce..47b70f36 100644 --- a/glib/dbus-gproxy.h +++ b/glib/dbus-gproxy.h @@ -34,43 +34,43 @@ G_BEGIN_DECLS typedef struct DBusGProxy DBusGProxy; -typedef struct DBusGPendingCall DBusGPendingCall; +typedef struct DBusPendingCall DBusPendingCall; -DBusGProxy* dbus_gproxy_new_for_service (DBusConnection *connection, - const char *service_name, - const char *interface_name); -DBusGProxy* dbus_gproxy_new_for_service_owner (DBusConnection *connection, - const char *service_name, - const char *interface_name, - GError **error); -DBusGProxy* dbus_gproxy_new_for_object_id (DBusConnection *connection, - const DBusObjectID *object_id, - const char *interface_name); -DBusGProxy* dbus_gproxy_new_for_interface (DBusConnection *connection, - const char *interface_name); -void dbus_gproxy_ref (DBusGProxy *proxy); -void dbus_gproxy_unref (DBusGProxy *proxy); -gboolean dbus_gproxy_connect_signal (DBusGProxy *proxy, - const char *signal_name, - GCallback callback, - void *data, - GFreeFunc free_data_func, - GError **error); -DBusGPendingCall* dbus_gproxy_begin_call (DBusGProxy *proxy, - const char *method, - int first_arg_type, - ...); -void dbus_gproxy_oneway_call (DBusGProxy *proxy, - const char *method, - int first_arg_type, - ...); +DBusGProxy* dbus_gproxy_new_for_service (DBusConnection *connection, + const char *service_name, + const char *interface_name); +DBusGProxy* dbus_gproxy_new_for_service_owner (DBusConnection *connection, + const char *service_name, + const char *interface_name, + GError **error); +DBusGProxy* dbus_gproxy_new_for_object_id (DBusConnection *connection, + const DBusObjectID *object_id, + const char *interface_name); +DBusGProxy* dbus_gproxy_new_for_interface (DBusConnection *connection, + const char *interface_name); +void dbus_gproxy_ref (DBusGProxy *proxy); +void dbus_gproxy_unref (DBusGProxy *proxy); +gboolean dbus_gproxy_connect_signal (DBusGProxy *proxy, + const char *signal_name, + GCallback callback, + void *data, + GFreeFunc free_data_func, + GError **error); +DBusPendingCall* dbus_gproxy_begin_call (DBusGProxy *proxy, + const char *method, + int first_arg_type, + ...); +void dbus_gproxy_oneway_call (DBusGProxy *proxy, + const char *method, + int first_arg_type, + ...); +gboolean dbus_pending_call_is_complete (DBusPendingCall *call); +void dbus_pending_call_cancel_and_free (DBusPendingCall *call); +gboolean dbus_pending_call_block_and_free (DBusPendingCall *call, + GError **error, + int first_arg_type, + ...); -gboolean dbus_gpending_call_is_complete (DBusGPendingCall *call); -void dbus_gpending_call_cancel_and_free (DBusGPendingCall *call); -gboolean dbus_gpending_call_block_and_free (DBusGPendingCall *call, - GError **error, - int first_arg_type, - ...); -- cgit