diff options
Diffstat (limited to 'dbus/dbus-glib.h')
| -rw-r--r-- | dbus/dbus-glib.h | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h index 41b3d9c1..4b3672c2 100644 --- a/dbus/dbus-glib.h +++ b/dbus/dbus-glib.h @@ -40,39 +40,21 @@ typedef struct _DBusGConnection DBusGConnection; * Convert to DBusMessage with dbus_g_message_get_message() in dbus-glib-lowlevel.h */ typedef struct _DBusGMessage DBusGMessage; -/** - * Deliberately not possible to convert to DBusPendingCall - */ -typedef struct _DBusGPendingCall DBusGPendingCall; - -typedef void (* DBusGPendingCallNotify) (DBusGPendingCall *pending, - void *user_data); #define DBUS_TYPE_G_CONNECTION (dbus_g_connection_get_g_type ()) #define DBUS_TYPE_G_MESSAGE (dbus_g_message_get_g_type ()) -#define DBUS_TYPE_G_PENDING_CALL (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; -GType dbus_g_pending_call_get_g_type (void) G_GNUC_CONST; DBusGConnection* dbus_g_connection_ref (DBusGConnection *connection); void dbus_g_connection_unref (DBusGConnection *connection); -DBusGPendingCall* dbus_g_pending_call_ref (DBusGPendingCall *call); -void dbus_g_pending_call_unref (DBusGPendingCall *call); DBusGMessage* dbus_g_message_ref (DBusGMessage *message); void dbus_g_message_unref (DBusGMessage *message); void dbus_g_connection_flush (DBusGConnection *connection); -void dbus_g_pending_call_set_notify (DBusGPendingCall *call, - DBusGPendingCallNotify callback, - void *callback_data, - GDestroyNotify free_data_func); -void dbus_g_pending_call_cancel (DBusGPendingCall *call); - - GQuark dbus_g_error_quark (void); #define DBUS_GERROR dbus_g_error_quark () @@ -221,6 +203,11 @@ typedef struct _DBusGProxyClass DBusGProxyClass; #define DBUS_G_PROXY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUS_TYPE_G_PROXY, DBusGProxyClass)) +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, @@ -266,15 +253,20 @@ void dbus_g_proxy_call_no_reply (DBusGProxy *proxy, GType first_arg_type, ...); -DBusGPendingCall* dbus_g_proxy_begin_call (DBusGProxy *proxy, +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, - DBusGPendingCall *pending, + 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); @@ -288,12 +280,6 @@ void dbus_g_method_return (DBusGMethodInvocation *con void dbus_g_method_return_error (DBusGMethodInvocation *context, GError *error); -typedef struct { - DBusGProxy *proxy; - gpointer cb; - gpointer userdata; -} DBusGAsyncData; - #undef DBUS_INSIDE_DBUS_GLIB_H G_END_DECLS |