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;
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) {
+<<<<<<< HEAD
+//if (GtkClutter) {
+// GtkClutter.init(Seed.argv);
+//}
+=======
+if (typeof(GtkClutter) != 'undefined') {
GtkClutter.init(Seed.argv);
}
+>>>>>>> 3b915ee311c6c2f49cc4f64e158b8f1c6fc7de4b
File = imports.File.File;