WindowLog.js

[gitlive] / test_merger.js

diff --git a/test_merger.js b/test_merger.js
index 7a494ed..e04bbd3 100644 (file)
--- a/test_merger.js
+++ b/test_merger.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,8 @@ GtkSource   = imports.gi.GtkSource;
 WebKit      = imports.gi.WebKit;
 Vte         = imports.gi.Vte;
 
-Gdl         = imports.gi.Gdl;
-
-GtkClutter  = imports.gi.GtkClutter;
-
-if (GtkClutter) {    
-    GtkClutter.init(Seed.argv);
-}
+ 
+ 
 
 File    = imports.File.File;
 
@@ -61,12 +56,14 @@ Gtk.init(Seed.argv);
 
 imports.searchPath.push('/'); // allow global paths..
 // error checking todo..
- 
-var ret = imports.FixBug.FixBug.show();
+ var ret = imports.Clones.Clones.show();
+ //imports.Merger.Merger.repo = new imports.Scm.Git.Repo.Repo('/home/alan/gitlive/roojs1');
+var ret = imports.Merger.Merger.show();
+
 print("show returned\n");
 print(JSON.stringify(ret,null, 4));
 
 
            
-Gtk.main();
+//Gtk.main();