sync all

diff --git a/Scm/Git/Repo.js b/Scm/Git/Repo.js
index 64326ac..a946bfe 100644 (file)
--- a/Scm/Git/Repo.js
+++ b/Scm/Git/Repo.js
@@ -22,7 +22,7 @@ Repo = XObject.define(
      *     (basically repopath is currently only critical one.)
      *
      */
-    
+     
     function(cfg) {
         // cal parent?
         XObject.extend(this,cfg);
@@ -280,12 +280,48 @@ Repo = XObject.define(
         lastupdated: function() {
             return 'tbc';
         },
-        autocommit: function() {
-            return true;
+        autocommit: function(val) {
+            if (typeof(val) == 'undefined') {
+                
+                if (File.exists(this.gitdir + '/.gitlive-disable-autocommit')) {
+                    return false;
+                }
+                
+                return true;
+            }
+            if (val == this.autocommit()) {
+                return val;
+            }
+            if (!val) { // turn off
+                File.write(this.gitdir + '/.gitlive-disable-autocommit', '.');
+            } else {
+                File.remove(this.gitdir + '/.gitlive-disable-autocommit');
+            }
+            return val;
+            
         },
         
-        autopush: function() {
-            return true;
+        
+        
+        autopush: function(val) {
+            
+            if (typeof(val) == 'undefined') {
+                
+                if (File.exists(this.gitdir + '/.gitlive-disable-autopush')) {
+                    return false;
+                }
+                
+                return true;
+            }
+            if (val == this.autocommit()) {
+                return val;
+            }
+            if (!val) { // turn off
+                File.write(this.gitdir + '/.gitlive-disable-autopush', '.');
+            } else {
+                File.remove(this.gitdir + '/.gitlive-disable-autopush');
+            }
+            return val; 
         },
           /*
         

diff --git a/StatusIcon.js b/StatusIcon.js
index ba3de83..29bf785 100644 (file)
--- a/StatusIcon.js
+++ b/StatusIcon.js
@@ -165,7 +165,7 @@ var StatusIcon  = new XObject({
                              
                           
                             imports.GitMonitor.GitMonitor.start();
-                            
+                        }   
                     }
                 },
                 {

diff --git a/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le64.cache-3 b/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le64.cache-3
index e41182d..1c1e46b 100644 (file)
Binary files a/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le64.cache-3 and b/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-le64.cache-3 differ