X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=Introspect%2FBasic.js;h=e9955f88ca241b008a0469feda29756c6fe961b4;hp=50f58b9e748bed22b9015c4e3761b76660612915;hb=58377493088e4462b69119eeeb92e647246cfeb2;hpb=7da9b103ee026e6b16a1aae9fb819a3f52ce3df4 diff --git a/Introspect/Basic.js b/Introspect/Basic.js index 50f58b9..e9955f8 100644 --- a/Introspect/Basic.js +++ b/Introspect/Basic.js @@ -32,7 +32,7 @@ Basic = XObject.define( // array of what!?!? var param_type = GI.type_info_get_param_type (type_info, 0); var atype = GI.type_info_get_tag(param_type); - if (atype == GI.ITypeTag.UINT8) { + if (atype == GI.TypeTag.UINT8) { return 'utf8'; } @@ -43,18 +43,20 @@ Basic = XObject.define( return ty; } var interface_info = GI.type_info_get_interface (type_info); - var interface_type = GI.base_info_get_type (interface_info); - if (interface_type == GI.IInfoType.CALLBACK) { + var interface_type = GI.base_info_get_type ? + GI.base_info_get_type (interface_info) : interface_info.get_type() ; + + if (interface_type == GI.InfoType.CALLBACK) { // callback.. var Callback = imports.Callback.Callback ; var ret= new Callback(interface_info, this, false, false); - ret.alias = GI.base_info_get_namespace(interface_info) + '.' + GI.base_info_get_name(interface_info); + ret.alias = interface_info.get_namespace() + '.' + interface_info.get_name(); return ret; } - return GI.base_info_get_namespace(interface_info) + '.' + GI.base_info_get_name(interface_info); + return interface_info.get_namespace() + '.' + interface_info.get_name(); }, @@ -86,12 +88,12 @@ Basic = XObject.define( var direction = this.directions[GI.arg_info_get_direction(arg)]; var add = { - name : GI.base_info_get_name(arg), - ns : GI.base_info_get_namespace(arg), + name : arg.get_name(), + ns : arg.get_namespace(), type : this.typeToName(GI.arg_info_get_type(arg)), direction : direction, be_null : GI.arg_info_may_be_null(arg) || GI.arg_info_is_optional(arg), - desc : GI.base_info_get_attribute(arg, 'doc') || '' + desc : arg.get_attribute('doc') || '' };