notes/brainstorming.txt

[app.Builder.js] / gtkrun.js

diff --git a/gtkrun.js b/gtkrun.js
index fc8a962..42d3701 100644 (file)
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -43,20 +43,16 @@ GObject     = imports.gi.GObject;
 GtkSource   = imports.gi.GtkSource;
 WebKit      = imports.gi.WebKit;
 Vte         = imports.gi.Vte;
-
+ 
 //Gdl         = imports.gi.Gdl;
 
 //GtkClutter  = imports.gi.GtkClutter;
 
-<<<<<<< HEAD
-//if (GtkClutter) {    
-//    GtkClutter.init(Seed.argv);
-//}
-=======
+
 if (typeof(GtkClutter) != 'undefined') {    
     GtkClutter.init(Seed.argv);
 }
->>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
+
 
 File    = imports.File.File;
 
@@ -84,9 +80,14 @@ files.forEach(function(f) {
             olist.push(imports[js]);
             return;
         }
-        
+        // Compiling BJS is depreciated..
+        olist.push(imports[js]);
+        return;
         
     }
+    
+    return;
+    
     var gtkbuilder =  new imports.Builder.Provider.File.Gtk.Gtk({ path : fp });
     gtkbuilder.loadItems(function() { });
     XObject.log("COMPILING" + js);