From: Laurent Monin <geeqie@norz.org>
Date: Thu, 29 Jan 2009 18:52:52 +0000 (+0000)
Subject: Remove harmful documentation.helpdir and documentation.htmldir options. These paths... 
X-Git-Tag: v1.0.0~536
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=ab98857be805f6bd9891d57506038e651dc81dde

Remove harmful documentation.helpdir and documentation.htmldir options. These paths can still be modified through --with-readmedir and --htmldir configure options. Reported by Christopher Beland.
---

diff --git a/src/options.c b/src/options.c
index 67efb89e..de93e3e1 100644
--- a/src/options.c
+++ b/src/options.c
@@ -38,8 +38,6 @@ ConfOptions *init_options(ConfOptions *options)
 	options->color_profile.use_image = TRUE;
 
 	options->dnd_icon_size = 48;
-	options->documentation.htmldir = NULL;
-	options->documentation.helpdir = NULL;
 	options->duplicates_similarity_threshold = 99;
 	
 	options->file_filter.disable = FALSE;
@@ -211,9 +209,6 @@ void setup_default_options(ConfOptions *options)
 	options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
 	options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
 	
-	options->documentation.htmldir = g_strdup(GQ_HTMLDIR);
-	options->documentation.helpdir = g_strdup(GQ_HELPDIR);
-
 	for (i = 0; ExifUIList[i].key; i++)
 		ExifUIList[i].current = ExifUIList[i].default_value;
 }
diff --git a/src/options.h b/src/options.h
index d6ce1a47..3f5c93ba 100644
--- a/src/options.h
+++ b/src/options.h
@@ -249,12 +249,6 @@ struct _ConfOptions
 		} html_browser;
 	} helpers;
 
-	/* Various paths and links to documentation */
-	struct {
-		gchar *helpdir;
-		gchar *htmldir;
-	} documentation;
-	
 	/* Metadata */
 	struct {
 		gboolean enable_metadata_dirs;
diff --git a/src/rcfile.c b/src/rcfile.c
index 7b1f2d78..9e78ed79 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -551,10 +551,6 @@ gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
 	WRITE_BOOL(metadata.confirm_on_image_change);
 	WRITE_BOOL(metadata.confirm_on_dir_change);
 
-	WRITE_SUBTITLE("Documentation Options");
-	WRITE_CHAR(documentation.helpdir);
-	WRITE_CHAR(documentation.htmldir);
-
 	WRITE_SEPARATOR();
 	WRITE_SEPARATOR();
 
@@ -920,10 +916,6 @@ gboolean load_options_from(const gchar *utf8_path, ConfOptions *options)
 		READ_BOOL(metadata.confirm_on_image_change);
 		READ_BOOL(metadata.confirm_on_dir_change);
 
-		/* Documentation */
-		READ_CHAR(documentation.helpdir);
-		READ_CHAR(documentation.htmldir);
-		
 		}
 
 	fclose(f);
diff --git a/src/window.c b/src/window.c
index ec8b8063..9d68e51b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -182,7 +182,7 @@ static void help_browser_run(void)
 {
 	gchar *name = options->helpers.html_browser.command_name;
 	gchar *cmd = options->helpers.html_browser.command_line;
-	gchar *path = g_build_filename(options->documentation.htmldir, "index.html", NULL);
+	gchar *path = g_build_filename(GQ_HTMLDIR, "index.html", NULL);
 	gchar *result = NULL;
 	gint i;
 
@@ -247,7 +247,7 @@ void help_window_show(const gchar *key)
 		return;
 		}
 
-	path = g_build_filename(options->documentation.helpdir, "README", NULL);
+	path = g_build_filename(GQ_HELPDIR, "README", NULL);
 	help_window = help_window_new(_("Help"), "help", path, key);
 	g_free(path);