From 2ffb6993b7a0a72afd2d7c972525110adf30e310 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Thu, 4 Nov 2010 23:30:34 +0000 Subject: [PATCH] Committed by mistake svn: r16140 --- src/GrampsDisplay.py | 2 +- src/gui/viewmanager.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/GrampsDisplay.py b/src/GrampsDisplay.py index a927f2f75..afbcfc921 100644 --- a/src/GrampsDisplay.py +++ b/src/GrampsDisplay.py @@ -78,7 +78,7 @@ def url(link, uistate=None): """ Open the specified URL in a browser. """ - if uistate and config.get('htmlview.url-handler'): + if uistate: # and config.get('htmlview.url-handler'): cat_num = uistate.viewmanager.get_category('Web') if cat_num is not None: page = uistate.viewmanager.goto_page(cat_num, None) diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index c255d7e73..1cb914226 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -664,7 +664,7 @@ class ViewManager(CLIManager): ('HomePage', None, _('Gramps _Home Page'), None, None, home_page_activate), ('MailingLists', None, _('Gramps _Mailing Lists'), None, None, - mailing_lists_activate), + self.mailing_lists_activate), ('ReportBug', None, _('_Report a Bug'), None, None, report_bug_activate), ('ExtraPlugins', None, _('_Extra Reports/Tools'), None, None, @@ -1657,6 +1657,13 @@ class ViewManager(CLIManager): ofile.write('') return (ofile.getvalue(), actions) + def mailing_lists_activate(self, obj): + """ + Display the mailing list web page + """ + GrampsDisplay.url(const.URL_MAILINGLIST, self.uistate) + + def display_about_box(obj): """Display the About box.""" about = GrampsAboutDialog() @@ -1694,12 +1701,6 @@ def home_page_activate(obj): """ GrampsDisplay.url(const.URL_HOMEPAGE) -def mailing_lists_activate(obj): - """ - Display the mailing list web page - """ - GrampsDisplay.url(const.URL_MAILINGLIST) - def extra_plugins_activate(obj): """ Display the wiki page with extra plugins