From e328b83c2b4d3a357af8721a0ce4b9883d16cb01 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Mon, 5 Aug 2002 03:13:15 +0000
Subject: [PATCH] Image fix for Mandrake - skip using imlib

svn: r1108
---
 gramps/src/ImageSelect.py |  9 +--------
 gramps/src/RelLib.py      |  1 -
 gramps/src/WriteXML.py    | 18 +++++++++++-------
 gramps/src/const.py       |  2 +-
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/gramps/src/ImageSelect.py b/gramps/src/ImageSelect.py
index 5cc6c2509..67ec0e11b 100644
--- a/gramps/src/ImageSelect.py
+++ b/gramps/src/ImageSelect.py
@@ -232,17 +232,10 @@ class Gallery(ImageSelect):
         """Scale the image and add it to the IconList."""
         object = photo.getReference()
         name = Utils.thumb_path(self.db.getSavePath(),object)
-        try:
-            thumb = GdkImlib.Image(name)
-        except IOError,msg:
-            emsg = _("Could not import %s - %s") % (name,msg)
-            gnome.ui.GnomeErrorDialog(emsg)
-            return
-        self.icon_cache.append(thumb)
         description = object.getDescription()
         if len(description) > 50:
             description = "%s..." % description[0:50]
-        self.icon_list.append_imlib(thumb,description)
+        self.icon_list.append(name,description)
         
     def load_images(self):
         """clears the currentImages list to free up any cached 
diff --git a/gramps/src/RelLib.py b/gramps/src/RelLib.py
index f68a87adb..29c953498 100644
--- a/gramps/src/RelLib.py
+++ b/gramps/src/RelLib.py
@@ -2294,7 +2294,6 @@ class GrampsDB(Persistent):
         else:
             place = Place()
             map[idVal] = self.addPlace(place)
-            self.placeTable[map[idVal]] = place.getDisplayInfo()
         return place
 
     def addPlaceNoMap(self,place,index):
diff --git a/gramps/src/WriteXML.py b/gramps/src/WriteXML.py
index dd78698d5..8089aa8c9 100644
--- a/gramps/src/WriteXML.py
+++ b/gramps/src/WriteXML.py
@@ -181,6 +181,9 @@ class XmlWriter:
         self.g.write("    </researcher>\n")
         self.g.write("  </header>\n")
 
+        count = 0
+        delta = max(int(total/50),1)
+
         if person_len > 0:
             self.g.write("  <people")
             person = self.db.getDefaultPerson()
@@ -188,9 +191,6 @@ class XmlWriter:
                 self.g.write(' default="%s"' % person.getId())
             self.g.write(">\n")
 
-            delta = max(int(total/50),1)
-
-            count = 0
             for key in self.db.getPersonKeys():
                 person = self.db.getPerson(key)
                 if self.callback and count % delta == 0:
@@ -312,11 +312,15 @@ class XmlWriter:
         if place_len > 0:
             self.g.write("  <places>\n")
             for key in self.db.getPlaceKeys():
-                place = self.db.getPlace(key)
-                if self.callback and count % delta == 0:
-                    self.callback(float(count)/float(total))
+                try:
+                    place = self.db.getPlace(key)
+                    if self.callback and count % delta == 0:
+                        self.callback(float(count)/float(total))
+                    self.write_place_obj(place)
+                except:
+                    print "Could not find place %s" % key
                 count = count + 1
-                self.write_place_obj(place)
+                    
             self.g.write("  </places>\n")
 
         if len(objList) > 0:
diff --git a/gramps/src/const.py b/gramps/src/const.py
index d48f6d0c0..025b9bbd4 100644
--- a/gramps/src/const.py
+++ b/gramps/src/const.py
@@ -92,7 +92,7 @@ startup        = 1
 #
 #-------------------------------------------------------------------------
 progName     = "GRAMPS"
-version      = "0.8.0-rc3"
+version      = "0.8.0-rc4"
 copyright    = "© 2001-2002 Donald N. Allingham"
 authors      = ["Donald N. Allingham", "David Hampton","Donald A. Peterson"]
 comments     = _("GRAMPS (Genealogical Research and Analysis "