[libpeas] Fix inout arguments in GJS loader

[Garrett Regier <gregier src gnome org>]

commit 608ef91d47e0efdf0129b3aa8804012a13ff611b
Author: Garrett Regier <alias301 gmail com>
Date:   Sun Jun 12 02:39:12 2011 -0700

    Fix inout arguments in GJS loader

 loaders/gjs/peas-extension-gjs.c |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/loaders/gjs/peas-extension-gjs.c b/loaders/gjs/peas-extension-gjs.c
index d37ce32..6e5c376 100644
--- a/loaders/gjs/peas-extension-gjs.c
+++ b/loaders/gjs/peas-extension-gjs.c
@@ -250,7 +250,7 @@ peas_extension_gjs_call (PeasExtension *exten,
       g_arg_info_load_type (&arg_cache[cached_args].arg_info,
                             &arg_cache[cached_args].type_info);
 
-      if ((direction == GI_DIRECTION_IN || direction == GI_DIRECTION_INOUT) &&
+      if (direction == GI_DIRECTION_IN &&
           !gjs_value_from_g_argument (gexten->js_context, &js_args[n_in_args++],
                                       &arg_cache[cached_args].type_info,
                                       &args[i]))
@@ -260,6 +260,22 @@ peas_extension_gjs_call (PeasExtension *exten,
           goto out;
         }
 
+      if (direction == GI_DIRECTION_INOUT)
+        {
+          GIArgument arg;
+          
+          peas_gi_pointer_to_argument (&arg_cache[cached_args].type_info,
+                                       args[i].v_pointer, &arg);
+
+          if (!gjs_value_from_g_argument (gexten->js_context, &js_args[n_in_args++],
+                                          &arg_cache[cached_args].type_info, &arg))
+            {
+              g_warning ("Error failed to convert argument '%s'",
+                         g_base_info_get_name (&arg_cache[cached_args].arg_info));
+              goto out;
+            }
+        }
+
       if (direction == GI_DIRECTION_OUT || direction == GI_DIRECTION_INOUT)
         {
           ++n_out_args;
@@ -317,7 +333,7 @@ peas_extension_gjs_call (PeasExtension *exten,
     }
 
   /* Set out arguments */
-  for (i = 0, nth_out_arg = 0; i < cached_args && success; ++i, ++nth_out_arg)
+  for (i = 0, nth_out_arg = 0; i < cached_args && success; ++i)
     {
       gboolean is_return_value;
 
@@ -346,7 +362,8 @@ peas_extension_gjs_call (PeasExtension *exten,
           jsval js_value;
 
           if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval),
-                              nth_out_arg, &js_value))
+                              nth_out_arg++, &js_value) ||
+              js_value == JSVAL_VOID)
             {
               g_warning ("Error failed to get out argument %i", nth_out_arg);
               success = FALSE;