Merge lp:~midori/midori/memoryFolder into lp:midori

[Cris Dywan]

Allow :memory: as folder to make schema detection work

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/notes.vala'
--- extensions/notes.vala	2014-01-26 22:02:52 +0000
+++ extensions/notes.vala	2014-01-27 23:23:21 +0000
@@ -427,8 +427,8 @@
         }
 
         void activated (Midori.App app) {
-            string? config_path = this.get_config_dir ();
-            string? db_path = config_path != null ? GLib.Path.build_path (Path.DIR_SEPARATOR_S, config_path, "notes.db") : null;
+            string config_path = this.get_config_dir () ?? ":memory:";
+            string db_path = GLib.Path.build_path (Path.DIR_SEPARATOR_S, config_path, "notes.db");
             try {
                 database = new Midori.Database (db_path);
             } catch (Midori.DatabaseError schema_error) {
 
=== modified file 'midori/midori-database.vala'
--- midori/midori-database.vala	2014-01-26 11:33:02 +0000
+++ midori/midori-database.vala	2014-01-27 23:23:21 +0000
@@ -130,7 +130,7 @@
     public class Database : GLib.Object, GLib.Initable {
         public Sqlite.Database? db { get { return _db; } }
         protected Sqlite.Database? _db = null;
-        public string? path { get; protected set; default = ":memory:"; }
+        public string? path { get; protected set; default = null; }
 
         /*
          * A new database successfully opened for the first time.
@@ -148,14 +148,15 @@
         }
 
         public virtual bool init (GLib.Cancellable? cancellable = null) throws DatabaseError {
-            if (path == null)
-                path = ":memory:";
+            string real_path = path;
+            if (path == null || path.has_prefix (":memory:"))
+                real_path = ":memory:";
             else if (!Path.is_absolute (path))
-                path = Midori.Paths.get_config_filename_for_writing (path);
-            bool exists = Posix.access (path, Posix.F_OK) == 0;
+                real_path = Midori.Paths.get_config_filename_for_writing (path);
+            bool exists = Posix.access (real_path, Posix.F_OK) == 0;
 
-            if (Sqlite.Database.open_v2 (path, out _db) != Sqlite.OK)
-                throw new DatabaseError.OPEN ("Failed to open database %s".printf (path));
+            if (Sqlite.Database.open_v2 (real_path, out _db) != Sqlite.OK)
+                throw new DatabaseError.OPEN ("Failed to open database %s".printf (real_path));
 
             if (db.exec ("PRAGMA journal_mode = WAL; PRAGMA cache_size = 32100;") != Sqlite.OK)
                 db.exec ("PRAGMA synchronous = NORMAL; PRAGMA temp_store = MEMORY;");