summaryrefslogtreecommitdiff
path: root/glib
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-08-15 23:10:12 +0000
committerHavoc Pennington <hp@redhat.com>2003-08-15 23:10:12 +0000
commita1b0bd33408f03894987ac32b4e6b46c6a15a594 (patch)
tree2903a89983ce0efa1d3480b5d76322a325e621da /glib
parentef614207fc4f03e5cc02faeb109f739eb1ccdf31 (diff)
2003-08-15 Havoc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'glib')
-rw-r--r--glib/dbus-gproxy.h70
1 files changed, 35 insertions, 35 deletions
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,
- ...);