dbus/dbus dbus-glib.h,1.17,1.18
Colin Walters
walters at freedesktop.org
Wed Jul 6 14:27:54 PDT 2005
- Previous message: dbus/glib dbus-gproxy.c, 1.34, 1.35 dbus-gparser.c, 1.16,
1.17 dbus-gobject.c, 1.38, 1.39 dbus-glib.c, 1.7,
1.8 dbus-binding-tool-glib.c, 1.14, 1.15
- Next message: dbus ChangeLog,1.825,1.826
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv26636/dbus
Modified Files:
dbus-glib.h
Log Message:
2005-07-06 Colin Walters <walters at verbum.org>
* dbus/dbus-glib.h (DBusGPendingCall, DBusGPendingCallNotify)
(DBUS_TYPE_G_PENDING_CALL, dbus_g_pending_call_get_g_type)
(dbus_g_pending_call_ref, dbus_g_pending_call_unref): Delete.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel):
Delete in favor of dbus_g_proxy_begin_call and
dbus_g_proxy_cancel_call.
(DBusGProxyCall, DBusGProxyCallNotify): New.
(dbus_g_proxy_begin_call): Change prototype to take callback, user
data, and destroy function. This replaces
dbus_g_pending_call_set_notify.
(dbus_g_proxy_cancel_call): Prototype.
(DBusGAsyncData): Delete, shouldn't be needed anymore.
* glib/dbus-gproxy.c (struct _DBusGProxy): Add call_id_counter and
pending_calls map.
(struct _DBusGProxyManager): Add bus_proxy member, which is an
internal proxy for calls to the bus. Remove
pending_nameowner_calls, now the internal proxy keeps track.
(dbus_g_proxy_manager_unref): Unref bus proxy, remove reference to
pending_nameowner_calls.
(got_name_owner_cb): Update prototype, and use
dbus_g_proxy_end_call.
(got_name_owner_cb): Remove reference to pending_nameowner_calls.
(dbus_g_proxy_manager_register): Delete directly libdbus code in
favor of using internal proxy.
(dbus_g_proxy_manager_unregister): Update to use
dbus_g_proxy_cancel_call for any pending GetNameOwner call.
(dbus_g_proxy_init): Initialize pending calls map.
(dbus_g_proxy_constructor): New.
(dbus_g_proxy_class_init): Add get/set property functions,
constructor, and add NAME, PATH, and INTERFACE properties.
(cancel_pending_call): New function.
(dbus_g_proxy_dispose): Iterate over any outstanding calls and
cancel them.
(dbus_g_proxy_set_property, dbus_g_proxy_get_property): New.
(GPendingNotifyClosure): New structure.
(d_pending_call_notify, d_pending_call_free): Moved here from
dbus-glib.c.
(DBUS_G_VALUE_ARRAY_COLLECT_ALL): Moved around to satisfy function
ordering.
(manager_begin_bus_call): New internal function for talking to
internal bus proxy.
(dbus_g_proxy_new): Construct object using GObjet properties.
(dbus_g_proxy_begin_call_internal): Update to take user data, etc.
Create closure of same, and insert call into map of pending calls.
(dbus_g_proxy_end_call_internal): Take call id instead of pending
call. Look up pending call in current set. Remove it when we've
completed.
(dbus_g_pending_call_end, dbus_g_proxy_end_call_internal): Delete.
(dbus_g_proxy_begin_call): Change API to take callback, user data,
and destroy function directly.
(dbus_g_proxy_end_call): Update to take DBusGProxyCall.
(dbus_g_proxy_call): Invoke with NULL callback.
(dbus_g_proxy_cancel_call): New function, replaces
dbus_g_pending_call_cancel.
* glib/dbus-gparser.c (validate_signature): Fix call to
dbus_set_g_error.
* glib/dbus-gobject.c (dbus_g_object_type_dbus_metadata_quark):
New quark for attaching metadata to GType.
(info_hash): Delete.
(lookup_object_info): Look up using quark.
(dbus_g_object_type_install_info): Check that a type is classed,
not that it's an object. Also just install type data using quark
instead of using global hash.
* glib/dbus-glib.c (dbus_g_pending_call_ref)
(dbus_g_pending_call_unref, dbus_pending_call_get_g_type)
(GPendingNotifyClosure): Delete.
(d_pending_call_notify, d_pending_call_free): Move to dbus-gproxy.c.
(dbus_g_pending_call_set_notify, dbus_g_pending_call_cancel): Delete.
* glib/dbus-binding-tool-glib.c (generate_client_glue): Disable async
client method generation until we can fix it...
* tools/dbus-viewer.c (load_child_nodes): Use dbus_g_proxy_call.
(load_from_service_thread_func): Ditto.
* tools/dbus-names-model.c (struct NamesModel): Hold
DBusGProxyCall.
(have_names_notify): Update prototype, use
dbus_g_proxy_cancel_call.
(names_model_reload): Update for new dbus_g_proxy_begin_call API.
* tools/dbus-monitor.c (filter_func): Update for print_message
API change.
* test/glib/test-dbus-glib.c: Add more tests for async
invocations. Update many begin_call/end_call pairs to just use
dbus_g_proxy_call.
* tools/dbus-send.c (main): Add --print-reply=literal mode. This
allows us to dump print-introspect.c.
* tools/dbus-print-message.h (print_message): Add literal argument
to print_message which is intended to allow printing arguments without
metadata like "string=".
* tools/dbus-print-message.c (print_iter): Add literal argument.
(print_message): Allow printing string messages literally.
Index: dbus-glib.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-glib.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- dbus-glib.h 30 Jun 2005 18:22:10 -0000 1.17
+++ dbus-glib.h 6 Jul 2005 21:27:51 -0000 1.18
@@ -40,39 +40,21 @@
* 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 @@
#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 @@
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_error (DBusGMethodInvocation *context, GError *error);
-typedef struct {
- DBusGProxy *proxy;
- gpointer cb;
- gpointer userdata;
-} DBusGAsyncData;
-
#undef DBUS_INSIDE_DBUS_GLIB_H
G_END_DECLS
- Previous message: dbus/glib dbus-gproxy.c, 1.34, 1.35 dbus-gparser.c, 1.16,
1.17 dbus-gobject.c, 1.38, 1.39 dbus-glib.c, 1.7,
1.8 dbus-binding-tool-glib.c, 1.14, 1.15
- Next message: dbus ChangeLog,1.825,1.826
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the dbus-commit
mailing list