projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-data-window.c (on_cut): Do not append trailing whitespace to clip.
[pspp]
/
src
/
ui
/
gui
/
help-menu.c
diff --git
a/src/ui/gui/help-menu.c
b/src/ui/gui/help-menu.c
index 30bbc7522bf73716f197d510bfda7e66fd1612ae..1dc2daf3090b1dfc28c6c94fcfa5fbc3ebac9308 100644
(file)
--- a/
src/ui/gui/help-menu.c
+++ b/
src/ui/gui/help-menu.c
@@
-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")
/* 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);
gtk_window_set_transient_for (GTK_WINDOW (about), parent);
@@
-131,9
+131,7
@@
static gboolean open_windows_help (const gchar *helpuri,
void
online_help (const char *page)
{
void
online_help (const char *page)
{
- GError *err = NULL;
GError *htmlerr = NULL;
GError *htmlerr = NULL;
- gchar *argv[3] = { "yelp", 0, 0};
gchar *htmlargv[3] = HTMLOPENARGV;
gchar *htmlfilename = NULL;
gchar *htmlfullname = NULL;
gchar *htmlargv[3] = HTMLOPENARGV;
gchar *htmlfilename = NULL;
gchar *htmlfullname = NULL;
@@
-141,7
+139,6
@@
online_help (const char *page)
if (page == NULL)
{
if (page == NULL)
{
- argv[1] = g_strdup_printf ("file://%s", relocate (DOCDIR "/pspp.xml"));
htmlfilename = g_strdup ("index.html");
}
else
htmlfilename = g_strdup ("index.html");
}
else
@@
-149,8
+146,6
@@
online_help (const char *page)
gchar **tokens = NULL;
const int maxtokens = 5;
int idx ;
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
/* The page will be translated to the htmlfilename
page htmlfilename
GRAPH#SCATTERPLOT SCATTERPLOT.html
@@
-188,9
+183,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*/
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
#ifdef _WIN32
open_windows_help (htmluri, &htmlerr))
#else
@@
-198,21
+191,17
@@
online_help (const char *page)
NULL, G_SPAWN_SEARCH_PATH,
NULL, NULL, NULL, &htmlerr))
#endif
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"),
"with uri: %s "
"The PSSP manual is also available at %s"),
- err->message,
htmlerr->message,
htmluri,
PACKAGE_URL "documentation.html");
}
htmlerr->message,
htmluri,
PACKAGE_URL "documentation.html");
}
- g_free (argv[1]);
g_free (htmluri);
g_free (htmluri);
- g_clear_error (&err);
g_clear_error (&htmlerr);
}
g_clear_error (&htmlerr);
}
@@
-250,5
+239,7
@@
create_help_menu (GtkWindow *toplevel)
gtk_widget_show_all (menuitem);
gtk_widget_show_all (menuitem);
+ g_object_unref (accel_group);
+
return menuitem;
}
return menuitem;
}