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.

1 files changed, 2 insertions, 43 deletions

diff --git a/glib/dbus-glib.c b/glib/dbus-glib.c
index 3153deef..5b30ce7a 100644
--- a/glib/dbus-glib.c
+++ b/glib/dbus-glib.c
@@ -26,6 +26,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include "dbus-gtest.h"
 #include "dbus-gutils.h"
+#include "dbus-gobject.h"
 #include <string.h>
 
 #include <libintl.h>
@@ -149,41 +150,6 @@ dbus_g_error_quark (void)
   return quark;
 }
 
-#include "dbus-glib-error-switch.h"
-
-/**
- * Set a GError return location from a D-BUS error name and message.
- * This function should only be used in the implementation of service
- * methods.
- *
- * @param gerror location to store a GError, or #NULL
- * @param name the D-BUS error name
- * @param msg the D-BUS error detailed message
- */
-void
-dbus_g_error_set (GError    **gerror,
-                  const char *name,
-		  const char *msg)
-{
-  int code;
-  g_return_if_fail (name != NULL);
-  g_return_if_fail (msg != NULL);
-
-  code = dbus_error_to_gerror_code (name);
-  if (code == DBUS_GERROR_REMOTE_EXCEPTION)
-    g_set_error (gerror, DBUS_GERROR,
-		 code,
-		 "%s%c%s",
-		 msg,
-		 '\0',
-		 name);
-  else
-    g_set_error (gerror, DBUS_GERROR,
-		 code,
-		 "%s",
-		 msg);
-}
-
 /**
  * Determine whether D-BUS error name for a remote exception matches
  * the given name.  This function is intended to be invoked on a
@@ -463,7 +429,7 @@ _dbus_glib_test (const char *test_data_dir)
   dbus_error_init (&err);
   dbus_set_error_const (&err, DBUS_ERROR_NO_MEMORY, "Out of memory!");
 
-  dbus_g_error_set (&gerror, err.name, err.message);
+  dbus_set_g_error (&gerror, &err);
   g_assert (gerror != NULL);
   g_assert (gerror->domain == DBUS_GERROR);
   g_assert (gerror->code == DBUS_GERROR_NO_MEMORY);
@@ -472,13 +438,6 @@ _dbus_glib_test (const char *test_data_dir)
   dbus_error_init (&err);
   g_clear_error (&gerror);
 
-  dbus_g_error_set (&gerror, "com.example.Foo.BlahFailed", "blah failed");
-  g_assert (gerror != NULL);
-  g_assert (gerror->domain == DBUS_GERROR);
-  g_assert (gerror->code == DBUS_GERROR_REMOTE_EXCEPTION);
-  g_assert (dbus_g_error_has_name (gerror, "com.example.Foo.BlahFailed"));
-  g_assert (!strcmp (gerror->message, "blah failed"));
-
   return TRUE;
 }