dbus/glib/examples example-signal-recipient.c,1.1,1.2
Colin Walters
walters at freedesktop.org
Wed Jun 29 09:59:02 PDT 2005
Update of /cvs/dbus/dbus/glib/examples
In directory gabe:/tmp/cvs-serv19565/glib/examples
Modified Files:
example-signal-recipient.c
Log Message:
2005-06-29 Colin Walters <walters at verbum.org>
* glib/dbus-gproxy.c (struct _DBusGProxy): Add new member
name_call for keeping track of any outgoing GetNameOwner call.
Also add for_owner and associated.
(struct _DBusGProxyManager): Add owner_names, which is hash table
that maps a base name to a list of names it owns (that we're
interested in). Add pending_nameowner_calls which is a list of
all outstanding GetNameOwner; avoids us having to iterate over
every proxy. Add unassociated_proxies which keeps track of name
proxies with no associated name owner.
(dbus_g_proxy_manager_unref): Destroy owner_names.
(struct DBusGProxyNameOwnerInfo): New struct for keeping track of
name refcounts.
(find_name_in_info, name_owner_foreach)
(dbus_g_proxy_manager_lookup_name_owner, insert_nameinfo)
(dbus_g_proxy_manager_monitor_name_owner)
(dbus_g_proxy_manager_unmonitor_name_owner)
(unassociate_proxies, dbus_g_proxy_manager_replace_name_owner):
New functions; they manipulate the owner_names mapping.
(got_name_owner_cb): New function.
(get_name_owner): New function, extracted from
dbus_g_proxy_new_for_name_owner.
(dbus_g_proxy_manager_register): For now we need to keep track of
all NameOwnerChanged. Also if the proxy is for a name, if we
don't already know the name owner, queue a new GetNameOwner
request and add it to our list of unassociated proxies. Otherwise
inc the refcount.
(dbus_g_proxy_manager_unregister): If this proxy is for a name,
cancel any pending GetNameOwner call, etc.
(dbus_g_proxy_manager_filter): Handle NameOwnerChanged. Also use
the owner_names mapping to look up the current names for the
signal source, and dispatch to any proxies for that name.
(dbus_g_proxy_new): Initialize new members.
(dbus_g_proxy_new_for_name): Delete unused proxy variable.
(dbus_g_proxy_new_for_name_owner): Use get_name_owner.
(dbus_g_pending_call_end_valist): New function, extracted from
dbus_g_proxy_end_call_internal. Useful when we don't have a proxy
but want to use the GLib infrastructure. Also note how many
arguments in reply were over.
(dbus_g_pending_call_end): New function, just call
dbus_g_pending_call_end_valist.
(dbus_g_proxy_end_call_internal): Just call
dbus_g_pending_call_end_valist.
* glib/dbus-gobject.c (_dbus_gobject_lookup_marshaller): Fix lookup
of builtin marshaller for STRING_STRING_STRING.
* test/glib/test-dbus-glib.c:
* test/glib/test-service-glib.c:
* test/glib/test-service-glib.xml:
Extend tests to cover name proxies, destruction of owner proxies,
etc.
* glib/examples/example-signal-recipient.c
(dbus_g_proxy_new_for_name_owner): Create a name proxy.
* tools/dbus-send.c (main): Print D-BUS error name in addition
to message.
Index: example-signal-recipient.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/examples/example-signal-recipient.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- example-signal-recipient.c 21 Jun 2005 01:18:25 -0000 1.1
+++ example-signal-recipient.c 29 Jun 2005 16:58:59 -0000 1.2
@@ -60,11 +60,10 @@
/* We use _for_name_owner in order to track this particular service
* instance, which lets us receive signals.
*/
- remote_object = dbus_g_proxy_new_for_name_owner (bus,
- "org.designfu.TestService",
- "/org/designfu/TestService/object",
- "org.designfu.TestService",
- &error);
+ remote_object = dbus_g_proxy_new_for_name (bus,
+ "org.designfu.TestService",
+ "/org/designfu/TestService/object",
+ "org.designfu.TestService");
if (!remote_object)
lose_gerror ("Failed to get name owner", error);
More information about the dbus-commit
mailing list