X-Git-Url: http://git.roojs.org/?p=gnome.introspection-doc-generator;a=blobdiff_plain;f=jhbuild.js;h=4331ce2fd632d3313c556c89b20b8a8dfe06015a;hp=277abafcdfcf09c54b7c085a5ca9574cb7546a7f;hb=245e619d716fac0f19ec356c1200cbde712598d3;hpb=9e0a377ac9b611159377eee90f5234193c2e5989

diff --git a/jhbuild.js b/jhbuild.js
index 277abaf..4331ce2 100755
--- a/jhbuild.js
+++ b/jhbuild.js
@@ -7,12 +7,14 @@
 GLib= imports.gi.GLib;
 Gio = imports.gi.Gio;
 
-//Roo = imports['Roo.js'].Roo;
-File = imports['File.js'].File;
-console = imports['console.js'].console;
 
+File = imports.File.File;
+console = imports.console.console;
+
+Seed.include('Date.js');
  
-imports['Date.js'].load(Date);
+//DateExtra = imports.DateExtra.DateExtra;
+
  
 
 // these should come from args
@@ -152,6 +154,13 @@ var all = {
 	'vte' : 'vte',
 	'WebKit' :'WebKit',
     'gconf' : 'gconf',
+    
+    //'gtop',
+    //'panelapplet',
+    //'epiphany'
+    
+    
+    
     //'gupnp', -- needs patch
 	// 'gnome-keyring' -- ndeds patch
     // gnome-vfs -- needs patch
@@ -231,7 +240,7 @@ function spawnlog (cwd, s, outfile, errfile) {
         GLib.SpawnFlags.DO_NOT_REAP_CHILD + GLib.SpawnFlags.SEARCH_PATH , 
         null, null, ret);
         
-    var ctx = GLib.main_loop_new (null, false);
+    var ctx = new GLib.MainLoop.c_new (null, false);
     var started = false;
     
     GLib.child_watch_add(GLib.PRIORITY_DEFAULT, ret.child_pid, function(pid, status) {
@@ -240,7 +249,7 @@ function spawnlog (cwd, s, outfile, errfile) {
         retval.done = true;
         if (started) {
             console.log("Ending LOOP");
-            GLib.main_loop_quit(ctx);
+            ctx.quit();
         }
         
     });
@@ -257,15 +266,15 @@ function spawnlog (cwd, s, outfile, errfile) {
             var x = new GLib.String();
             
             
-            var cstatus = GLib.io_channel_get_buffer_condition(ch);
-            cstatus = GLib.io_channel_get_flags (ch)
+            var cstatus = ch.get_buffer_condition();
+            cstatus = ch.get_flags (ch)
             
 
             //Seed.print("WAITING INPUT?" + prop+':'+cstatus);
             //var status = GLib.io_channel_read_line_string (ch, x, null);
             
                
-            var status = GLib.io_channel_read_line_string (ch, x);
+            var status = ch.read_line_string (x);
             
             //Seed.print(prop + ":INPUT:" + status);
         
@@ -315,7 +324,7 @@ function spawnlog (cwd, s, outfile, errfile) {
     if (!retval.done) {
         started = true;
         console.log("STARTING LOOP");
-        GLib.main_loop_run(ctx, false); // wait fore exit?
+        ctx.run(); // wait fore exit?
     }
     readstr(out_ch, outfile, 'output');
     readstr(err_ch, errfile, 'error');