X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Introspect%2FNameSpace.js;h=fa0691d0b4085c90d20ead936093f2b589fac604;hb=4d414f4d8c9e75e89a9ed99edc24d9cb305efcca;hp=bb9590e24614f637859d183dc9c85c09f6b651dc;hpb=759a6789f27c5bbec919b2057a72e43c780110ea;p=gnome.introspection-doc-generator

diff --git a/Introspect/NameSpace.js b/Introspect/NameSpace.js
index bb9590e..fa0691d 100644
--- a/Introspect/NameSpace.js
+++ b/Introspect/NameSpace.js
@@ -3,7 +3,7 @@
 GI      = imports.gi.GIRepository;
 GLib    = imports.gi.GLib;
 xml     = imports.libxml;
-
+File    = imports.File.File;
 
 XObject = imports.XObject.XObject;
 
@@ -27,29 +27,20 @@ NameSpace = {
             if (!GLib.file_test(dir, GLib.FileTest.EXISTS)) {
                 return;
             }
-            var gdir = GLib.dir_open(dir,0);
-            
-            while (true) {
-                
-                var fn = gdir.read_name ? gdir.read_name () : GLib.dir_read_name(gdir);
-           //      console.log('trying ' +  fn);
-                if (!fn) {
-                    gdir.close ? gdir.close() : GLib.dir_close(gdir);
-                    return;;
-                }
+            File.list(dir).forEach(function(fn) 
+            {
                 if (!fn.match(/.typelib$/)) {
-                    continue;
+                    return;
                 }
                 var par = fn.split('-').shift();
                  //console.log('trying ' +  par);
                 if (ret.indexOf(par) > -1) {
-                     continue;
+                     return;
                 }
                 ret.push(par);
-                
-                
-            } 
+            }); 
         }
+        
         var gi = GI.Repository.get_default();
         var pth = GI.Repository.get_search_path ();
         
@@ -88,9 +79,11 @@ NameSpace = {
         };
      
         for (var i=0; i <  GI.Repository.get_n_infos (gi,ns); i++ ) {
-            var info = GI.Repository.get_info (gi,ns, i);
-            
+            var info = GI.Repository.get_info (gi, ns, i);
+           // print("NAME: " + info.get_name());
+            //continue;
             var info_type = GI.base_info_get_type (info);
+           // print("Type: " + info_type);
             switch(info_type) {
                 case  GI.InfoType.OBJECT:
                     ret.objects.push(info.get_name());
@@ -131,10 +124,10 @@ NameSpace = {
                     continue;
             }
         }
-        
+        print ("SCAN NAMESPACE ALL DONE");
                 
         var gi = GI.Repository.get_default();
-        var ver = gi.get_version(ns);
+        var ver = GI.Repository.get_version(gi,ns);
         var pth = GI.Repository.get_search_path ();
         var gir_path = pth[0].replace(/lib\/girepository-1.0/, 'share\/gir-1.0');
        //console.log(fn);
@@ -152,9 +145,9 @@ NameSpace = {
     // called when you list the namespace
     clsGatherInterfaces : function(ns, cls)
     {
-        print("clsGatherInterfaces: " + ns + ", " + cls);
+       // print("clsGatherInterfaces: " + ns + ", " + cls);
         var gi = GI.Repository.get_default();
-        var bb = gi.find_by_name(ns, cls);
+        var bb = GI.Repository.find_by_name(gi,ns, cls);
         var fullname = ns+'.'+cls;
         this.ifaceList = this.ifaceList || { };
          
@@ -163,7 +156,7 @@ NameSpace = {
            
             var prop = GI.object_info_get_interface(bb,i);
            
-            var add =  GI.base_info_get_namespace(prop) +'.' + GI.base_info_get_name(prop);
+            var add =  prop.get_namespace() +'.' + prop.get_name();
             this.ifaceList[add] = this.ifaceList[add] || [];
             if (this.ifaceList[add].indexOf(fullname) < 0) {
                 this.ifaceList[add].push(fullname);
@@ -179,7 +172,9 @@ NameSpace = {
         
    
     doc : function(what) {
+        print ("DOC: + " +what);
         var ns = what.split('.').shift();
+        return '';
         this.commentLoad(ns);
         return typeof(this.comments[ns][what]) == 'undefined' ?  '' : this.comments[ns][what];
         
@@ -198,7 +193,7 @@ NameSpace = {
         
         console.log("LOAD DOCS: " + ns);
         var gi = GI.Repository.get_default();
-        var ver = gi.get_version(ns);
+        var ver = GI.Repository.get_version(gi,ns);
         if (!ver) {
             this.comments[ns] = {};
             return;