sync with gnome

[gnome.introspection-doc-generator] / Introspect / Base.js

diff --git a/Introspect/Base.js b/Introspect/Base.js
index 9876fb5..4a2460e 100644 (file)
--- a/Introspect/Base.js
+++ b/Introspect/Base.js
@@ -1,15 +1,16 @@
 //<script type="text/javascript">
 //Gtk = imports.gi.Gtk;
-GI      = imports.gi.GIRepository;
-GLib    = imports.gi.GLib;
-xml     = imports.libxml;
+const GI      = imports.gi.GIRepository;
+const GLib    = imports.gi.GLib;
+//xml     = imports.libxml;
+const xml     = imports.gi.libxml2;
 //GObject = imports.gi.GObject;
 
-XObject = imports.XObject.XObject;
-console = imports.console.console;
+const XObject = imports.XObject.XObject;
+const console = imports.console.console;
 
-NameSpace = imports.NameSpace.NameSpace;
-Basic = imports.Basic.Basic;
+const NameSpace = imports.Introspect.NameSpace.NameSpace;
+const Basic     = imports.Introspect.Basic.Basic;
 
 
 
@@ -21,7 +22,7 @@ Basic = imports.Basic.Basic;
 
 
  
-Base = XObject.define(
+var Base = XObject.define(
    function(ns, name) {
         // fake should not happen?
         
@@ -55,15 +56,14 @@ Base = XObject.define(
          this.desc = NameSpace.doc(this.alias );
         
         
-        var gi = GI.IRepository.get_default();
+        var gi = GI.Repository.get_default();
         var ver = gi.get_version(ns);
-        var pth = GI.IRepository.get_search_path ();
+        var pth = GI.Repository.get_search_path ();
         var gir_path = pth[0].replace(/lib\/girepository-1.0/, 'share\/gir-1.0');
        //console.log(fn);
         this.gir_file = gir_path + '/'+ ns + '-' + ver + '.gir';
         this.gir_filename = ns + '-' + ver + '.gir';
         
-        
     }, 
     Basic, 
     {
@@ -90,7 +90,7 @@ Base = XObject.define(
         
         getBI : function()  {
             
-            var gi = GI.IRepository.get_default();
+            var gi = GI.Repository.get_default();
             return gi.find_by_name(this.ns, this.name);
         },
          // on, getwhat, simple list (name), variable to add to.
@@ -106,7 +106,8 @@ Base = XObject.define(
             var _this = this;
            //console.log("ADD " + type[0].toUpperCase() + type.substring(1));
             var clname = type[0].toUpperCase() + type.substring(1);
-            var cls = imports[clname][clname];
+            //var cls = imports[clname][clname];
+            var cls = imports.Introspect[clname][clname];
             if (!cls) {
                 console.log("COULD NOT FIND Introspect: " + type[0].toUpperCase() + type.substring(1));
                }