Fix some problems with GIRepository

Author: vtrlx

LuaGObject/class.lua

@@ -220,7 +220,6 @@ end
 function class.load_interface(namespace, info)
    -- Load all components of the interface.
    local interface = component.create(info, class.interface_mt)
-   interface._name = info.name
    interface._property = load_properties(info)
    interface._method = component.get_category(info.methods, load_method)
    interface._signal = component.get_category(
@@ -241,9 +240,9 @@ end
 
 function class.load_class(namespace, info)
    -- Find parent record, if available.
-   local parent = info.parent
-   if parent then
-      local ns, name = parent.namespace, parent.name
+   local parent_info, parent = info.parent
+   if parent_info then
+      local ns, name = parent_info.namespace, parent_info.name
       if ns ~= namespace._name or name ~= info.name then
 	 parent = core.repo[ns][name]
       end

LuaGObject/component.lua

@@ -63,6 +63,13 @@ function component.get_category(children, xform_value,
 	 end
       end
 
+      -- The non-numeric indices still need to be iterated on, if any exist.
+      for en, idx in pairs(index) do
+         val = xvalue(children[idx])
+         local name = not xform_name_reverse and en or xform_name_reverse(en)
+         if name then category[name] = val end
+      end
+
       -- Metatable is no longer needed, disconnect it.
       return setmetatable(category, nil)
    end

LuaGObject/gi.c

@@ -464,19 +464,8 @@ info_index (lua_State *L)
     {
       if (strcmp (prop, "flags") == 0)
 	{
-	  GParamFlags flags = gi_property_info_get_flags (GI_PROPERTY_INFO (*info));
-          lua_newtable (L);
-#define H(n1)                                           \
-	  if ((flags & G_PARAM_ ## n1) != 0)            \
-	    {				        	\
-	      lua_pushboolean (L, 1);		        \
-	      lua_setfield (L, -2, #n1);                \
-	    }
-	  H(READABLE)
-	  H(WRITABLE)
-	  H(CONSTRUCT)
-#undef H
-	  return 1;
+	  lua_pushinteger (L, gi_property_info_get_flags (GI_PROPERTY_INFO (*info)));
+          return 1;
 	}
       else if (strcmp (prop, "transfer") == 0)
 	return

LuaGObject/marshal.c

@@ -184,25 +184,21 @@ array_get_or_set_length (GITypeInfo *ti, gssize *get_length, gssize set_length,
 
       if (GI_IS_FUNCTION_INFO (ci) || GI_IS_CALLBACK_INFO (ci))
 	{
-	  GIArgInfo ai;
+	  GIArgInfo *ai;
 
 	  if (param >= gi_callable_info_get_n_args (GI_CALLABLE_INFO (ci)))
 	    return;
-	  gi_callable_info_load_arg (GI_CALLABLE_INFO (ci), param, &ai);
-	  eti = gi_arg_info_get_type_info (&ai);
-          /* Without explicitly incrementing the ref count on eti, it will be
-             made into garbage when clearing ai. */
-          gi_base_info_ref (eti);
-	  if (gi_arg_info_get_direction (&ai) == GI_DIRECTION_IN)
+	  ai = gi_callable_info_get_arg (GI_CALLABLE_INFO (ci), param);
+	  eti = gi_arg_info_get_type_info (ai);
+	  if (gi_arg_info_get_direction (ai) == GI_DIRECTION_IN)
 	    /* For input parameters, value is directly pointed to by args
 	       table element. */
 	    val = (GIArgument *) ((void **) args)[param];
 	  else
 	    /* For output arguments, args table element points to pointer
 	       to value. */
 	    val = *(GIArgument **) ((void **) args)[param];
-
-          gi_base_info_clear (&ai);
+          gi_base_info_unref (ai);
 	}
       else if (GI_IS_STRUCT_INFO (ci) || GI_IS_UNION_INFO (ci))
 	{
@@ -507,9 +503,8 @@ marshal_2lua_array (lua_State *L, GITypeInfo *ti, GIDirection dir,
 	{
           if (!gi_type_info_get_array_fixed_size (ti, (gsize *)&len))
 	    /* Length of the array is dynamic, get it from other
-	       argument. If the size isn't known ahead of time (it's -1),
-               and it isn't zero-terminated, assume 1. */
-	    len = size < 0 ? 1 : size;
+	       argument. */
+	    len = size;
 	}
     }
 

LuaGObject/override/GObject-Object.lua

@@ -279,7 +279,8 @@ function Object:_access_property(object, prop, ...)
       local gtype = Type.from_typeinfo(typeinfo)
       local marshaller = Value.find_marshaller(gtype, typeinfo,
                                                prop.transfer)
-      return marshal_property(object, prop.name, prop.flags,
+      return marshal_property(object, prop.name,
+                              repo.GObject.ParamFlags[prop.flags],
                               gtype, marshaller, ...)
    else
       -- pspec-based property