From 5bf53b5f51c8ff90c447fdd367630596ffde8f4a Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Wed, 1 Aug 2018 17:11:41 +0800
Subject: [PATCH] sync

---
 Spawn.vala      |  2 +-
 WindowLog.vala  | 10 +++++-----
 config1.builder |  7 ++++++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Spawn.vala b/Spawn.vala
index 704f165f..07e78e40 100644
--- a/Spawn.vala
+++ b/Spawn.vala
@@ -370,7 +370,7 @@ public class Spawn : Object
 
             }
             //print("child process done - running callback, then tidyup");
-            this.on_finished(this.result, this.output);
+            this.on_finished(this.result, this.output + (this.output.length > 0 ? "\n" : "") + this.stderr);
            // this.unref();
             this.tidyup();
             
diff --git a/WindowLog.vala b/WindowLog.vala
index 682e4c43..d63516c7 100644
--- a/WindowLog.vala
+++ b/WindowLog.vala
@@ -42,7 +42,7 @@ public class WindowLog : Object  {
                  try {
                         this.write("", "IDLE");
                 } catch (Error e) {
-                    print(e.message + "\n");
+                    GLib.debug("%s",e.message);
                 }
             }
             this.win = "";
@@ -86,7 +86,7 @@ public class WindowLog : Object  {
                 this.win=win;
             }
         } catch (Error e) {
-            print(e.message + "\n");
+            GLib.debug("%s",e.message);
         }
         
         
@@ -113,17 +113,17 @@ public class WindowLog : Object  {
           
             this.lastdir = dir;
         }
-        
+         
         var fname = now.format("/%d") + ".log";
         var path  = dir + "/" + fname;
         var time  = now.format("%H:%M:%S ");
         //print("time: " + time + "\n");
         var f = File.new_for_path(path);
-    	FileOutputStream ios = f.append_to (FileCreateFlags.NONE);
+    	var ios = f.append_to (FileCreateFlags.NONE);
 		var data_out = new DataOutputStream (ios);
 
         data_out.put_string("\n" +time + str + " "  + cmd, null);
-        print(time + str + " "  + cmd + "\n");
+        GLib.debug("%s%s %s",time , str , cmd);
         data_out.close(null);
         
 
diff --git a/config1.builder b/config1.builder
index 938e32db..b1507d79 100644
--- a/config1.builder
+++ b/config1.builder
@@ -26,7 +26,12 @@
             "..//gitlive"
         ],
         "packages" : [
-            "libcanberra"
+            "libcanberra",
+            "libwnck-3.0",
+            "gee-0.8",
+            "posix",
+            "libnotify",
+            "glib-2.0"
         ]
     }
 ]
\ No newline at end of file
-- 
2.39.2