Merge from 2.0.1

svn: r4666
2005-05-24 13:08:06 +00:00
parent 62c65fb454
commit d7ce524379
73 changed files with 21569 additions and 14199 deletions
--- a/src/AddMedia.py
+++ b/src/AddMedia.py
@@ -159,8 +159,7 @@ class AddMediaObject:

        if os.path.isfile(filename):
            mtype = GrampsMime.get_type(filename)
-            
-            if mtype[0:5] == "image":
+            if mtype and mtype.startswith("image"):
                image = RelImage.scale_image(filename,const.thumbScale)
            else:
                image = Utils.find_mime_type_pixbuf(mtype)