dbus/dbus/dbus

johnp freedesktop-cvs-commits at pdx.freedesktop.org
Fri May 28 12:09:00 PDT 2004


CVS commit by johnp: 

* fix for TODO item:
 - the varargs dbus_message_get_args() needs to support OBJECT_PATH
   and OBJECT_PATH_ARRAY


  M +21 -0     dbus/dbus/dbus/dbus-message.c   1.130


--- dbus/dbus/dbus/dbus-message.c  #1.129:1.130
@@ -2481,4 +2481,21 @@ dbus_message_iter_get_args_valist (DBusM
           }
 
+          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:
           {
@@ -2549,4 +2566,8 @@ dbus_message_iter_get_args_valist (DBusM
                 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:





More information about the dbus-commit mailing list