Merge branch 'feature/upstream' into develop

1 files changed, 2 insertions, 3 deletions

diff --git a/src/Debug.vala b/src/Debug.vala
index f159b0d..799a94f 100644
--- a/src/Debug.vala
+++ b/src/Debug.vala
@@ -33,7 +33,7 @@ namespace Debug {
         
         string log_file_error_msg = null;
         
-        // logging to disk is currently off for viewer more; see http://trac.yorba.org/ticket/2078
+        // logging to disk is currently off for viewer more; see https://bugzilla.gnome.org/show_bug.cgi?id=716474
         File? log_file = (log_app_version_prefix == LIBRARY_PREFIX) ? AppDirs.get_log_file() : null;
         if(log_file != null) {
             File log_dir = log_file.get_parent();
@@ -104,11 +104,10 @@ namespace Debug {
     }
     
     private void log(FileStream stream, string prefix, string message) {
-        time_t now = time_t();
         stream.printf("%s %d %s [%s] %s\n",
             log_app_version_prefix,
             Posix.getpid(),
-            Time.local(now).to_string(),
+            new DateTime.now_local().format("%F %T"),
             prefix,
             message
         );