5 files changed, 13 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index c1f1a01..494b527 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,7 +171,7 @@ fr-marshal.c: fr-marshal.list $(GLIB_GENMARSHAL)
 
 fr-enum-types.h: typedefs.h $(GLIB_MKENUMS)
 $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#ifndef FR_ENUM__TYPES_H\n#define FR_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+ --fhead "#ifndef FR_ENUM_TYPES_H\n#define FR_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 --fprod "/* enumerations from \"@filename@\" */\n" \
 --vhead "GType @enum_name@_get_type (void);\n#define FR_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
 --ftail "G_END_DECLS\n\n#endif /* FR_ENUM_TYPES_H */" \
diff --git a/src/actions.c b/src/actions.c
index 5754aea..9e85e48 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -435,7 +435,7 @@ save_file_response_cb (GtkWidget *w,
 }
 
 if (response == GTK_RESPONSE_HELP) {
- show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-convert-archive");
+ show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-create#engrampa-convert-archive");
 return;
 }
 
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
index 2aa0eee..31c95c1 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -152,6 +152,9 @@ parse_name_field (char *line,
 else
 name_field = g_strdup (line + 1);
 
+ if (name_field == NULL)
+ return;
+
 if (*name_field == '/') {
 fdata->full_path = g_strdup (name_field);
 fdata->original_path = fdata->full_path;
diff --git a/src/fr-command-unarchiver.c b/src/fr-command-unarchiver.c
index d13f468..cfeb8c2 100644
--- a/src/fr-command-unarchiver.c
+++ b/src/fr-command-unarchiver.c
@@ -209,8 +209,13 @@ fr_command_unarchiver_extract (FrCommand *comm,
 
 fr_process_add_arg (comm->process, comm->filename);
 
- for (scan = file_list; scan; scan = scan->next)
- fr_process_add_arg (comm->process, scan->data);
+ for (scan = file_list; scan; scan = scan->next) {
+ char *escaped;
+
+ escaped = escape_str (scan->data, "[");
+ fr_process_add_arg (comm->process, escaped);
+ g_free (escaped);
+ }
 
 fr_process_end_command (comm->process);
 }
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 24a686a..8d29c07 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -772,7 +772,7 @@ show_help_dialog (GtkWindow *parent,
 char *uri;
 GError *error = NULL;
 
- uri = g_strconcat ("help:engrampa", section ? "?" : NULL, section, NULL);
+ uri = g_strconcat ("help:engrampa", section ? "/" : NULL, section, NULL);
 if (! show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
 GtkWidget *dialog;