X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fhelp-menu.c;h=da87e235edf9dcf8588baf84b4e79f502d6b786b;hb=9269baf297568f63c2e7a184c73e1c8720b9b319;hp=30bbc7522bf73716f197d510bfda7e66fd1612ae;hpb=6e097c89af440da90b43ce90864394c4d0c843d5;p=pspp

diff --git a/src/ui/gui/help-menu.c b/src/ui/gui/help-menu.c
index 30bbc7522b..da87e235ed 100644
--- a/src/ui/gui/help-menu.c
+++ b/src/ui/gui/help-menu.c
@@ -34,11 +34,11 @@
 /* Try to open html documentation uri via the default
    browser on the operating system */
 #ifdef __APPLE__
-#define HTMLOPENARGV {"open", 0, 0}
+#define HTMLOPENAPP "open"
 #elif  _WIN32
-#define HTMLOPENARGV {"wscript", 0, 0}
+#define HTMLOPENAPP "wscript"
 #else
-#define HTMLOPENARGV {"xdg-open", 0, 0}
+#define HTMLOPENAPP "xdg-open"
 #endif
 
 static const gchar *artists[] = { "Bastián Díaz", "Hugo Alejandro", NULL};
@@ -78,7 +78,7 @@ about_new (GtkMenuItem *mmm, GtkWindow *parent)
      /* TRANSLATORS: Do not translate this string.  Instead, put the names of the people
 	who have helped in the translation. */
      _("translator-credits")
-     );
+);
 
   gtk_window_set_transient_for (GTK_WINDOW (about), parent);
 
@@ -131,17 +131,15 @@ static gboolean open_windows_help (const gchar *helpuri,
 void
 online_help (const char *page)
 {
-  GError *err = NULL;
   GError *htmlerr = NULL;
-  gchar *argv[3] = { "yelp", 0, 0};
-  gchar *htmlargv[3] = HTMLOPENARGV;
+  gchar helpapp[] = HTMLOPENAPP;
+  gchar *htmlargv[3] = {helpapp, 0, 0};
   gchar *htmlfilename = NULL;
   gchar *htmlfullname = NULL;
   gchar *htmluri = NULL;
 
   if (page == NULL)
     {
-      argv[1] = g_strdup_printf ("file://%s", relocate (DOCDIR "/pspp.xml"));
       htmlfilename = g_strdup ("index.html");
     }
   else
@@ -149,8 +147,6 @@ online_help (const char *page)
       gchar **tokens = NULL;
       const int maxtokens = 5;
       int idx ;
-      argv[1] = g_strdup_printf ("file://%s#%s",
-                                 relocate (DOCDIR "/pspp.xml"), page);
       /* The page will be translated to the htmlfilename
          page                   htmlfilename
          GRAPH#SCATTERPLOT      SCATTERPLOT.html
@@ -188,9 +184,7 @@ online_help (const char *page)
      osx: wine is started to launch the uri...
      windows: not so bad, but the first access does not work*/
 
-  if (! (g_spawn_async (NULL, argv,
-                        NULL, G_SPAWN_SEARCH_PATH,
-                        NULL, NULL,   NULL,   &err) ||
+  if (! (
 #ifdef _WIN32
          open_windows_help (htmluri, &htmlerr))
 #else
@@ -198,21 +192,17 @@ online_help (const char *page)
                         NULL, G_SPAWN_SEARCH_PATH,
                         NULL, NULL,   NULL,   &htmlerr))
 #endif
-      )
+)
     {
-      msg (ME, _("Cannot open reference manual via yelp: %s. "
-                 "Cannot open via html: %s "
+      msg (ME, _("Cannot open via html: %s "
                  "with uri: %s "
                  "The PSSP manual is also available at %s"),
-                  err->message,
                   htmlerr->message,
                   htmluri,
                   PACKAGE_URL "documentation.html");
     }
 
-  g_free (argv[1]);
   g_free (htmluri);
-  g_clear_error (&err);
   g_clear_error (&htmlerr);
 }
 
@@ -250,5 +240,7 @@ create_help_menu (GtkWindow *toplevel)
 
   gtk_widget_show_all (menuitem);
 
+  g_object_unref (accel_group);
+
   return menuitem;
 }