From 0153f97b879002d9bea6d745901eacdd2f60bf1e Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Wed, 16 Jul 2014 13:39:07 +0800
Subject: [PATCH] sync

---
 GitMonitor.vala |  6 +++++-
 WindowLog.vala  | 14 ++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/GitMonitor.vala b/GitMonitor.vala
index be5fb293..e7e1ec36 100644
--- a/GitMonitor.vala
+++ b/GitMonitor.vala
@@ -18,7 +18,7 @@ public class GitMonitorQueue : MonitorNamePathDir {
  
             this.message = "";
             this.commit_all = false;
-  
+            
             var vpath_ar = this.dir.substring(GitMonitor.gitlive.length +1).split("/", 0);
             
             if (vpath_ar[0].length < 1) {
@@ -596,6 +596,10 @@ public class GitMonitor : Monitor
         if (this.paused) {
             return;
         }
+        if (src.dir == GitMonitor.gitlive) {
+           return; // attribute on top level..
+        }
+        
         this.lastAdd = new DateTime.now(new TimeZone.local()); 
         var cmd = new GitMonitorQueue(src);
         if (cmd.shouldIgnore()) {
diff --git a/WindowLog.vala b/WindowLog.vala
index a6ccbe8e..682e4c43 100644
--- a/WindowLog.vala
+++ b/WindowLog.vala
@@ -24,9 +24,7 @@ public class WindowLog : Object  {
             return this.getStatus();
         } );
         //Roo.log("Windowlog start");
-        this.screen.active_window_changed.connect((pr_win) => {
-            this.windowChanged();
-        });
+        this.screen.active_window_changed.connect( this.windowChanged );
     }
     
     
@@ -53,7 +51,7 @@ public class WindowLog : Object  {
         return true;
     }
 
-    public void windowChanged()
+    public void windowChanged(Wnck.Window? pr_win)
     {
         this.screen.force_update();
        // print("window changeD");
@@ -69,7 +67,7 @@ public class WindowLog : Object  {
                     //var cmd = File.realpath('/proc/'+ pid + '/exe');
             string cmd = "";
              
-            print("/proc/%u/cmdline".printf(pid) + "\n");
+           // print("/proc/%u/cmdline".printf(pid) + "\n");
 
             if (pid > 0 ) { 
                 var cf = File.new_for_path("/proc/%u/cmdline".printf(pid));
@@ -80,7 +78,7 @@ public class WindowLog : Object  {
                 cmd = "UNKNOWN";
             } 
             //  has it changed?
-            print(this.win +"\n" + cmd + "\n");
+            //print(this.win +"\n" + cmd + "\n");
             if (this.win.length < 1 || (win != this.win)) { 
         
                 //print((xDate.newDate()).format("Y-m-d H:i:s") + " " + win + ' - '+ cmd );
@@ -102,7 +100,7 @@ public class WindowLog : Object  {
         var now = new DateTime.now(new TimeZone.local()); 
 
         var dir =  this.outdir + now.format("/%Y/%m");
-        print(dir + "\n");
+        //print(dir + "\n");
 
 
         if (this.lastdir.length < 1 || this.lastdir != dir) {
@@ -119,7 +117,7 @@ public class WindowLog : Object  {
         var fname = now.format("/%d") + ".log";
         var path  = dir + "/" + fname;
         var time  = now.format("%H:%M:%S ");
-        print("time: " + time + "\n");
+        //print("time: " + time + "\n");
         var f = File.new_for_path(path);
     	FileOutputStream ios = f.append_to (FileCreateFlags.NONE);
 		var data_out = new DataOutputStream (ios);
-- 
2.39.2