[library-web] Do not look for document title in .devhelp file, only in .devhelp2



commit 997d6b0323836f765352f5bebf154890a50a818f
Author: Frédéric Péters <fpeters 0d be>
Date:   Wed May 11 10:34:07 2011 +0200

    Do not look for document title in .devhelp file, only in .devhelp2

 src/modtypes/gtkdoc.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/modtypes/gtkdoc.py b/src/modtypes/gtkdoc.py
index da43e1d..59c77bc 100644
--- a/src/modtypes/gtkdoc.py
+++ b/src/modtypes/gtkdoc.py
@@ -66,8 +66,8 @@ class GtkDocModule(DocModule):
             os.makedirs(web_output_dir)
 
         if not app.rebuild_all and os.path.exists(
-                os.path.join(web_output_dir, '%s.devhelp' % doc_module)):
-            mtime = os.stat(os.path.join(web_output_dir, '%s.devhelp' % doc_module))[stat.ST_MTIME]
+                os.path.join(web_output_dir, '%s.devhelp2' % doc_module)):
+            mtime = os.stat(os.path.join(web_output_dir, '%s.devhelp2' % doc_module))[stat.ST_MTIME]
         else:
             mtime = 0
 
@@ -186,15 +186,15 @@ class GtkDocModule(DocModule):
         doc.category = 'api'
         doc.toc_id = 'api'
 
-        devhelp_file = [x for x in os.listdir(web_output_dir) if x.endswith('.devhelp')]
+        devhelp2_file = [x for x in os.listdir(web_output_dir) if x.endswith('.devhelp2')]
         if os.path.exists(os.path.join(web_output_dir, 'index.xml.en')):
             tree = ET.parse(os.path.join(web_output_dir, 'index.xml.en'))
             if tree.find('title') is not None:
                 doc.title['en'] = tree.find('title').text
             elif tree.find('{http://www.w3.org/1999/xhtml}title') is not None:
                 doc.title['en'] = tree.find('{http://www.w3.org/1999/xhtml}title').text
-        elif devhelp_file:
-            tree = ET.parse(os.path.join(web_output_dir, devhelp_file[0]))
+        elif devhelp2_file:
+            tree = ET.parse(os.path.join(web_output_dir, devhelp2_file[0]))
             doc.title['en'] = tree.getroot().attrib['title']
 
         if app.config.create_tarballs:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]