X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=MergeBranch.vala;h=5eec33874b0a3a10d9d1cbddafc9342d0c905595;hp=1f5b245151d5dec5d5ed1b4d9fcac920959d6460;hb=refs%2Fheads%2Fwip_alan_T5632_cache_project_listing;hpb=eb1dde5c919998e69c37e5e13f793d5fbd62345f

diff --git a/MergeBranch.vala b/MergeBranch.vala
index 1f5b2451..5eec3387 100644
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -112,11 +112,6 @@ public class MergeBranch : Object
         
         	 
         });
-        this.el.show.connect( (self)  => {
-         
-        
-          //test
-        });
     }
 
     // user defined functions
@@ -128,18 +123,38 @@ public class MergeBranch : Object
     	}
     	GitMonitor.gitmonitor.stop();
     	
-        this.ticket = ticket;
-        this.repo = repo;
-        
+    	_this.el.show_all();
+    	
+    	_this.table.el.hide();
+    	_this.scrolled_window.el.hide();
+    	_this.spinner.el.show();
+    	_this.spinner.el.start();	
+    	this.el.set_keep_above(true);    
     	this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
            	GLib.debug("Loading tickets"); 
     
     
-        this.el.show_all();
-     	_this.dbmodel.loadTickets();
-     	_this.actionmodel.loadActions();
-    	_this.view.loadTicket(ticket.id);
+    	
+    	
+        this.ticket = ticket;
+        this.repo = repo;
+        
+    	
+    	Timeout.add_seconds(1, () => {
+    		
+    		// if we are not working on a ticket, then we should be able to pick one?
+    	 	_this.dbmodel.loadTickets();
+    	 	_this.actionmodel.loadActions();
+    		_this.view.loadTicket(ticket.id);
+    		_this.spinner.el.stop();
+    		_this.spinner.el.hide();	
     
+    		this.table.el.show();
+    		return false;
+    	});
+    	
+    	this.el.run();
+    	 
     }
     public class Xcls_Box2 : Object
     {