[pygobject/invoke-rewrite] [gi-invoke-ng] fix array element offset calculations

[John Palmieri <johnp src gnome org>]

commit e32c2be53175014399d89e1e85c9afc6e53c94be
Author: John (J5) Palmieri <johnp redhat com>
Date:   Fri Jun 17 11:32:28 2011 -0400

    [gi-invoke-ng] fix array element offset calculations
    
    * use pointer arithmetic to calculate based on element size instead of
      relying on the size of GIArgument
    * special case GPtrArrays

 gi/pygi-marshal.c |   27 +++++++++------------------
 1 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/gi/pygi-marshal.c b/gi/pygi-marshal.c
index 22682b8..50f3641 100644
--- a/gi/pygi-marshal.c
+++ b/gi/pygi-marshal.c
@@ -1639,7 +1639,7 @@ _pygi_marshal_out_array (PyGIInvokeState   *state,
             py_obj = PyList_New (0);
         } else {
             int i;
-            gboolean is_struct;
+
             gsize item_size;
             PyGIMarshalOutFunc item_out_marshaller;
             PyGIArgCache *item_arg_cache;
@@ -1651,33 +1651,24 @@ _pygi_marshal_out_array (PyGIInvokeState   *state,
 
             item_arg_cache = seq_cache->item_cache;
             item_out_marshaller = item_arg_cache->out_marshaller;
-            is_struct = FALSE;
-            if (item_arg_cache->type_tag == GI_TYPE_TAG_INTERFACE) {
-                PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)item_arg_cache;
-                switch (g_base_info_get_type (iface_cache->interface_info)) {
-                    case GI_INFO_TYPE_STRUCT:
-                    case GI_INFO_TYPE_BOXED:
-                        is_struct = TRUE;
-                    default:
-                        break;
-                }
-            }
 
             item_size = g_array_get_element_size (array_);
+
             for (i = 0; i < array_->len; i++) {
                 GIArgument item_arg;
                 PyObject *py_item;
 
-                if (is_struct) {
-                    item_arg.v_pointer = &_g_array_index (array_, GIArgument, i);
-                } else {
-                    memcpy (&item_arg, &_g_array_index (array_, GIArgument, i), item_size);
-                }
+                if (seq_cache->array_type == GI_ARRAY_TYPE_PTR_ARRAY)
+                    item_arg.v_pointer = g_ptr_array_index ( ( GPtrArray *)array_, i);
+                else if (item_arg_cache->type_tag == GI_TYPE_TAG_INTERFACE)
+                    item_arg.v_pointer = array_->data + i * item_size;
+                else
+                    memcpy (&item_arg, array_->data + i * item_size, item_size);
 
                 py_item = item_out_marshaller ( state,
                                                 callable_cache,
                                                 item_arg_cache,
-                                               &item_arg);
+                                                &item_arg);
 
                 if (py_item == NULL) {
                     Py_CLEAR (py_obj);