diff options
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/dbus-gobject.c | 4 | ||||
| -rw-r--r-- | glib/dbus-gproxy.c | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c index 6e65770f..1e13ed46 100644 --- a/glib/dbus-gobject.c +++ b/glib/dbus-gobject.c @@ -167,8 +167,8 @@ dbus_type_to_string (int type) return "double"; case DBUS_TYPE_STRING: return "string"; - case DBUS_TYPE_NAMED: - return "named"; + case DBUS_TYPE_CUSTOM: + return "custom"; case DBUS_TYPE_ARRAY: return "array"; case DBUS_TYPE_DICT: 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"); } |