Use g_file_test check instead as it works for both platforms

8 files changed, 17 insertions, 37 deletions

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 17b3889f..1bd6e6e9 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -648,7 +648,7 @@ midori_app_get_crashed (MidoriApp* app)
         /* We test for the presence of a dummy file which is created once
            and deleted during normal runtime, but persists in case of a crash. */
         gchar* config_file = midori_paths_get_config_filename_for_writing ("running");
-        gboolean crashed = midori_paths_check_file_exists (config_file);
+        gboolean crashed = g_file_test (config_file, G_FILE_TEST_EXISTS);
         if (!crashed)
             g_file_set_contents (config_file, "RUNNING", -1, NULL);
         g_free (config_file);
diff --git a/midori/midori-array.c b/midori/midori-array.c
index ebffc456..2a661c19 100644
--- a/midori/midori-array.c
+++ b/midori/midori-array.c
@@ -515,25 +515,6 @@ katze_array_from_opera_file (KatzeArray* array,
     return TRUE;
 }
 
-gboolean check_file_exists (const gchar* path)
-{
-    gboolean file_exists = false;
-#if defined(G_OS_UNIX)
-    if (g_access (path, F_OK) == 0)
-        file_exists = true;
-#else
-    GFile* file = g_file_new_for_path (path);
-    GFileInfo* info  = g_file_query_info (file, "access::can-read", G_FILE_QUERY_INFO_NONE, NULL, NULL);
-    if (g_file_query_exists (file, NULL) || g_file_info_get_attribute_boolean (info, "access::can-read"))
-        file_exists = true;
-    
-    g_object_unref (file);
-    g_object_unref (info);
-#endif
-
-    return file_exists;    
-}
-
 /**
  * midori_array_from_file:
  * @array: a #KatzeArray
@@ -560,8 +541,7 @@ midori_array_from_file (KatzeArray*  array,
     g_return_val_if_fail (filename != NULL, FALSE);
     g_return_val_if_fail (!error || !*error, FALSE);
 
-    // FIXME: why whe cannot re-use midori_paths here?
-    if (!check_file_exists (filename))
+    if (!g_file_test (filename, G_FILE_TEST_EXISTS))
     {
         /* File doesn't exist */
         if (error)
