merge changes from gramps20

svn: r5482
2005-12-06 06:38:09 +00:00
parent e0ff843bb4
commit 2f962b5f96
202 changed files with 112821 additions and 41664 deletions
--- a/src/QuestionDialog.py
+++ b/src/QuestionDialog.py
@ -44,7 +44,10 @@ from gtk.gdk import pixbuf_new_from_file
 import const
 import GrampsKeys

-ICON = pixbuf_new_from_file(const.icon)
+try:
+    ICON = pixbuf_new_from_file(const.icon)
+except:
+    pass

 class SaveDialog:
    def __init__(self,msg1,msg2,task1,task2,parent=None):