Revert r16140

svn: r16141
This commit is contained in:
Nick Hall 2010-11-04 23:34:23 +00:00
parent 2ffb6993b7
commit d5dabdbc93
2 changed files with 8 additions and 9 deletions

View File

@ -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)

View File

@ -664,7 +664,7 @@ class ViewManager(CLIManager):
('HomePage', None, _('Gramps _Home Page'), None, None,
home_page_activate),
('MailingLists', None, _('Gramps _Mailing Lists'), None, None,
self.mailing_lists_activate),
mailing_lists_activate),
('ReportBug', None, _('_Report a Bug'), None, None,
report_bug_activate),
('ExtraPlugins', None, _('_Extra Reports/Tools'), None, None,
@ -1657,13 +1657,6 @@ class ViewManager(CLIManager):
ofile.write('</menu></menubar></ui>')
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()
@ -1701,6 +1694,12 @@ 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