Merge lp:~darcy-develin/scratch/upstream-fix-1038291 into lp:~elementary-apps/scratch/scratch

[Darcy Luís Neves Brás da Silva]

fixes bug #1038291, and cleanup can_write function to,
        enforce control flow trough writable variable,
        allow writting on first edit files that don't
        exist.
        PS: filename == null is being allowed because
        the program still relies on this, needs fixing

=== modified file 'src/Services/Document.vala'
--- src/Services/Document.vala	2012-08-04 08:49:40 +0000
+++ src/Services/Document.vala	2012-09-14 19:24:31 +0000
@@ -83,7 +83,6 @@
                     return DocumentStates.NORMAL;
                 else
                     return DocumentStates.READONLY;
-                return _state;
             }
         }
 
@@ -406,8 +405,8 @@
                     modified = false;
                     opening = false;
                     tab.text_view.modified = false;
+                    timeout_saving = -1;
                     return false;
-                    timeout_saving = -1;
                 });
             }
             else {
@@ -718,33 +717,36 @@
         
         public bool can_write () {
             
-            if (filename != null) {
-
-                FileInfo info;
-                bool writable;
-
-                try {
-
-                    info = file.query_info (FileAttribute.ACCESS_CAN_WRITE, FileQueryInfoFlags.NONE, null);
-                    writable = info.get_attribute_boolean (FileAttribute.ACCESS_CAN_WRITE);
-
-                    return writable;
-
-                } catch (Error e) {
-
-                    warning ("%s", e.message);
-                    return false;
-
+            FileInfo info;
+            //false by default, this way state always flow trough writable
+            bool writable = false;
+            
+            //this is flood logic, a null filename should be an error, but since
+            //the rest of the program relies on this assumption, it will be allowed
+            //for now
+            if (filename == null) {
+                debug ("filename is set to null, assuming it's a new file");
+                return writable = true;
+            }
+            
+            try {
+                info = file.query_info(FileAttribute.ACCESS_CAN_WRITE, FileQueryInfoFlags.NONE, null);
+                writable = info.get_attribute_boolean(FileAttribute.ACCESS_CAN_WRITE);
+                return writable;
+            } catch (Error e) {
+                
+                if (filename != null ) {
+                    warning ("query_info failed, but filename appears to be correct, allowing as new file");
+                    writable = true;
                 }
-
-            } else {
-
-                return true;
-
+                
+                return writable;
+                
             }
-
         }
 
+    
+
     }
 
 }