Revision: 1363
http://geeqie.svn.sourceforge.net/geeqie/?rev=1363&view=rev
Author: zas_
Date: 2009-01-29 18:52:52 +0000 (Thu, 29 Jan 2009)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/src/options.c
trunk/src/options.h
trunk/src/rcfile.c
trunk/src/window.c
Modified: trunk/src/options.c
===================================================================
--- trunk/src/options.c 2009-01-29 18:05:41 UTC (rev 1362)
+++ trunk/src/options.c 2009-01-29 18:52:52 UTC (rev 1363)
@@ -38,8 +38,6 @@
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 @@
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;
}
Modified: trunk/src/options.h
===================================================================
--- trunk/src/options.h 2009-01-29 18:05:41 UTC (rev 1362)
+++ trunk/src/options.h 2009-01-29 18:52:52 UTC (rev 1363)
@@ -249,12 +249,6 @@
} html_browser;
} helpers;
- /* Various paths and links to documentation */
- struct {
- gchar *helpdir;
- gchar *htmldir;
- } documentation;
-
/* Metadata */
struct {
gboolean enable_metadata_dirs;
Modified: trunk/src/rcfile.c
===================================================================
--- trunk/src/rcfile.c 2009-01-29 18:05:41 UTC (rev 1362)
+++ trunk/src/rcfile.c 2009-01-29 18:52:52 UTC (rev 1363)
@@ -551,10 +551,6 @@
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 @@
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);
Modified: trunk/src/window.c
===================================================================
--- trunk/src/window.c 2009-01-29 18:05:41 UTC (rev 1362)
+++ trunk/src/window.c 2009-01-29 18:52:52 UTC (rev 1363)
@@ -182,7 +182,7 @@
{
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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
