diff options
| -rw-r--r-- | src/atom_window.py | 40 | ||||
| -rw-r--r-- | src/common/pep.py | 2 | ||||
| -rw-r--r-- | src/common/xmpp/protocol.py | 1 |
3 files changed, 24 insertions, 19 deletions
diff --git a/src/atom_window.py b/src/atom_window.py index 53f86ab37..70d47e2f2 100644 --- a/src/atom_window.py +++ b/src/atom_window.py @@ -53,15 +53,16 @@ class AtomWindow: """ Create new window... only if we have anything to show """ - assert len(self.__class__.entries)>0 + assert len(self.__class__.entries) - self.entry = None # the entry actually displayed + self.entry = None # the entry actually displayed self.xml = gtkgui_helpers.get_gtk_builder('atom_entry_window.ui') self.window = self.xml.get_object('atom_entry_window') - for name in ('new_entry_label', 'feed_title_label', 'feed_title_eventbox', - 'feed_tagline_label', 'entry_title_label', 'entry_title_eventbox', - 'last_modified_label', 'close_button', 'next_button'): + for name in ('new_entry_label', 'feed_title_label', + 'feed_title_eventbox', 'feed_tagline_label', 'entry_title_label', + 'entry_title_eventbox', 'last_modified_label', 'close_button', + 'next_button'): self.__dict__[name] = self.xml.get_object(name) self.displayNextEntry() @@ -83,23 +84,26 @@ class AtomWindow: # fill the fields if newentry.feed_link is not None: self.feed_title_label.set_markup( - u'<span foreground="blue" underline="single">%s</span>' % \ - gobject.markup_escape_text(newentry.feed_title)) + u'<span foreground="blue" underline="single">%s</span>' % \ + gobject.markup_escape_text(newentry.feed_title)) else: self.feed_title_label.set_markup( - gobject.markup_escape_text(newentry.feed_title)) + gobject.markup_escape_text(newentry.feed_title)) self.feed_tagline_label.set_markup( - u'<small>%s</small>' % \ - gobject.markup_escape_text(newentry.feed_tagline)) + u'<small>%s</small>' % \ + gobject.markup_escape_text(newentry.feed_tagline)) - if newentry.uri is not None: - self.entry_title_label.set_markup( + if newentry.title: + if newentry.uri is not None: + self.entry_title_label.set_markup( u'<span foreground="blue" underline="single">%s</span>' % \ gobject.markup_escape_text(newentry.title)) - else: - self.entry_title_label.set_markup( + else: + self.entry_title_label.set_markup( gobject.markup_escape_text(newentry.title)) + else: + self.entry_title_label.set_markup('') self.last_modified_label.set_text(newentry.updated) @@ -114,11 +118,11 @@ class AtomWindow: changed """ count = len(self.__class__.entries) - if count>0: + if count: self.new_entry_label.set_text(i18n.ngettext( - 'You have received new entries (and %d not displayed):', - 'You have received new entries (and %d not displayed):', count, - count, count)) + 'You have received new entries (and %d not displayed):', + 'You have received new entries (and %d not displayed):', count, + count, count)) self.next_button.set_sensitive(True) else: self.new_entry_label.set_text(_('You have received new entry:')) diff --git a/src/common/pep.py b/src/common/pep.py index 21d6fe94f..255d0fe3a 100644 --- a/src/common/pep.py +++ b/src/common/pep.py @@ -544,7 +544,7 @@ class ConnectionPEP(object): items = event_tag.getTag('items') if items: for item in items.getTags('item'): - entry = item.getTag('entry') + entry = item.getTag('entry', namespace=xmpp.NS_ATOM) if entry: # for each entry in feed (there shouldn't be more than one, # but to be sure... diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py index 750cd7bf9..a14eb8dca 100644 --- a/src/common/xmpp/protocol.py +++ b/src/common/xmpp/protocol.py @@ -28,6 +28,7 @@ NS_ADDRESS ='http://jabber.org/protocol/address' NS_AGENTS ='jabber:iq:agents' NS_AMP ='http://jabber.org/protocol/amp' NS_AMP_ERRORS =NS_AMP+'#errors' +NS_ATOM ='http://www.w3.org/2005/Atom' NS_AUTH ='jabber:iq:auth' NS_AVATAR ='http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND ='urn:ietf:params:xml:ns:xmpp-bind' |