[shotwell] Use yelp-tools style help install directories

[Jens Georg <jensgeorg src gnome org>]

commit 40dbbeafbe528eb4bed8a2255db38ec50a9b5f9d
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sat Jun 25 21:33:51 2016 -0400

    Use yelp-tools style help install directories
    
    https://wiki.gnome.org/Initiatives/GnomeGoals/NewDocumentationInfrastructure
    
    https://bugzilla.gnome.org/show_bug.cgi?id=719200

 src/Dialogs.vala   |    4 ++--
 src/Resources.vala |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index c208caf..f163aee 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -2325,7 +2325,7 @@ public class PreferencesDialog {
             pattern_help.set_markup("<a href=\"" + Resources.DIR_PATTERN_URI_SYSWIDE + "\">" + _("(Help)") + 
"</a>");
         } else {
             // We're being run from the build directory; we'll have to handle clicks to this
-            // link manually ourselves, due to a limitation ghelp: URIs.
+            // link manually ourselves, due to a limitation of help: URIs.
             pattern_help.set_markup("<a href=\"dummy:\">" + _("(Help)") + "</a>");
             pattern_help.activate_link.connect(on_local_pattern_help);
         }
@@ -2390,7 +2390,7 @@ public class PreferencesDialog {
     // the help viewer and specify the full path to the subsection we want...
     private bool on_local_pattern_help(string ignore) {
         try {
-            Resources.launch_help(AppWindow.get_instance().get_screen(), "?other-files");
+            Resources.launch_help(AppWindow.get_instance().get_screen(), "other-files.page");
         } catch (Error e) {
             message("Unable to launch help: %s", e.message);
         }
diff --git a/src/Resources.vala b/src/Resources.vala
index 101c49d..edac16d 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -30,7 +30,7 @@ namespace Resources {
     public const string HOME_URL = "https://wiki.gnome.org/Apps/Shotwell";;
     public const string FAQ_URL = "https://wiki.gnome.org/Apps/Shotwell/FAQ";;
     public const string BUG_DB_URL = "https://wiki.gnome.org/Apps/Shotwell/ReportingABug";;
-    public const string DIR_PATTERN_URI_SYSWIDE = "ghelp:shotwell?other-files";
+    public const string DIR_PATTERN_URI_SYSWIDE = "help:shotwell/other-files";
 
     private const string LIB = _LIB;
     private const string LIBEXECDIR = _LIBEXECDIR;
@@ -1023,7 +1023,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
             }
             
             string[] argv = new string[3];
-            argv[0] = "gnome-help";
+            argv[0] = "yelp";
             argv[1] = help_path;
             argv[2] = null;
             
@@ -1038,9 +1038,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         
         // launch from system-installed help
         if (anchor != null) {
-            sys_show_uri(screen, "ghelp:shotwell" + anchor);
+            sys_show_uri(screen, "help:shotwell" + anchor);
         } else {
-            sys_show_uri(screen, "ghelp:shotwell");
+            sys_show_uri(screen, "help:shotwell");
         }
     }