Merge branch 'master' into wip_alan_T5615_gitlive_force_all_roojs_projects

[gitlive] / RepoStatusPopover.vala

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index c8974e3..d48f618 100644 (file)
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -212,7 +212,7 @@ public class RepoStatusPopover : Object
                 Clones.singleton().reposStore.load();
               
                _this.el.hide();
-                return false;
+                 
             });
         }
 
@@ -242,6 +242,8 @@ public class RepoStatusPopover : Object
 
             //listeners
             this.el.clicked.connect( () => {
+               _this.el.hide();
+                GitMonitor.gitmonitor.stop();
                _this.repo.git({ "commit" , "-a" ,"-m", "Uncommited changes synced" });
                _this.repo.push();
                _this.repo.loadStatus();
@@ -249,10 +251,10 @@ public class RepoStatusPopover : Object
                 _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();
-               
-                return false;
+                GitMonitor.gitmonitor.start();
+                
             });
         }
 
@@ -293,7 +295,7 @@ public class RepoStatusPopover : Object
                 Clones.singleton().reposStore.load();
               
                _this.el.hide();
-                return false;
+             
             });
         }
 
@@ -334,7 +336,7 @@ public class RepoStatusPopover : Object
                 Clones.singleton().reposStore.load();
               
                _this.el.hide();
-                return false;
+                
             });
         }
 
@@ -665,7 +667,7 @@ public class RepoStatusPopover : Object
                Clones.singleton().el.response(-1);
                NewBranch.singleton().show(_this.repo, oldq);
             
-                return false;
+                
             });
         }
 
@@ -701,7 +703,7 @@ public class RepoStatusPopover : Object
                if (_this.repo.activeTicket != null) {
                   MergeBranch.singleton().show(_this.repo.activeTicket, null);   
                }
-                return ;
+             
             });
         }
 
@@ -737,8 +739,7 @@ public class RepoStatusPopover : Object
               
                _this.el.hide();
                Ticket.singleton().show( _this.repo);
-               
-                return false;
+                
             });
         }