X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=RepoStatusPopover.vala;h=9e40c63daa556caedce44ebcf738874623731de6;hb=68b480d67843927a38e1a087aa75cdaf40daa394;hp=f7ee0b285f54860f616c6d59340d64dda9e6a995;hpb=62156312e47d7aa26cd02f40d6166b687abaed73;p=gitlive

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index f7ee0b28..9e40c63d 100644
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -581,20 +581,16 @@ public class RepoStatusPopover : Object
             // my vars (dec)
 
             // set gobject values
-            this.el.label = "Merge ticket";
+            this.el.label = "Merge branch/  ticket";
 
             //listeners
             this.el.button_press_event.connect( () => {
-               _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" });
-               _this.repo.push();
-               _this.repo.loadStatus();
-               
-                _this.diff_view.el.get_buffer().set_text(_this.repo.git_diff);
-                _this.status_view.el.get_buffer().set_text(_this.repo.git_status);
-                
+            
                _this.el.hide();
-               Clones.singleton().reposStore.load();
-               
+               Clones.singleton().el.response(-1);
+               if (_this.repo.activeTicket != null) {
+            	   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
+               }
                 return false;
             });
         }
@@ -614,7 +610,7 @@ public class RepoStatusPopover : Object
         public Xcls_Button19(RepoStatusPopover _owner )
         {
             _this = _owner;
-            this.el = new Gtk.Button();
+            this.el = new GtkButton.new_from_stock();
 
             // my vars (dec)
 
@@ -626,7 +622,7 @@ public class RepoStatusPopover : Object
               
             
             
-                Clones.singleton().el.hide();
+                  Clones.singleton().el.response(-1);
               
                _this.el.hide();
                Ticket.singleton().show( _this.repo);