[Xfce4-commits] <midori:master> Use DOCDIR for non-Win32 faq.css/ faq.html

[Christian Dywan]

Updating branch refs/heads/master
         to 2ee3da04aaaea65cd2ca72e87a73e3df94805880 (commit)
       from 332336e11fa4d98cfa838818c851a53a8f7b1583 (commit)

commit 2ee3da04aaaea65cd2ca72e87a73e3df94805880
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Mar 7 00:54:19 2013 +0100

    Use DOCDIR for non-Win32 faq.css/ faq.html
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1130297

 midori/midori-browser.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 8d1323e..9bfa039 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -3557,7 +3557,11 @@ _action_readable_activate (GtkAction*     action,
     stylesheet = NULL;
     if (!g_file_get_contents (filename, &stylesheet, NULL, NULL))
     {
+        #ifdef G_OS_WIN32
         katze_assign (filename, midori_paths_get_data_filename ("doc/midori/faq.css", FALSE));
+        #else
+        katze_assign (filename, g_build_filename (DOCDIR, "faq.css", NULL));
+        #endif
         g_file_get_contents (filename, &stylesheet, NULL, NULL);
     }
     if (!(stylesheet && *stylesheet))
@@ -4720,9 +4724,10 @@ midori_browser_get_docs (gboolean error)
     g_free (path);
     if (found)
         return g_filename_to_uri (path, NULL, NULL);
-    #endif
+    #else
     if (g_access (DOCDIR "/faq.html", F_OK) == 0)
         return g_strdup ("file://" DOCDIR "/faq.html");
+    #endif
     else
         return error ? g_strdup ("about:nodocs") : NULL;
 }