Fix bookmark handling

svn: r1195

src/RelLib.py

@@ -1980,8 +1980,8 @@ class GrampsDB(Persistent):
     
     def getBookmarks(self):
         """returns the list of Person instances in the bookmarks"""
-        return extlist(self.bookmarks)
+        return self.bookmarks
-    
+
     def clean_bookmarks(self):
         """cleans up the bookmark list, removing empty slots"""
         new_bookmarks = []

src/const.py.in

@@ -57,6 +57,7 @@ if os.environ.has_key('GRAMPSDIR'):
 else:
     rootDir = "."
 
+papersize      = "%s/papersize.xml" % rootDir
 good_xpm       = "%s/good.xpm" % rootDir
 bad_xpm        = "%s/bad.xpm" % rootDir
 caution_xpm    = "%s/caution.xpm" % rootDir

src/fam.xpm

@@ -1,48 +0,0 @@
-/* XPM */
-static char * icon_family01b_24x24_xpm[] = {
-"24 24 21 1",
-" 	c None",
-".	c #DDD5C1",
-"+	c #FFFFFF",
-"@	c #B0A384",
-"#	c #B5A781",
-"$	c #0E0400",
-"%	c #000000",
-"&	c #5D4D2D",
-"*	c #5B4103",
-"=	c #EFEBDB",
-"-	c #9B9791",
-";	c #9C9892",
-">	c #8F8DA5",
-",	c #302157",
-"'	c #A8A7BB",
-")	c #7B76AE",
-"!	c #7C77AF",
-"~	c #7C75AD",
-"{	c #B0B0E2",
-"]	c #5E4D2A",
-"^	c #646464",
-"                        ",
-"                        ",
-".+++++++++++++++++++++@ ",
-"#$%%%%%%%%%%%%%%%%%%%&*%",
-"#*===================#*%",
-"#*====--;--------====#*%",
-"#*===-+++++++++++-===#*%",
-"#*==-++++++++++++++==#*%",
-"#*=-++>,>+++++++++++=#*%",
-"#*=-++,,,++++++>,>++=#*%",
-"#*=-++>,>++++++,,,++=#*%",
-"#*=-++')'+>,>++>,>++=#*%",
-"#*=-++!!!+,,,++'~'++=#*%",
-"#*=-+>!!!>{,{+>!!!>+=#*%",
-"#*=-+!!!!!'!'+>!!!>+=#*%",
-"#*==-!!!!'!!!'!!!!!==#*%",
-"#*===-!!'!!!!!'!!!===#*%",
-"#*====!!!!!!!!!!!====#*%",
-"#*===================#*%",
-"#@+++++++++++++++++++.*%",
-"]%%%%%%%%%%%%%%%%%%%%%$%",
-"  %%%%%%%%%%%%%%%%%%%%%%",
-"   ^^^^^^^^^^^^^^^^^^^^^",
-"                        "};