diff --git a/midori/midori-bookmarksdatabase.vala b/midori/midori-bookmarksdatabase.vala
index 7bd1cd40..95dec9b7 100644
--- a/midori/midori-bookmarksdatabase.vala
+++ b/midori/midori-bookmarksdatabase.vala
@@ -24,9 +24,9 @@ namespace Midori {
             string olddbfile = dbfile + ".old";
             string dbfile_v2 = Paths.get_config_filename_for_reading ("bookmarks_v2.db");
 
-            if (Midori.Paths.check_file_exists (dbfile_v2)) {
-                if (Midori.Paths.check_file_exists (dbfile)) {
-                    if (Midori.Paths.check_file_exists (olddbfile))
+            if (GLib.FileUtils.test (dbfile_v2, GLib.FileTest.EXISTS)) {
+                if (GLib.FileUtils.test (dbfile, GLib.FileTest.EXISTS)) {
+                    if (GLib.FileUtils.test (olddbfile, GLib.FileTest.EXISTS))
                         Posix.unlink (olddbfile);
                     GLib.FileUtils.rename (dbfile, olddbfile);
                 }
@@ -48,7 +48,7 @@ namespace Midori {
                 }
 
                 _db = null;
-            } else if (Midori.Paths.check_file_exists (dbfile)) {
+            } else if (GLib.FileUtils.test (dbfile, GLib.FileTest.EXISTS)) {
 
                 if (Sqlite.Database.open_v2 (dbfile, out _db) != Sqlite.OK)
                     throw new DatabaseError.OPEN ("Failed to open database %s".printf (path));
@@ -63,7 +63,7 @@ namespace Midori {
                 _db = null;
                 
                 if (user_version == 0) {
-                    if (Midori.Paths.check_file_exists (olddbfile))
+                    if (GLib.FileUtils.test (olddbfile, GLib.FileTest.EXISTS))
                         Posix.unlink (olddbfile);
 
                     GLib.FileUtils.rename (dbfile, olddbfile);
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 7902674f..8b4a4390 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4584,7 +4584,7 @@ _action_bookmarks_import_activate (GtkAction*     action,
                 while ((name = g_dir_read_name (dir)))
                 {
                     gchar* file = g_build_filename (path, name, parts[1], NULL);
-                    if (midori_paths_check_file_exists (file))
+                    if (g_file_test (file, G_FILE_TEST_EXISTS))
                     {
                         /* If name is XYZ.Name, we use Name only */
                         gchar* real_name = strchr (name, '.');
@@ -4607,7 +4607,7 @@ _action_bookmarks_import_activate (GtkAction*     action,
         }
 
         path = g_build_filename (home_dir, location, NULL);
-        if (midori_paths_check_file_exists (path))
+        if (g_file_test (path, G_FILE_TEST_EXISTS))
             gtk_list_store_insert_with_values (model, NULL, G_MAXINT,
                 0, _(client), 1, bookmark_clients[i].icon,
                 2, path, 3, icon_width, -1);
@@ -4889,7 +4889,7 @@ midori_browser_get_docs (gboolean error)
     return uri;
     #else
     gchar* path = midori_paths_get_res_filename ("faq.html");
-    gboolean found = midori_paths_check_file_exists (path);
+    gboolean found = g_file_test (path, G_FILE_TEST_EXISTS);
     if (found)
     {
         gchar* uri = g_filename_to_uri (path, NULL, NULL);
diff --git a/midori/midori-database.vala b/midori/midori-database.vala
index 48a7ffda..ba871447 100644
--- a/midori/midori-database.vala
+++ b/midori/midori-database.vala
@@ -247,7 +247,7 @@ namespace Midori {
         }
 
 	public bool exists (string path) {
-	     return Midori.Paths.check_file_exists (path);
+	     return GLib.FileUtils.test (path, GLib.FileTest.EXISTS);
 	}
 
 
diff --git a/midori/midori-download.vala b/midori/midori-download.vala
index 0e721ef7..4a4da440 100644
--- a/midori/midori-download.vala
+++ b/midori/midori-download.vala
@@ -341,14 +341,14 @@ namespace Midori {
         }
 
         public string get_unique_filename (string filename) {
-            if (Midori.Paths.check_file_exists (filename)) {
+            if (GLib.FileUtils.test (filename, GLib.FileTest.EXISTS)) {
                 string basename;
                 string? extension = get_extension_for_uri (filename, out basename);
                 string? new_filename = null;
                 int i = 0;
                 do {
                     new_filename = "%s-%d%s".printf (basename, i++, extension ?? "");
-                } while (Midori.Paths.check_file_exists (new_filename));
+                } while (GLib.FileUtils.test (new_filename, GLib.FileTest.EXISTS));
                 return new_filename;
             }
             return filename;
diff --git a/midori/midori-frontend.c b/midori/midori-frontend.c
index c22e0132..7a0104c9 100644
--- a/midori/midori-frontend.c
+++ b/midori/midori-frontend.c
@@ -383,7 +383,7 @@ midori_frontend_diagnostic_dialog (MidoriApp*         app,
         NULL);
 
     gchar* crash_log = g_build_filename (midori_paths_get_runtime_dir (), "gdb.bt", NULL);
-    if (midori_paths_check_file_exists (crash_log))
+    if (g_file_test (crash_log, G_FILE_TEST_EXISTS))
     {
         GtkWidget* log_button = gtk_button_new_with_mnemonic (_("Show last crash _log"));
         g_signal_connect_data (log_button, "clicked",
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 75d52492..1a40878f 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -1182,12 +1182,12 @@ midori_web_settings_get_property (GObject*    object,
             gchar* filename = midori_paths_get_data_filename (theme_file, FALSE);
             g_free (theme_file);
             web_settings->close_buttons_left = 1;
-            if (!midori_paths_check_file_exists (filename))
+            if (!g_file_test (filename, G_FILE_TEST_EXISTS))
                 katze_assign (filename,
                    g_build_filename (g_get_home_dir (), ".themes",
                                      theme, "index.theme", NULL));
             g_free (theme);
-            if (midori_paths_check_file_exists (filename))
+            if (g_file_test (filename, G_FILE_TEST_EXISTS))
             {
                 GKeyFile* keyfile = g_key_file_new ();
                 gchar* button_layout;
@@ -1514,7 +1514,7 @@ midori_settings_new_full (gchar*** extensions)
 
     /* Load accelerators */
     katze_assign (config_file, midori_paths_get_config_filename_for_reading ("accels"));
-    if (!midori_paths_check_file_exists (config_file))
+    if (!g_file_test (config_file, G_FILE_TEST_EXISTS))
         katze_assign (config_file, midori_paths_get_preset_filename (NULL, "accels"));
     gtk_accel_map_load (config_file);
     g_free (config_file);