GitMonitor.vala

[gitlive] / GitMonitor.vala

diff --git a/GitMonitor.vala b/GitMonitor.vala
index 68cc3cb..ca9d6a9 100644 (file)
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -355,7 +355,7 @@ public class GitMonitor : Monitor
 
             var remove_files_f = new Array<GitMonitorQueue>();
             for(var ii = 0;ii < remove_files.length;ii++) {
-                if (GitMonitorQueue.indexOfAdd(add_files,  remove_files.index(ii).rm) > -1 ) {
+                if (GitMonitorQueue.indexOfAdd(add_files,  remove_files.index(ii).vname) > -1 ) {
                      continue;
                 }
                 remove_files_f.append_val(remove_files.index(ii));
@@ -413,12 +413,12 @@ public class GitMonitor : Monitor
             
             if (failure.length > 0) {
 
-                var notification = new Notify.Notification({
+                var notification = new Notify.Notification(
                     summary: "Git Live ERROR!!",
                     string.joinv("\n",failure),
                     "dialog-information"
                     
-                });
+                );
     
                 notification.set_timeout(5); // show errros for longer
                 notification.show();   
@@ -443,7 +443,7 @@ public class GitMonitor : Monitor
    
 
 
-    public void onChanged(MonitorNamePathDir src) 
+    public new void onChanged(MonitorNamePathDir src) 
     { 
         return; // always ignore this..?
         //this.parsePath(src);
@@ -455,11 +455,11 @@ public class GitMonitor : Monitor
      *  results in  git add  + git commit..
      *
      */
-    public void onChangesDoneHint(MonitorNamePathDir src)  
+    public new void onChangesDoneHint(MonitorNamePathDir src)  
     { 
         
         if (this.paused) {
-            return true;
+            return;
         }
             
 
@@ -496,10 +496,10 @@ public class GitMonitor : Monitor
  
          
     }
-    public void onDeleted(MonitorNamePathDir src) 
+    public new void onDeleted(MonitorNamePathDir src) 
    { 
         if (this.paused) {
-            return true;
+            return;
         }
         this.lastAdd = new DateTime.now(new TimeZone.local()); 
         var cmd = new GitMonitorQueue(src);
@@ -520,10 +520,10 @@ public class GitMonitor : Monitor
         this.queue.append_val(cmd);
  
     }
-    public void onCreated(MonitorNamePathDir src) {
+    public new void onCreated(MonitorNamePathDir src) {
 
         if (this.paused) {
-            return true;
+            return;
         }
         this.lastAdd = new DateTime.now(new TimeZone.local()); 
         var cmd = new GitMonitorQueue(src);
@@ -550,10 +550,10 @@ public class GitMonitor : Monitor
 
     }
 
-    public void onAttributeChanged(MonitorNamePathDir src) { 
+    public new void onAttributeChanged(MonitorNamePathDir src) { 
 
         if (this.paused) {
-            return true;
+            return;
         }
         this.lastAdd = new DateTime.now(new TimeZone.local()); 
         var cmd = new GitMonitorQueue(src);
@@ -570,8 +570,11 @@ public class GitMonitor : Monitor
     }
 
 
-   public void onMoved(MonitorNamePathDir src,MonitorNamePathDir dest)  
+   public new void onMoved(MonitorNamePathDir src,MonitorNamePathDir dest)  
     { 
+        if (this.paused) {
+            return;
+        }
         this.lastAdd = new DateTime.now(new TimeZone.local()); 
         var cmd_s = new GitMonitorQueue(src);