From 61a5f5e168f782d8885d2cdf43ae2e9c8533cd80 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 13 Apr 2005 18:16:20 +0000 Subject: [PATCH] * src/plugins/WebPage.py: fixed check on dialog run() return value, changed deprecated gtk.mainiteration to gtk.main_iteration svn: r4358 --- ChangeLog | 2 ++ src/plugins/WebPage.py | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 820c139a9..15d6c40fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ 2005-04-13 Don Allingham + * src/plugins/WebPage.py: fixed check on dialog run() return value, + changed deprecated gtk.mainiteration to gtk.main_iteration * src/WriteGedcom.py: fixed problem with skipping events 2005-04-12 Don Allingham diff --git a/src/plugins/WebPage.py b/src/plugins/WebPage.py index 2e45f2970..4c30f3c5c 100644 --- a/src/plugins/WebPage.py +++ b/src/plugins/WebPage.py @@ -1124,8 +1124,9 @@ class WebReport(Report.Report): ErrorDialog(_("Could not create the directory: %s") % \ image_dir_name) return - - ind_list = self.filter.apply(self.database,self.database.get_person_handles(sort_handles=False)) + + ind_list = self.database.get_person_handles(sort_handles=False) + ind_list = self.filter.apply(self.database,ind_list) progress_steps = len(ind_list) if len(ind_list) > 1: progress_steps = progress_steps+1 @@ -1161,25 +1162,25 @@ class WebReport(Report.Report): idoc.close() self.progress_bar_step() while gtk.events_pending(): - gtk.mainiteration() + gtk.main_iteration() if len(ind_list) > 1: self.dump_index(ind_list,self.selected_style, self.ind_template_name,dir_name) self.progress_bar_step() while gtk.events_pending(): - gtk.mainiteration() + gtk.main_iteration() if self.use_gendex == 1: self.dump_gendex(ind_list,dir_name) self.progress_bar_step() while gtk.events_pending(): - gtk.mainiteration() + gtk.main_iteration() if self.use_places == 1: self.dump_places(ind_list,self.selected_style, self.ind_template_name,dir_name) self.progress_bar_step() while gtk.events_pending(): - gtk.mainiteration() + gtk.main_iteration() self.progress_bar_done() def add_styles(self,doc): @@ -1702,7 +1703,7 @@ class WebReportDialog(Report.ReportDialog): name,translated_name) response = self.window.run() - if response == True: + if response == gtk.RESPONSE_OK: try: self.make_report() except (IOError,OSError),msg: