From e6864165ee18658bf2a6548fee50aa5cd1effe56 Mon Sep 17 00:00:00 2001 From: Gary Burton Date: Sun, 16 Sep 2012 07:58:25 +0000 Subject: [PATCH] Find favicon.ico in a more OS friendly way. svn: r20400 --- src/gen/const.py.in | 13 +++++++------ src/plugins/docgen/htmldoc.py | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/gen/const.py.in b/src/gen/const.py.in index 95da16dc8..d78404413 100644 --- a/src/gen/const.py.in +++ b/src/gen/const.py.in @@ -180,12 +180,13 @@ MERGE_GLADE = os.path.join(GLADE_DIR, "mergedata.glade") RULE_GLADE = os.path.join(GLADE_DIR, "rule.glade") -PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins") -DATA_DIR = os.path.join(ROOT_DIR, "data") -WEB_DIR = os.path.join(ROOT_DIR, 'webapp') -#SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml") -TIP_DATA = os.path.join(DATA_DIR, "tips.xml") -WEBSTUFF_DIR = os.path.join(PLUGINS_DIR, "webstuff") +PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins") +DATA_DIR = os.path.join(ROOT_DIR, "data") +WEB_DIR = os.path.join(ROOT_DIR, 'webapp') +#SYSTEM_FILTERS = os.path.join(DATA_DIR, "system_filters.xml") +TIP_DATA = os.path.join(DATA_DIR, "tips.xml") +WEBSTUFF_DIR = os.path.join(PLUGINS_DIR, "webstuff") +WEBSTUFF_IMAGE_DIR = os.path.join(WEBSTUFF_DIR, "images") PAPERSIZE = os.path.join(DATA_DIR, "papersize.xml") diff --git a/src/plugins/docgen/htmldoc.py b/src/plugins/docgen/htmldoc.py index 528a95808..ccf2bd179 100644 --- a/src/plugins/docgen/htmldoc.py +++ b/src/plugins/docgen/htmldoc.py @@ -47,7 +47,7 @@ from gen.ggettext import gettext as _ # #------------------------------------------------------------------------ from gen.utils.image import resize_to_jpeg -from gen.const import DATA_DIR, WEBSTUFF_DIR, PROGRAM_NAME, URL_HOMEPAGE, VERSION +from gen.const import DATA_DIR, WEBSTUFF_IMAGE_DIR, PROGRAM_NAME, URL_HOMEPAGE, VERSION from gen.plug.docgen import BaseDoc, TextDoc, FONT_SANS_SERIF, URL_PATTERN from libhtmlbackend import HtmlBackend, process_spaces from libhtml import Html @@ -296,7 +296,7 @@ class HtmlDoc(BaseDoc, TextDoc): if os.path.exists(fullpath): self.copy_file(fullpath, _HTMLSCREEN) #favicon - self.copy_file(os.path.join(WEBSTUFF_DIR + "/images", 'favicon.ico'), + self.copy_file(os.path.join(WEBSTUFF_IMAGE_DIR, 'favicon.ico'), 'favicon.ico') def __reduce_list(self):