48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
|
diff -upr file-roller-2.20.0-pre/src/gtk-utils.c file-roller-2.20.0-work/src/gtk-utils.c
|
||
|
|
--- file-roller-2.20.0-pre/src/gtk-utils.c 2007-09-17 14:40:06.000000000 -0500
|
||
|
|
+++ file-roller-2.20.0-work/src/gtk-utils.c 2007-09-25 21:20:00.000000000 -0500
|
||
|
|
@@ -798,39 +798,19 @@ show_help_dialog (GtkWindow *parent,
|
||
|
|
{
|
||
|
|
GError *err = NULL;
|
||
|
|
char *command;
|
||
|
|
- const char *lang;
|
||
|
|
- char *uri = NULL;
|
||
|
|
- int i;
|
||
|
|
GdkScreen *gscreen;
|
||
|
|
|
||
|
|
- const char * const * langs = g_get_language_names ();
|
||
|
|
-
|
||
|
|
- for (i = 0; langs[i]; i++) {
|
||
|
|
- lang = langs[i];
|
||
|
|
- if (strchr (lang, '.')) {
|
||
|
|
- continue;
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
- uri = g_build_filename(FR_DATADIR,
|
||
|
|
- "/gnome/help/file-roller/",
|
||
|
|
- lang,
|
||
|
|
- "/file-roller.xml",
|
||
|
|
- NULL);
|
||
|
|
-
|
||
|
|
- if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
|
||
|
|
- break;
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if (link_id) {
|
||
|
|
- command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL);
|
||
|
|
+ command = g_strconcat ("gnome-open ghelp://file-roller#", link_id, NULL);
|
||
|
|
} else {
|
||
|
|
- command = g_strconcat ("gnome-open ghelp://", uri, NULL);
|
||
|
|
+ command = g_strdup ("gnome-open ghelp://file-roller");
|
||
|
|
}
|
||
|
|
|
||
|
|
gscreen = gdk_screen_get_default();
|
||
|
|
gdk_spawn_command_line_on_screen (gscreen, command, &err);
|
||
|
|
|
||
|
|
+ g_free (command);
|
||
|
|
+
|
||
|
|
if (err != NULL) {
|
||
|
|
GtkWidget *dialog;
|
||
|
|
|