summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2005-06-30 18:22:10 +0000
committerColin Walters <walters@verbum.org>2005-06-30 18:22:10 +0000
commit03d040311afd4b988b9a277a8aa360fa20243c92 (patch)
tree727854d43f1bc8b3757ce198675f12751edc85c1 /dbus
parentb3c42d226438fd0fda2db19b92944dec5e226d3f (diff)
2005-06-30 Colin Walters <walters@verbum.org>
* test/glib/test-dbus-glib.c: * test/glib/test-service-glib.c: * test/glib/test-service-glib.xml: Update tests for new error setting bits, also add async tests (patch from Ross Burton). * test/glib/Makefile.am (test_service_glib_LDADD): Add DBUS_GLIB_THREADS_LIBS. * glib/dbus-gproxy.c (get_name_owner) (dbus_g_pending_call_end_valist): Ditto. * glib/dbus-gobject.c (error_metadata): New mapping from GError domain (GQuark) to DBusGErrorInfo. (gerror_domaincode_to_dbus_error_name): Attempt to look up error quark in error_metadata. Take message interface as default error message interface. (gerror_to_dbus_error_message): Pass message interface. (dbus_set_g_error): Resurrected. (dbus_g_error_info_free): New function. (dbus_g_object_type_install_info): Use g_type_class_ref instead of _peek to actually create the object class if it hasn't been created yet. (dbus_g_error_domain_register): New function. * glib/dbus-gmain.c (dbus_g_bus_get): Switch to dbus_set_g_error. * glib/dbus-gparser.c (validate_signature): Ditto. * dbus/dbus-glib.h (dbus_g_error_set): Delete. (dbus_g_error_domain_register): Prototype. * glib/dbus-glib.c (dbus_g_error_set): Delete. Update tests.
Diffstat (limited to 'dbus')
-rw-r--r--dbus/dbus-glib.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/dbus/dbus-glib.h b/dbus/dbus-glib.h
index 5e791e01..41b3d9c1 100644
--- a/dbus/dbus-glib.h
+++ b/dbus/dbus-glib.h
@@ -81,9 +81,6 @@ typedef enum
#include <dbus/dbus-glib-error-enum.h>
} DBusGError;
-void dbus_g_error_set (GError **error,
- const char *name,
- const char *msg);
gboolean dbus_g_error_has_name (GError *error,
const char *name);
const char * dbus_g_error_get_name (GError *error);
@@ -126,6 +123,10 @@ struct _DBusGObjectInfo
void dbus_g_object_type_install_info (GType object_type,
const DBusGObjectInfo *info);
+void dbus_g_error_domain_register (GQuark domain,
+ const char * default_iface,
+ GType code_enum);
+
void dbus_g_connection_register_g_object (DBusGConnection *connection,
const char *at_path,
GObject *object);