Fixes #5177. The help documentation is now at help/C instead of just help.

This commit is contained in:
Nate Lillich 2012-05-04 17:21:28 -07:00
parent 21f4347ca5
commit 6ae00e391f
14 changed files with 14 additions and 14 deletions

View file

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Before After
Before After

View file

@ -1,20 +1,18 @@
set(HELP_DEST share/gnome/help/geary/C) set(HELP_DEST share/gnome/help/geary/C)
set(HELP_FILES set(HELP_FILES
archive.page C/archive.page
bugs.page C/bugs.page
conversation.page C/conversation.page
editor.page C/editor.page
index.page C/index.page
limits.page C/limits.page
send.page C/send.page
shortcuts.page C/shortcuts.page
spell.page C/spell.page
star.page C/star.page
figures/Mail.png
) )
install(FILES ${HELP_FILES} DESTINATION ${HELP_DEST}) install(FILES ${HELP_FILES} DESTINATION ${HELP_DEST})
install(FILES C/figures/Mail.png DESTINATION ${HELP_DEST}/figures)

View file

@ -7,9 +7,11 @@ set(ICON_FILES
geary.png geary.png
mail-inbox.png mail-inbox.png
mail-sent.png mail-sent.png
menu-down.svg
multiple-tags.png multiple-tags.png
non-starred-grey.png non-starred-grey.png
one-tag.png one-tag.png
remove-formatting.png
starred.png starred.png
) )

View file

@ -680,7 +680,7 @@ public class GearyController {
File exec_dir = GearyApplication.instance.get_exec_dir(); File exec_dir = GearyApplication.instance.get_exec_dir();
string[] argv = new string[3]; string[] argv = new string[3];
argv[0] = "gnome-help"; argv[0] = "gnome-help";
argv[1] = GearyApplication.SOURCE_ROOT_DIR + "/help"; argv[1] = GearyApplication.SOURCE_ROOT_DIR + "/help/C/";
argv[2] = null; argv[2] = null;
if (!Process.spawn_async(exec_dir.get_path(), argv, null, if (!Process.spawn_async(exec_dir.get_path(), argv, null,
SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL, null, out pid)) { SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL, null, out pid)) {