From: Alexander Butenko <a.butenka@gmail.com>
Date: Mon, 21 Dec 2009 22:24:27 +0000 (+0100)
Subject: Don't use g_access, use the return value of g_file_get_contents
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc288dd3c35136e9c301919f52b1249eb8629b8d;p=midori

Don't use g_access, use the return value of g_file_get_contents
---

diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index 334237ec..fbf05774 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -37,16 +37,14 @@ formhistory_prepare_js ()
    gchar* file;
 
    gchar* data_path = g_build_filename (MDATADIR, PACKAGE_NAME, "res", NULL);
-   file = g_build_filename (data_path,"/autosuggestcontrol.js",NULL);
-   if (g_access (file, F_OK) != 0)
+   file = g_build_filename (data_path, G_DIR_SEPARATOR_S, "autosuggestcontrol.js",NULL);
+   if (!g_file_get_contents (file, &autosuggest, NULL, NULL))
        return FALSE;
-   g_file_get_contents (file, &autosuggest, NULL, NULL);
    g_strchomp (autosuggest);
 
-   file = g_build_filename (data_path,"/autosuggestcontrol.css",NULL);
-   if (g_access (file, F_OK) != 0)
+   file = g_build_filename (data_path, G_DIR_SEPARATOR_S, "autosuggestcontrol.css",NULL);
+   if(!g_file_get_contents (file, &style, NULL, NULL))
        return FALSE;
-   g_file_get_contents (file, &style, NULL, NULL);
    g_strchomp (style);
    i = 0;
    while (style[i])