summaryrefslogtreecommitdiffstats
path: root/glib/dbus-gproxy.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2003-10-21 05:46:52 +0000
committerHavoc Pennington <hp@redhat.com>2003-10-21 05:46:52 +0000
commit75742242000e782719bc1656f0a7da72b059e88e (patch)
tree6bba82481931f2cabfa36c273126dfc2af7bf410 /glib/dbus-gproxy.c
parent8a4d94fe70982690c5fe4580f906b8ca2a95c468 (diff)
2003-10-20 Havoc Pennington <hp@redhat.com>
hmm, make check is currently not passing. * doc/dbus-specification.xml: add requirement that custom type names follow the same rules as interface names. * dbus/dbus-protocol.h: change some of the byte codes, to avoid duplication and allow 'c' to be 'custom'; dict is now 'm' for 'map' * doc/dbus-specification.xml: update type codes to match dbus-protocol.h, using the ASCII byte values. Rename type NAMED to CUSTOM. Add type OBJECT_PATH to the spec. 2003-10-17 Havoc Pennington <hp@redhat.com> * bus/driver.c (create_unique_client_name): use "." as separator in base service names instead of '-' * dbus/dbus-string.c (_dbus_string_get_byte): allow getting nul byte at the end of the string * dbus/dbus-internals.h (_DBUS_LIKELY, _DBUS_UNLIKELY): add optimization macros since string validation seems to be a slow point. * doc/dbus-specification.xml: restrict valid service/interface/member/error names. Add test suite code for the name validation. * dbus/dbus-string.c: limit service/interface/member/error names to [0-9][A-Z][a-z]_ * dbus/dbus-connection.c (dbus_connection_dispatch): add missing format arg to verbose spew * glib/dbus-gproxy.c (dbus_gproxy_call_no_reply): if not out of memory, return instead of g_error * test/test-service.c (path_message_func): support emitting a signal on request * dbus/dbus-bus.c (init_connections_unlocked): only fill in activation bus type if DBUS_BUS_ACTIVATION was set; default to assuming the activation bus was the session bus so that services started manually will still register. (init_connections_unlocked): fix so that in OOM situation we get the same semantics when retrying the function * test/test-service.c (main): change to use path registration, to test those codepaths; register with DBUS_BUS_ACTIVATION rather than DBUS_BUS_SESSION
Diffstat (limited to 'glib/dbus-gproxy.c')
-rw-r--r--glib/dbus-gproxy.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c
index 90f00b25..02c53c56 100644
--- a/glib/dbus-gproxy.c
+++ b/glib/dbus-gproxy.c
@@ -377,7 +377,7 @@ gproxy_list_free (DBusGProxyList *list)
static char*
gproxy_get_match_rule (DBusGProxy *proxy)
{
- /* FIXME Some sort of escaping is required here I think */
+ /* FIXME Escaping is required here */
if (proxy->service)
return g_strdup_printf ("type='signal',sender='%s',path='%s',interface='%s'",
@@ -604,6 +604,14 @@ dbus_gproxy_manager_filter (DBusConnection *connection,
else
list = NULL;
+#if 0
+ g_print ("proxy got %s,%s,%s = list %p\n",
+ tri,
+ tri + strlen (tri) + 1,
+ tri + strlen (tri) + 1 + strlen (tri + strlen (tri) + 1) + 1,
+ list);
+#endif
+
g_free (tri);
/* Emit the signal */
@@ -1140,6 +1148,8 @@ dbus_gproxy_call_no_reply (DBusGProxy *proxy,
NULL))
goto oom;
+ return;
+
oom:
g_error ("Out of memory");
}