debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Look for user documentation dynamically on win32

Browse source
This commit is contained in:
Peter de Ridder 2010-02-16 00:47:11 +01:00 committed by Christian Dywan
parent c90344ac44
commit 4774e35932
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
midori/midori-browser.c
View file

@ -4857,15 +4857,37 @@ _action_help_link_activate (GtkAction* action,
const gchar* action_name; const gchar* action_name;
const gchar* uri; const gchar* uri;
gint n; gint n;
#if defined (G_OS_WIN32) && defined (DOCDIR)
gchar* free_uri = NULL;
#endif
action_name = gtk_action_get_name (action); action_name = gtk_action_get_name (action);
if (!strncmp ("HelpContents", action_name, 12)) if (!strncmp ("HelpContents", action_name, 12))
{ {
#ifdef G_OS_WIN32
{
#ifdef DOCDIR
gchar* path = sokoke_find_data_filename ("doc/midori/user/midori.html");
uri = free_uri = g_filename_to_uri (path, NULL, NULL);
if (g_access (path, F_OK) != 0)
{
if (g_access (DOCDIR "/midori/user/midori.html", F_OK) == 0)
uri = "file://" DOCDIR "/midori/user/midori.html";
else
#endif
uri = "error:nodocs share/doc/midori/user/midori.html";
#ifdef DOCDIR
}
g_free (path);
#endif
}
#else
#ifdef DOCDIR #ifdef DOCDIR
uri = "file://" DOCDIR "/midori/user/midori.html"; uri = "file://" DOCDIR "/midori/user/midori.html";
if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0) if (g_access (DOCDIR "/midori/user/midori.html", F_OK) != 0)
#endif #endif
uri = "error:nodocs " DOCDIR "/midori/user/midori.html"; uri = "error:nodocs " DOCDIR "/midori/user/midori.html";
#endif
} }
else if (!strncmp ("HelpFAQ", action_name, 7)) else if (!strncmp ("HelpFAQ", action_name, 7))
uri = "http://wiki.xfce.org/_export/xhtml/midori_faq"; uri = "http://wiki.xfce.org/_export/xhtml/midori_faq";
@ -4878,8 +4900,11 @@ _action_help_link_activate (GtkAction* action,
{ {
n = midori_browser_add_uri (browser, uri); n = midori_browser_add_uri (browser, uri);
midori_browser_set_current_page (browser, n); midori_browser_set_current_page (browser, n);
}
#if defined (G_OS_WIN32) && defined (DOCDIR)
g_free (free_uri);
#endif
}
} }
static void static void