Merge branch 'master' of http://git.roojs.com:8081/app.Builder.js

diff --combined tests/ValaTest.vala
index a3bf262,19eaae7..3ecc9ad
--- 1/tests/ValaTest.vala
--- 2/tests/ValaTest.vala
+++ b/tests/ValaTest.vala
@@@ -7,36 -7,18 +7,37 @@@
  int main (string[] args) {
        Gtk.init (ref args);
        //GtkClutter.init (ref args);
+       var app =  Builder4.Application.singleton();
        new JsRender.Lang_Class();
        GLib.Log.set_always_fatal(LogLevelFlags.LEVEL_ERROR | LogLevelFlags.LEVEL_CRITICAL);
  
  
 -      //var g = Palete.Gir.factory("Gtk");
 -      //var test = g.classes.get("Label");
        
 +      Project.Project.loadAll();
 +      var p = Project.Project.getProject("BuilderTest");
 +      p.scanDirs();
 +      var ar = p.sortedFiles();
 +      var iter = ar.list_iterator();
 +      while (iter.next()) {
 +              var f= iter.get();
 +              f.loadItems();
 +              var nv = new JsRender.NodeToVala( f.tree, 0, null);
 +              print("\n%s\n",nv.munge());
 +              return 0;
 +      }
 +    
 +      
 +      return 0;
 +}
 +
 +
 +void testGir() {
 +
 +
        var test = Palete.Gir.factoryFqn("Gtk.Label.new");
        if (test == null) {
                print("could not find Gtk.Label.new\n");
 -              return 0;
 +              return;
        }
  
        
@@@ -48,5 -30,19 +49,5 @@@
        generator.pretty = true;
      
        print(generator.to_data(null));
 -      return 0;
 -
        
 -      Project.Project.loadAll();
 -      var p = Project.Project.getProject("BuilderTest");
 -      p.scanDirs();
 -      var ar = p.sortedFiles();
 -      var iter = ar.list_iterator();
 -      while (iter.next()) {
 -              var f= iter.get();
 -              f.save();
 -      } 
 -    
 -      
 -      return 0;
 -}
 +}