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

diff --git a/Introspect/NameSpace.js b/Introspect/NameSpace.js
index bb7cab2..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,7 +124,7 @@ NameSpace = {
                     continue;
             }
         }
-        
+        print ("SCAN NAMESPACE ALL DONE");
                 
         var gi = GI.Repository.get_default();
         var ver = GI.Repository.get_version(gi,ns);