Escape # character in call to g_spawn_command_line_async

[pspp-builds.git] / src / ui / gui / help-menu.c

diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c
index c24125d78aa1f995393de8b955720012b93dd4a8..f746441c231ebc827f63754c129a455ee763e34b 100644 (file)
--- a/src/ui/gui/help-menu.c
+++ b/src/ui/gui/help-menu.c
@@ -46,10 +46,9 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), pb);
 
 
-  gtk_window_set_icon_name (GTK_WINDOW (about), "psppicon");
+  gtk_window_set_icon_name (GTK_WINDOW (about), "pspp");
 
-  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about),
-                               "http://www.gnu.org/software/pspp");
+  gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about), PACKAGE_URL);
 
   gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about),
                                bare_version);
@@ -86,25 +85,38 @@ about_new (GtkMenuItem *m, GtkWindow *parent)
   gtk_widget_hide (about);
 }
 
-
-static void
-reference_manual (GtkMenuItem *menu, gpointer data)
+/* Open the manual at PAGE */
+void
+online_help (const char *page)
 {
   GError *err = NULL;
-  gchar *cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml"));
+  gchar *cmd = NULL;
+
+  if (page == NULL)
+    cmd = g_strdup_printf ("yelp file://%s", relocate (DOCDIR "/pspp.xml"));
+  else
+    cmd = g_strdup_printf ("yelp file://%s\\#%s", relocate (DOCDIR "/pspp.xml"), page);
 
   if ( ! g_spawn_command_line_async (cmd, &err) )
     {
       msg (ME, _("Cannot open reference manual: %s.  The PSPP user manual is "
-                 "also available at "
-                 "http://www.gnu.org/software/pspp/documentation.html"),
-           err->message);
+                 "also available at %s"),
+                  err->message,
+                  PACKAGE_URL "documentation.html");
     }
 
   g_free (cmd);
   g_clear_error (&err);
 }
 
+static void
+reference_manual (GtkMenuItem *menu, gpointer data)
+{
+  online_help (NULL);
+}
+
+
+
 void
 merge_help_menu (GtkUIManager *uim)
 {