Ticket #378: patch-gajim-rosterx-send.diff

src/roster_window.py

@@ -3375 +3375 @@
                         data = model[path][C_JID]
                 selection.set(selection.target, 8, data)
 
+
+        def on_drop_rosterx(self, widget, account_source, c_source, account_dest,
+                c_dest, was_big_brother, context, etime):
+                msg = common.xmpp.Message (to = c_dest.get_full_jid(), body = _('Sent contact "%s" (%s)' % (c_source.get_full_jid(), c_source.get_shown_name())))
+                x = msg.addChild (name='x', namespace='http://jabber.org/protocol/rosterx')
+                x.addChild (name='item', attrs={'action':'add','jid':c_source.jid,'name':c_source.get_shown_name()})
+                gajim.connections[account_dest].send_stanza (msg)
+
         def on_drop_in_contact(self, widget, account_source, c_source, account_dest,
                 c_dest, was_big_brother, context, etime):
                 # children must take the new tag too, so remember old tag
@@ -3558 +3566 @@
                         if not c_dest:
                                 # c_dest is None if jid_dest doesn't belong to account
                                 return
-                        self.on_drop_in_contact(treeview, account_source, c_source,
-                                account_dest, c_dest, is_big_brother, context, etime)
-                        return
+##                      self.on_drop_in_contact(treeview, account_source, c_source,
+##                              account_dest, c_dest, is_big_brother, context, etime)
+##                      return
                 # We upgrade only the first user because user2.groups is a pointer to
                 # user1.groups
                 if context.action == gtk.gdk.ACTION_COPY:
@@ -3568 +3576 @@
                                 context, etime)
                 else:
                         menu = gtk.Menu()
-                        item = gtk.MenuItem(_('Drop %s in group %s') % (c_source.name,
-                                grp_dest))
-                        item.connect('activate', self.on_drop_in_group, account_dest, c_source,
-                                grp_dest, context, etime, grp_source)
-                        menu.append(item)
+
+                        if grp_source != grp_dest:
+                                item = gtk.MenuItem(_('Drop %s in group %s') % (c_source.name,
+                                        grp_dest))
+                                item.connect('activate', self.on_drop_in_group, account_dest, c_source,
+                                        grp_dest, context, etime, grp_source)
+                                menu.append(item)
+
                         c_dest = gajim.contacts.get_contact_with_highest_priority(
                                 account_dest, jid_dest)
                         item = gtk.MenuItem(_('Make %s and %s metacontacts') % (c_source.name,
@@ -3585 +3596 @@
                         
                         menu.append(item)
 
+                        item = gtk.MenuItem(_('Send %s to %s') % (c_source.name, c_dest.name))
+                        item.connect('activate', self.on_drop_rosterx, account_source, c_source, account_dest, c_dest, is_big_brother, context, etime)
+                        menu.append(item)
+
                         menu.attach_to_widget(self.tree, None)
                         menu.connect('selection-done', gtkgui_helpers.destroy_widget)
                         menu.show_all()

src/common/connection_handlers.py

@@ -662 +662 @@
                 feature = common.xmpp.Node('feature')
                 feature.setAttr('var', common.xmpp.NS_FILE)
                 query.addChild(node=feature)
+                # roster exchange
+                feauture = common.xmpp.Node('feature')
+                feature.setAttr('var', common.xmpp.NS_ROSTERX)
+                query.addChild(node=feature)
                 
                 self.connection.send(iq)
                 raise common.xmpp.NodeProcessed
@@ -710 +714 @@
                 q.addChild('feature', attrs = {'var': common.xmpp.NS_SI})
                 q.addChild('feature', attrs = {'var': common.xmpp.NS_FILE})
                 q.addChild('feature', attrs = {'var': common.xmpp.NS_MUC})
+                q.addChild('feature', attrs = {'var': common.xmpp.NS_ROSTERX})
                 self.connection.send(iq)
                 raise common.xmpp.NodeProcessed
 
@@ -789 +794 @@
                 ''' advertise our capabilities in presence stanza (jep-0115)'''
                 c = p.setTag('c', namespace = common.xmpp.NS_CAPS)
                 c.setAttr('node', 'http://gajim.org/caps')
-                c.setAttr('ext', 'ftrans')
+                c.setAttr('ext', 'ftrans rosterx')
                 c.setAttr('ver', gajim.version)
                 return p