diff options
| author | Colin Walters <walters@verbum.org> | 2005-06-26 17:02:09 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-06-26 17:02:09 +0000 |
| commit | df901b528bc1e1edd96e9e91b94c9c9b795b8ffd (patch) | |
| tree | f455e436a057d8525edb4d29067674eb781331da /glib/dbus-gproxy.c | |
| parent | c904e1e3a695f8f15f098d9316ead6f0db637780 (diff) | |
2005-06-26 Colin Walters <walters@verbum.org>
* glib/dbus-glib.c (dbus_set_g_error): Delete.
(dbus_g_error_set): New public function from its ashes; used by
both service-side method implementation and GLib bindings
internals.
(dbus_g_error_has_name, dbus_g_error_get_name): New function.
(_dbus_glib_test): Add some tests.
* test/glib/test-dbus-glib.c (main): Test dbus_g_error_has_name.
* test/glib/test-service-glib.c (my_object_throw_error): Use
dbus_g_error_set.
* glib/dbus-gobject.c (gerror_to_dbus_error_message): Handle
errors thrown by dbus_g_error_set.
* glib/dbus-gmain.c (dbus_g_bus_get): Change to dbus_g_error_set.
* glib/dbus-gparser.c (validate_signature): Ditto.
* glib/dbus-gproxy.c (dbus_g_proxy_new_for_name_owner)
(dbus_g_proxy_end_call_internal): Ditto.
* glib/Makefile.am: Generate dbus-glib-error-switch.h, which
converts DBUS_ERROR_x to DBUS_GERROR_x.
(libdbus_glib_1_la_SOURCES, BUILT_SOURCES, CLEANFILES): Add it.
* doc/TODO: Remove error TODO.
* doc/dbus-tutorial.xml: Update with documentation about error
handling.
* dbus/make-dbus-glib-error-enum.sh: Tighten up regexp to make
sure we only change DBUS_ERROR to DBUS_GERROR, not all ERROR to
GERROR. Also add DBUS_GERROR_REMOTE_EXCEPTION.
Diffstat (limited to 'glib/dbus-gproxy.c')
| -rw-r--r-- | glib/dbus-gproxy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glib/dbus-gproxy.c b/glib/dbus-gproxy.c index f4fcc31f..3b13ff23 100644 --- a/glib/dbus-gproxy.c +++ b/glib/dbus-gproxy.c @@ -1135,7 +1135,7 @@ dbus_g_proxy_new_for_name_owner (DBusGConnection *connection, error: g_assert (dbus_error_is_set (&derror)); - dbus_set_g_error (error, &derror); + dbus_g_error_set (error, derror.name, derror.message); dbus_error_free (&derror); out: @@ -1469,14 +1469,14 @@ dbus_g_proxy_end_call_internal (DBusGProxy *proxy, break; case DBUS_MESSAGE_TYPE_ERROR: dbus_set_error_from_message (&derror, reply); - dbus_set_g_error (error, &derror); + dbus_g_error_set (error, derror.name, derror.message); dbus_error_free (&derror); goto out; break; default: dbus_set_error (&derror, DBUS_ERROR_FAILED, "Reply was neither a method return nor an exception"); - dbus_set_g_error (error, &derror); + dbus_g_error_set (error, derror.name, derror.message); dbus_error_free (&derror); goto out; break; |