Changeset 9123 for branches/pep/src/common/commands.py

Timestamp:

12/12/07 09:44:46 (12 months ago)

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/pep/src/common/commands.py (modified) (5 diffs)

branches/pep/src/common/commands.py

@@ -2 +2 @@
 ## Copyright (C) 2006 Gajim Team
 ##
-## This program is free software; you can redistribute it and/or modify
+## This file is part of Gajim.
+##
+## Gajim is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; version 2 only.
-##
-## This program is distributed in the hope that it will be useful,
+## by the Free Software Foundation; version 3 only.
+##
+## Gajim is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Gajim.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
@@ -163 +168 @@
 class LeaveGroupchatsCommand(AdHocCommand):
         commandnode = 'leave-groupchats'
-        commandname = 'Leave Groupchats'
+        commandname = _('Leave Groupchats')
 
         @staticmethod
@@ -289 +294 @@
                 jid = helpers.get_full_jid_from_iq(iq_obj)
                 q = iq.getTag('query')
+                # buildReply don't copy the node attribute. Re-add it
+                q.setAttr('node', xmpp.NS_COMMANDS)
 
                 for node, cmd in self.__commands.iteritems():
@@ -300 +307 @@
                 self.connection.send(iq)
 
-        def commandQuery(self, con, iq_obj):
-                ''' Send disco result for query for command (JEP-0050, example 6.).
+        def commandInfoQuery(self, con, iq_obj):
+                ''' Send disco#info result for query for command (JEP-0050, example 6.).
                 Return True if the result was sent, False if not. '''
                 jid = helpers.get_full_jid_from_iq(iq_obj)
@@ -319 +326 @@
                                 q.addChild('feature', attrs = {'var': feature})
 
+                        self.connection.send(iq)
+                        return True
+
+                return False
+
+        def commandItemsQuery(self, con, iq_obj):
+                ''' Send disco#items result for query for command.
+                Return True if the result was sent, False if not. '''
+                jid = helpers.get_full_jid_from_iq(iq_obj)
+                node = iq_obj.getTagAttr('query', 'node')
+
+                if node not in self.__commands: return False
+
+                cmd = self.__commands[node]
+                if cmd.isVisibleFor(self.isSameJID(jid)):
+                        iq = iq_obj.buildReply('result')
                         self.connection.send(iq)
                         return True