← Back to branch summary

~ubuntu-branches/ubuntu/raring/gjs/raring

« back to all changes in this revision

Viewing changes to gi/arg.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-07-16 19:00:48 UTC
  • mfrom: (1.10.2)
  • Revision ID: package-import@ubuntu.com-20120716190048-b7s1o55ugfzm7tak
Tags: 1.33.4-0ubuntu1
* New upstream release.
* debian/control.in:
  - Bump minimum glib and gobject-introspection

Show diffs side-by-side

added added

removed removed

Lines of Context:
gi/arg.c
251
251
        case GI_INFO_TYPE_ENUM:
252
252
        case GI_INFO_TYPE_FLAGS:
253
253
            needs_release = FALSE;
 
254
            break;
254
255
 
255
256
        default:
256
257
            needs_release = TRUE;
1307
1308
            switch(interface_type) {
1308
1309
            case GI_INFO_TYPE_STRUCT:
1309
1310
                if (g_struct_info_is_foreign((GIStructInfo*)interface_info)) {
1310
 
                    return gjs_struct_foreign_convert_to_g_argument(
 
1311
                    JSBool ret;
 
1312
                    ret = gjs_struct_foreign_convert_to_g_argument(
1311
1313
                            context, value, interface_info, arg_name,
1312
1314
                            arg_type, transfer, may_be_null, arg);
 
1315
                    g_base_info_unref(interface_info);
 
1316
                    return ret;
1313
1317
                }
1314
1318
                /* fall through */
1315
1319
            case GI_INFO_TYPE_ENUM:
1934
1938
    GITypeTag element_type;
1935
1939
    guint i;
1936
1940
 
 
1941
    result = JS_FALSE;
 
1942
 
1937
1943
    element_type = g_type_info_get_tag(param_info);
1938
1944
 
1939
1945
    if (is_gvalue_flat_array(param_info, element_type))
2121
2127
    GITypeTag element_type;
2122
2128
    guint i;
2123
2129
 
 
2130
    result = JS_FALSE;
 
2131
 
2124
2132
    element_type = g_type_info_get_tag(param_info);
2125
2133
 
2126
2134
    /* Special case array(guint8) */
2457
2465
                goto out;
2458
2466
            } else if (interface_type == GI_INFO_TYPE_STRUCT &&
2459
2467
                       g_struct_info_is_foreign((GIStructInfo*)interface_info)) {
2460
 
                return gjs_struct_foreign_convert_from_g_argument(context, value_p, interface_info, arg);
 
2468
                JSBool ret;
 
2469
                ret = gjs_struct_foreign_convert_from_g_argument(context, value_p, interface_info, arg);
 
2470
                g_base_info_unref(interface_info);
 
2471
                return ret;
2461
2472
            }
2462
2473
 
2463
2474
            /* Everything else is a pointer type, NULL is the easy case */