JsParser

diff --git a/Builder/About.js b/Builder/About.js
index ee29392..4fc46b1 100644 (file)
--- a/Builder/About.js
+++ b/Builder/About.js
@@ -8,6 +8,7 @@ GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
 GtkClutter = imports.gi.GtkClutter;
+Gdl = imports.gi.Gdl;
 console = imports.console;
 XObject = imports.XObject.XObject;
 About=new XObject({

diff --git a/Builder3/About.js b/Builder3/About.js
index 122b621..3eead26 100644 (file)
--- a/Builder3/About.js
+++ b/Builder3/About.js
@@ -7,7 +7,9 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
- console = imports.console;
+//GtkClutter = imports.gi.GtkClutter;
+//Gdl = imports.gi.Gdl;
+console = imports.console;
 XObject = imports.XObject.XObject;
 About=new XObject({
     xtype: Gtk.AboutDialog,

diff --git a/Builder3/DialogConfirm.js b/Builder3/DialogConfirm.js
index 70703ac..908bf69 100644 (file)
--- a/Builder3/DialogConfirm.js
+++ b/Builder3/DialogConfirm.js
@@ -7,6 +7,8 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
+//GtkClutter = imports.gi.GtkClutter;
+//Gdl = imports.gi.Gdl;
 console = imports.console;
 XObject = imports.XObject.XObject;
 DialogConfirm=new XObject({

diff --git a/Builder3/DialogNewComponent.js b/Builder3/DialogNewComponent.js
index 3bf308d..497674a 100644 (file)
--- a/Builder3/DialogNewComponent.js
+++ b/Builder3/DialogNewComponent.js
@@ -7,7 +7,7 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
-GtkClutter = imports.gi.GtkClutter;
+//GtkClutter = imports.gi.GtkClutter;
 console = imports.console;
 XObject = imports.XObject.XObject;
 DialogNewComponent=new XObject({

diff --git a/Builder3/DialogSaveTemplate.js b/Builder3/DialogSaveTemplate.js
index 1464e13..f697259 100644 (file)
--- a/Builder3/DialogSaveTemplate.js
+++ b/Builder3/DialogSaveTemplate.js
@@ -7,7 +7,7 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
-GtkClutter = imports.gi.GtkClutter;
+//GtkClutter = imports.gi.GtkClutter;
 console = imports.console;
 XObject = imports.XObject.XObject;
 DialogSaveTemplate=new XObject({

diff --git a/Builder3/DialogTemplateSelect.js b/Builder3/DialogTemplateSelect.js
index b7b9d72..d7270fe 100644 (file)
--- a/Builder3/DialogTemplateSelect.js
+++ b/Builder3/DialogTemplateSelect.js
@@ -7,7 +7,7 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
-GtkClutter = imports.gi.GtkClutter;
+//GtkClutter = imports.gi.GtkClutter;
 console = imports.console;
 XObject = imports.XObject.XObject;
 DialogTemplateSelect=new XObject({

diff --git a/Builder3/Editor.js b/Builder3/Editor.js
index e399f9f..18bfb09 100644 (file)
--- a/Builder3/Editor.js
+++ b/Builder3/Editor.js
@@ -7,7 +7,7 @@ GObject = imports.gi.GObject;
 GtkSource = imports.gi.GtkSource;
 WebKit = imports.gi.WebKit;
 Vte = imports.gi.Vte;
-GtkClutter = imports.gi.GtkClutter;
+//GtkClutter = imports.gi.GtkClutter;
  console = imports.console;
 XObject = imports.XObject.XObject;
 Editor=new XObject({

diff --git a/gtkrun.js b/gtkrun.js
index 88481f9..c16f5cf 100644 (file)
--- a/gtkrun.js
+++ b/gtkrun.js
@@ -31,7 +31,7 @@ GIRepository = imports.gi.GIRepository;
 GLib        = imports.gi.GLib;
 
 // we add this in, as it appears to get lost sometimes if we set it using the ENV. variable in builder.sh
-GIRepository.IRepository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.2');
+GIRepository.Repository.prepend_search_path(GLib.get_home_dir() + '/.Builder/girepository-1.2');
 //print(JSON.stringify(GIRepository.IRepository.get_search_path()));
 
 Gtk         = imports.gi.Gtk;
@@ -44,13 +44,13 @@ GtkSource   = imports.gi.GtkSource;
 WebKit      = imports.gi.WebKit;
 Vte         = imports.gi.Vte;
 
-Gdl         = imports.gi.Gdl;
+//Gdl         = imports.gi.Gdl;
 
-GtkClutter  = imports.gi.GtkClutter;
+//GtkClutter  = imports.gi.GtkClutter;
 
-if (GtkClutter) {    
-    GtkClutter.init(Seed.argv);
-}
+//if (GtkClutter) {    
+//    GtkClutter.init(Seed.argv);
+//}
 
 File    = imports.File.File;
 

diff --git a/install1.2.sh b/install1.2.sh
index 20553a6..9b253cd 100644 (file)
--- a/install1.2.sh
+++ b/install1.2.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
  
+#git clone git://github.com/roojs/gir-1.2-gtk-2.0.git gir-1.2
+
 #// compile GIR's
 mkdir -p ~/.Builder/girepository-1.2 || false
  
-ls gir-1.1 | sed s/.gir// | awk \
+ls gir-1.2 | sed s/.gir// | awk \
     '{ print "g-ir-compiler  gir-1.2/" $1 ".gir --includedir=gir-1.2 -o  ~/.Builder/girepository-1.2/" $1 ".typelib" }' \
     | sh -x