scope fixes

svn: r1212

src/plugins/DesGraph.py

@@ -84,17 +84,17 @@ class DescendantReport:
         self.text = {}
         for (p,x,y) in self.v:
 
-            self.text[p] = []
+            self.text[p.getId()] = []
             subst = SubstKeywords(p)
             for line in self.display:
-                self.text[p].append(subst.replace(line))
+                self.text[p.getId()].append(subst.replace(line))
 
             self.font = self.doc.style_list["Normal"].get_font()
-            for line in self.text[p]:
+            for line in self.text[p.getId()]:
                 new_width = string_width(self.font,line)
                 self.box_width = max(self.box_width,new_width)
 
-            self.lines = max(self.lines,len(self.text[p]))    
+            self.lines = max(self.lines,len(self.text[p.getId()]))    
 
     def write_report(self):
 
@@ -242,7 +242,7 @@ class DescendantReport:
 
         if plist:
             for (p,x,y) in plist:
-                name = string.join(self.text[p],"\n")
+                name = string.join(self.text[p.getId()],"\n")
                 x = (x-1)*delta + left + _sep
                 y = (y-1)*(self.height+_sep)+top
                 self.doc.draw_box("box",name,x,y)

src/plugins/ReadGedcom.py

@@ -1414,7 +1414,7 @@ class GedcomParser:
                     self.code = ANSEL
                     self.cnv = ansel_to_utf8
                 else:
-                    self.cnv = latin_to_utf8
+                    self.cnv = latin_utf8.latin_to_utf8
                 self.ignore_sub_junk(2)
                 self.update(self.encoding_obj,matches[2])
    	    elif matches[1] == "GEDC":

src/plugins/WebPage.py

@@ -784,8 +784,8 @@ class WebReport(Report):
             idoc.create_page()
             idoc.close()
             self.progress_bar_step()
-            while events_pending():
-                mainiteration()
+            while gtk.events_pending():
+                gtk.mainiteration()
             
         if len(ind_list) > 1:
             self.dump_index(ind_list,self.selected_style,