diff --git a/ChangeLog b/ChangeLog
index d4fba95d2..f83459806 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-03-28  Brian Matherly  <pez4brian@users.sourceforge.net>
+	* src/PluginUtils/_Options.py: Use filename instead of URI for XML parser
+	* src/PluginUtils/_Report.py: Use filename instead of URI for XML parser
+	* src/PluginUtils/_ReportOptions.py: Use filename instead of URI
+	* src/Plugins/BookReport.py: Use filename instead of URI for XML parser
+	* src/RecentFiles.py: Use filename instead of URI for XML parser
+	* src/GenericFilter.py: Use filename instead of URI for XML parser
+	* src/BaseDoc.py: Use filename instead of URI for XML parser 
+	(works on Windows and Linux)
+
 2006-03-28  Don Allingham  <don@gramps-project.org>
 	* src/Mime/_GnomeMime.py: find the default application instead of 
 	using the first returned by mime_get_app_short_list
diff --git a/src/BaseDoc.py b/src/BaseDoc.py
index c9e064fb3..2e9bd3495 100644
--- a/src/BaseDoc.py
+++ b/src/BaseDoc.py
@@ -894,7 +894,7 @@ class StyleSheetList:
         try:
             p = make_parser()
             p.setContentHandler(SheetParser(self))
-            p.parse('file://' + self.file)
+            p.parse(self.file)
         except (IOError,OSError,SAXParseException):
             pass
         
diff --git a/src/GenericFilter.py b/src/GenericFilter.py
index b6194501b..ac6091883 100644
--- a/src/GenericFilter.py
+++ b/src/GenericFilter.py
@@ -2314,10 +2314,7 @@ class GenericFilterList:
        try:
            parser = make_parser()
            parser.setContentHandler(FilterParser(self))
-           if self.file[0:7] != "file://":
-               parser.parse("file://" + self.file)
-           else:
-               parser.parse(self.file)
+           parser.parse(self.file)
        except (IOError,OSError):
            pass
        except SAXParseException:
diff --git a/src/PluginUtils/_Options.py b/src/PluginUtils/_Options.py
index 51976a152..6752b23c2 100644
--- a/src/PluginUtils/_Options.py
+++ b/src/PluginUtils/_Options.py
@@ -223,7 +223,7 @@ class OptionListCollection:
         try:
             p = make_parser()
             p.setContentHandler(OptionParser(self))
-            p.parse('file://' + self.filename)
+            p.parse(self.filename)
         except (IOError,OSError,SAXParseException):
             pass
 
diff --git a/src/PluginUtils/_Report.py b/src/PluginUtils/_Report.py
index 63873abd0..11623654f 100644
--- a/src/PluginUtils/_Report.py
+++ b/src/PluginUtils/_Report.py
@@ -1648,11 +1648,11 @@ try:
     parser = make_parser()
     gspath = const.template_dir
     parser.setContentHandler(TemplateParser(_template_map,gspath))
-    parser.parse("file://%s/templates.xml" % gspath)
+    parser.parse("%s/templates.xml" % gspath)
     parser = make_parser()
     gspath = os.path.expanduser("~/.gramps/templates")
     parser.setContentHandler(TemplateParser(_template_map,gspath))
-    parser.parse("file://%s/templates.xml" % gspath)
+    parser.parse("%s/templates.xml" % gspath)
 except (IOError,OSError,SAXParseException):
     pass
 
diff --git a/src/PluginUtils/_ReportOptions.py b/src/PluginUtils/_ReportOptions.py
index 8d188edbc..2a8d3bd56 100644
--- a/src/PluginUtils/_ReportOptions.py
+++ b/src/PluginUtils/_ReportOptions.py
@@ -276,7 +276,7 @@ class OptionListCollection(_Options.OptionListCollection):
         try:
             p = make_parser()
             p.setContentHandler(OptionParser(self))
-            p.parse('file://' + self.filename)
+            p.parse(self.filename)
         except (IOError,OSError,SAXParseException):
             pass
 
@@ -331,7 +331,7 @@ class OptionParser(_Options.OptionParser):
                 self.option_list.set_orientation(int(attrs['value']))
         else:
             # Tag is not report-specific, so we let the base class handle it.
-            OptionParser.startElement(self,tag,attrs)
+            _Options.OptionParser.startElement(self,tag,attrs)
 
     def endElement(self,tag):
         "Overridden class that handles the end of a XML element"
@@ -340,7 +340,7 @@ class OptionParser(_Options.OptionParser):
             self.common = False
         else:
             # Tag is not report-specific, so we let the base class handle it.
-            OptionParser.endElement(self,tag)
+            _Options.OptionParser.endElement(self,tag)
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/RecentFiles.py b/src/RecentFiles.py
index ea7210f26..5f957bae4 100644
--- a/src/RecentFiles.py
+++ b/src/RecentFiles.py
@@ -408,7 +408,7 @@ def recent_files(filename,filetype):
     # Add the file to the recent items
     gnome_rf = GnomeRecentFiles()
     gnome_item = GnomeRecentItem(
-        u='file://%s' % filename,
+        u=filename,
         m=filetype,
         t=the_time,
         p=False,
diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py
index eb8cabe2c..fae91b6b3 100644
--- a/src/plugins/BookReport.py
+++ b/src/plugins/BookReport.py
@@ -391,7 +391,7 @@ class BookList:
         try:
             p = make_parser()
             p.setContentHandler(BookParser(self))
-            p.parse('file://' + self.file)
+            p.parse(self.file)
         except (IOError,OSError,SAXParseException):
             pass