2004-03-29 Michael Meeks <michael@ximian.com>

	* dbus/dbus-message.c
	(dbus_message_new_error_printf): impl.

	* dbus/dbus-connection.c
	(dbus_connection_unregister_object_path): fix warning.

	* configure.in: fix no-mono-installed situation.

diff --git a/ChangeLog b/ChangeLog
index 555b8bf02dfb1c208be6ab81f901db6cef90fb83..24bfc8a516026fa234df1f31399a80db1dd7568e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-29  Michael Meeks  <michael@ximian.com>
+
+       * dbus/dbus-message.c
+       (dbus_message_new_error_printf): impl.
+
+       * dbus/dbus-connection.c
+       (dbus_connection_unregister_object_path): fix warning.
+
+       * configure.in: fix no-mono-installed situation.
+
 2004-03-27  Havoc Pennington  <hp@redhat.com>
 
        Patch from Timo Teräs:

diff --git a/configure.in b/configure.in
index cfc1a9528ff8f1927e5ccb399ed7f88341b30e87..ab3da87be7336e44afdb4224385d66f0b8031b3d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -184,7 +184,7 @@ AM_CONDITIONAL(DBUS_USE_GCJ, test x$enable_gcj = xyes)
 AM_PROG_LIBTOOL
 
 #### Look for mono
-AC_CHECK_TOOL(MCS, mcs, mcs)
+AC_CHECK_TOOL(MCS, mcs)
 if test -z "$MCS" ; then
      have_mcs=no
 else

diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index b65b541efb238fe3e90592fd50b50862eb65b4ac..2974c596a87d607fd5057adea749455e453ced26 100644 (file)
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -3237,8 +3237,7 @@ dbus_connection_unregister_object_path (DBusConnection              *connection,
 
   CONNECTION_LOCK (connection);
 
-  return _dbus_object_tree_unregister_and_unlock (connection->objects,
-                                                  path);
+  _dbus_object_tree_unregister_and_unlock (connection->objects, path);
 }
 
 /**

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index d56cd45d50eb5506219a56cfe5e62b8c32532280..322e5d0bf839ed3a478448112b632197257c529b 100644 (file)
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -1421,6 +1421,45 @@ dbus_message_new_error (DBusMessage *reply_to,
   return message;
 }
 
+/**
+ * Creates a new message that is an error reply to a certain message.
+ * Error replies are possible in response to method calls primarily.
+ *
+ * @param reply_to the original message
+ * @param error_name the error name
+ * @param error_format the error message string to be printed
+ * @param ... value of first argument, list of additional values to print
+ * @returns a new error message
+ */
+DBusMessage*
+dbus_message_new_error_printf (DBusMessage *reply_to,
+                              const char  *error_name,
+                              const char  *error_format,
+                              ...)
+{
+  va_list args;
+  DBusString str;
+  DBusMessage *message;
+
+  if (!_dbus_string_init (&str))
+    return NULL;
+
+  va_start (args, error_format);
+
+  if (_dbus_string_append_printf_valist (&str, error_format, args))
+    message = dbus_message_new_error (reply_to, error_name,
+                                     _dbus_string_get_const_data (&str));
+  else
+    message = NULL;
+  
+  _dbus_string_free (&str);
+
+  va_end (args);
+
+  return message;
+}
+
+
 /**
  * Creates a new message that is an exact replica of the message
  * specified, except that its refcount is set to 1.

diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
index 516766985c68f54dec6f9f8f6829534a244a32a0..046cad56c82a8ecc80cff8071e9352027e882f6c 100644 (file)
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -72,6 +72,10 @@ DBusMessage* dbus_message_new_signal        (const char  *path,
 DBusMessage* dbus_message_new_error         (DBusMessage *reply_to,
                                              const char  *error_name,
                                              const char  *error_message);
+DBusMessage* dbus_message_new_error_printf  (DBusMessage *reply_to,
+                                             const char  *error_name,
+                                             const char  *error_format,
+                                            ...);
 
 DBusMessage* dbus_message_copy              (const DBusMessage *message);