diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 16fa13d19..14a743aba 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2006-05-19  Don Allingham  <don@gramps-project.org>
+	* src/GrampsDb/_GrampsDbBase.py: repository does not have a media_list
+
 2006-05-19  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_DbUtils.py (db_copy): Copy custom types.
 
@@ -56,6 +59,25 @@
 	* src/Filters/_PersonSidebarFilter.py (PersonSidebarFilter.clear): 
 	fix clearing of combobox
 
+2006-05-17  Don Allingham  <don@gramps-project.org>
+	* GrampsDb/_ReadGedcom.py: pychecker
+	* GrampsDb/_GrampsDbBase.py: pychecker
+	* GrampsDb/_DbUtils.py: pychecker
+	* GrampsDb/_WriteGedcom.py: pychecker
+	* StartupDialog.py: pychecker
+	* DisplayTabs/_FamilyLdsEmbedList.py: pychecker
+	* TipOfDay.py: pychecker
+	* Utils.py: pychecker
+	* PageView.py: pychecker
+	* ToolTips.py: pychecker
+	* Filters/_FilterWidget.py: pychecker
+	* Filters/_SearchBar.py: pychecker
+	* Filters/__init__.py: pychecker
+	* Filters/_FilterStore.py: pychecker
+	* Filters/_PersonSidebarFilter.py: pychecker
+	* Filters/_FilterMenu.py: pychecker
+	* Filters/_SidebarFilter.py: pychecker
+
 2006-05-17  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_ReadXML.py (start_childref): Typo.
 	* src/GrampsDb/_ReadGrdb.py: Add repos, modularize.
diff --git a/gramps2/src/GrampsDb/_GrampsDbBase.py b/gramps2/src/GrampsDb/_GrampsDbBase.py
index 52384a529..1fc7513c2 100644
--- a/gramps2/src/GrampsDb/_GrampsDbBase.py
+++ b/gramps2/src/GrampsDb/_GrampsDbBase.py
@@ -603,12 +603,6 @@ class GrampsDbBase(GrampsDBCallback):
         self.url_types.update([str(url.type) for url in repository.urls
                                if url.type.is_custom()])
 
-        attr_list = []
-        for mref in repository.media_list:
-            attr_list += [str(attr.type) for attr in mref.attribute_list
-                          if attr.type.is_custom()]
-        self.media_attributes.update(attr_list)
-
     def find_next_person_gramps_id(self):
         """
         Returns the next available GRAMPS' ID for a Person object based