Ticket #3103: pubsub-diff-gajim.diff

src/disco.py

@@ -75 +75 @@
                 ('_jid', 'weather'):                    (False, 'weather.png'),
                 ('gateway', 'sip'):                     (False, 'sip.png'),
                 ('directory', 'user'):          (None, 'jud.png'),
-                ('pubsub', 'generic'):          (None, 'pubsub.png'),
+                ('pubsub', 'generic'):          (PubSubBrowser, 'pubsub.png'),
                 ('pubsub', 'service'):          (PubSubBrowser, 'pubsub.png'),
                 ('proxy', 'bytestreams'):       (None, 'bytestreams.png'), # Socks5 FT proxy
 
@@ -1723 +1723 @@
                 ''' Create treemodel for the window. '''
                 # JID, node, name (with description) - pango markup, dont have info?, subscribed?
                 self.model = gtk.ListStore(str, str, str, bool, bool)
-                self.model.set_sort_column_id(3, gtk.SORT_ASCENDING)
+                # sort by node 
+                self.model.set_sort_column_id(2, gtk.SORT_ASCENDING)
                 self.window.services_treeview.set_model(self.model)
 
-                # Name column
-                # Pango markup for name and description, description printed with
-                # <small/> font
+                # Node Column
                 renderer = gtk.CellRendererText()
-                col = gtk.TreeViewColumn(_('Name'))
+                col = gtk.TreeViewColumn(_('Node'))
                 col.pack_start(renderer)
-                col.set_attributes(renderer, markup=2)
+                col.set_attributes(renderer, markup=1)
                 col.set_resizable(True)
                 self.window.services_treeview.insert_column(col, -1)
-
+        
+                
+                
                 # Subscription state
                 renderer = gtk.CellRendererToggle()
                 col = gtk.TreeViewColumn(_('Subscribed'))
@@ -1743 +1744 @@
                 col.set_attributes(renderer, inconsistent=3, active=4)
                 col.set_resizable(False)
                 self.window.services_treeview.insert_column(col, -1)
-
+                
+                # Name column
+                # Pango markup for name and description, description printed with
+                # <small/> font
+                renderer = gtk.CellRendererText()
+                col = gtk.TreeViewColumn(_('Name'))
+                col.pack_start(renderer)
+                col.set_attributes(renderer, markup=2)
+                col.set_resizable(True)
+                self.window.services_treeview.insert_column(col, -1)
                 self.window.services_treeview.set_headers_visible(True)
 
         def _add_item(self, jid, node, item, force):
@@ -1760 +1770 @@
 
                 name = gobject.markup_escape_text(name)
                 name = '<b>%s</b>' % name
-
+                
                 self.model.append((jid, node, name, dunno, subscribed))
 
         def _add_actions(self):

src/common/connection_handlers.py

@@ -1516 +1516 @@
                 if items is None: return
 
                 for item in items.getTags('item'):
-                        # check for event type (for now only one type supported: pubsub.com events)
-                        child = item.getTag('pubsub-message')
-                        if child is not None:
-                                # we have pubsub.com notification
-                                child = child.getTag('feed')
-                                if child is None: continue
-
-                                for entry in child.getTags('entry'):
-                                        # for each entry in feed (there shouldn't be more than one,
-                                        # but to be sure...
-                                        self.dispatch('ATOM_ENTRY', (atom.OldEntry(node=entry),))
+                        entry = item.getTag('entry')
+                        if entry is not None:
+                                # for each entry in feed (there shouldn't be more than one,
+                                # but to be sure...
+                                self.dispatch('ATOM_ENTRY', (atom.OldEntry(node=entry),))
                                 continue
                         # unknown type... probably user has another client who understands that event
-                
                 raise common.xmpp.NodeProcessed
 
         def _presenceCB(self, con, prs):

src/common/atom.py

@@ -63 +63 @@
                 else:
                         main_feed = None
 
-                if self.getTag('source-feed') is not None:
-                        source_feed = self.getTag('source-feed').getTagData('title')
+                if self.getTag('feed') is not None:
+                        source_feed = self.getTag('feed').getTagData('title')
                 else:
                         source_feed = None
+                
 
                 if main_feed is not None and source_feed is not None:
                         return u'%s: %s' % (main_feed, source_feed)
@@ -78 +79 @@
                         return u''
 
         feed_title = property(get_feed_title, None, None, 
-                ''' Title of feed. It is built from entry's original feed title and title of feed
+                ''' Title of feed. It is built from entry''s original feed title and title of feed
                 which delivered this entry. ''')
 
         def get_feed_link(self):
-                ''' Get a link to main page of feed (in pubsub.com: second link of rel='alternate',
-                first contains raw xml data). '''
+                ''' Get source link '''
                 try:
-                        return self.getTag('source-feed').getTags('link', {'rel':'alternate'})[1].getData()
+                        return self.getTag('feed').getTags('link',{'rel':'alternate'})[1].getData()
                 except:
                         return None