diff options
| author | Colin Walters <walters@verbum.org> | 2005-06-30 18:22:10 +0000 | 
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-06-30 18:22:10 +0000 | 
| commit | 03d040311afd4b988b9a277a8aa360fa20243c92 (patch) | |
| tree | 727854d43f1bc8b3757ce198675f12751edc85c1 /glib/dbus-gmain.c | |
| parent | b3c42d226438fd0fda2db19b92944dec5e226d3f (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 'glib/dbus-gmain.c')
| -rw-r--r-- | glib/dbus-gmain.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/glib/dbus-gmain.c b/glib/dbus-gmain.c index 6d3b56c8..9d45ca0e 100644 --- a/glib/dbus-gmain.c +++ b/glib/dbus-gmain.c @@ -28,6 +28,7 @@  #include "dbus-gtest.h"  #include "dbus-gutils.h"  #include "dbus-gvalue.h" +#include "dbus-gobject.h"  #include "dbus-gvalue-utils.h"  #include <string.h> @@ -720,7 +721,7 @@ dbus_g_bus_get (DBusBusType     type,    connection = dbus_bus_get (type, &derror);    if (connection == NULL)      { -      dbus_g_error_set (error, derror.name, derror.message); +      dbus_set_g_error (error, &derror);        dbus_error_free (&derror);        return NULL;      }  | 
