From bb753b0d2af779438849c49eb577f33ec322f26d Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 10 Mar 2011 19:02:36 +0100 Subject: [PATCH] [sulfur] improve reliability of load_url() usage in notice board item window --- sulfur/src/sulfur/dialogs.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sulfur/src/sulfur/dialogs.py b/sulfur/src/sulfur/dialogs.py index 79f7a064b..1e32093ab 100644 --- a/sulfur/src/sulfur/dialogs.py +++ b/sulfur/src/sulfur/dialogs.py @@ -486,7 +486,8 @@ class RmNoticeBoardMenu(MenuSkel): gtk.link_button_set_uri_hook(self.load_url, data=self.url) def load_url(self, widget, url, extra): - load_url(url) + if url: + load_url(url) def on_rmNoticeBoardCloseButton_clicked(self, widget): self.rm_ui.rmNoticeBoardInfo.hide() @@ -505,9 +506,10 @@ class RmNoticeBoardMenu(MenuSkel): self.rm_ui.rmNoticeBoardIdLabel.set_text(str(item['id'])) self.rm_ui.rmNoticeBoardDateLabel.set_text(cleanMarkupString(item['pubDate'])) self.rm_ui.rmNoticeBoardTitleLabel.set_text(cleanMarkupString(item['title'])) - self.rm_ui.rmNoticeBoardLinkLabel.set_label(item['link']) - self.rm_ui.rmNoticeBoardLinkLabel.set_uri(item['link']) - self.url = item['link'] + if item['link']: + self.rm_ui.rmNoticeBoardLinkLabel.set_label(entropy.tools.spliturl(item['link']).netloc) + self.rm_ui.rmNoticeBoardLinkLabel.set_uri(item['link']) + self.url = item['link'] self.rm_ui.rmNoticeBoardTextLabel.set_text(cleanMarkupString(item['description'])) bold_items = [