* fix for TODO item:

 - the varargs dbus_message_get_args() needs to support OBJECT_PATH
   and OBJECT_PATH_ARRAY

diff --git a/ChangeLog b/ChangeLog
index 178fcb65cba71d573e38b52404fa4894d5c6e4e0..75590b0b1f58211e38814c960c6bad391fda49fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-28  John (J5) Palmieri  <johnp@redhat.com>
+
+       * dbus/dbus-message.c (dbus_message_get_args): Added support for
+       OBJECT_PATH and OBJECT_PATH_ARRAY
+
 2004-05-28  Seth Nickell  <seth@gnome.org>
 
        * python/examples/Makefile.am:

diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
index 9fa19668106f810f7fd0595c0d1bc9d8e6c68959..feeebf0f73e4b5e292a603d2ebd8a1cc0f441d7a 100644 (file)
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -2480,6 +2480,23 @@ dbus_message_iter_get_args_valist (DBusMessageIter *iter,
            break;
          }
 
+         case DBUS_TYPE_OBJECT_PATH:
+         {
+           char **ptr;
+
+           ptr = va_arg (var_args, char **);
+
+           *ptr = dbus_message_iter_get_object_path (iter);
+
+           if (!*ptr)
+             {
+               dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
+               goto out;
+             }
+
+           break;
+         }
+
        case DBUS_TYPE_CUSTOM:
          {
            char **name;
@@ -2548,6 +2565,10 @@ dbus_message_iter_get_args_valist (DBusMessageIter *iter,
              case DBUS_TYPE_STRING:
                err = !dbus_message_iter_get_string_array (iter, (char ***)data, len);
                break;
+             case DBUS_TYPE_OBJECT_PATH:
+               err = !dbus_message_iter_get_object_path_array (iter, (char ***)data, len);
+               break;
+
              case DBUS_TYPE_NIL:
              case DBUS_TYPE_ARRAY:
              case DBUS_TYPE_CUSTOM:

diff --git a/doc/TODO b/doc/TODO
index 799f5b7c2fa820c22fc40022a8d22da9eecc504b..9be577a6b88f451d198378ba8fe77f9607fa1f63 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -107,9 +107,6 @@
    (though they are kind of a pita to pass in as size_t with the 
     varargs, so maybe not - what does glib do with g_object_get()?)
 
- - the varargs dbus_message_get_args() needs to support OBJECT_PATH 
-   and OBJECT_PATH_ARRAY
-
  - recursive dispatch, see dbus_connection_dispatch()
 
  - Perhaps the auth protocol should be able to negotiate a protocol