Changeset 9123 for branches/pep/src/adhoc_commands.py

Timestamp:

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

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/pep/src/adhoc_commands.py (modified) (3 diffs)

branches/pep/src/adhoc_commands.py

@@ -2 +2 @@
 ##      adhoc_commands.py
 ##
-## Copyright (C) 2006 Yann Le Boulanger <asterix@lagaule.org>
+## Copyright (C) 2006 Yann Leboulanger <asterix@lagaule.org>
 ##                    Nikos Kouremenos <nkour@jabber.org>
 ##
-## 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.
+## by the Free Software Foundation; version 3 only.
 ##
-## This program is distributed in the hope that it will be useful,
+## 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/>.
 
 # FIXME: think if we need caching command list. it may be wrong if there will
@@ -287 +292 @@
                 self.sending_form_progressbar.hide()
 
-                if not self.sessionid:
-                        self.sessionid = command.getAttr('sessionid')
+                self.sessionid = command.getAttr('sessionid')
 
                 self.form_status = command.getAttr('status')
@@ -447 +451 @@
                         # commands => command selection stage
                         query = response.getTag('query')
-                        if query:
+                        if query and query.getAttr('node') == xmpp.NS_COMMANDS:
                                 items = query.getTags('item')
                         else: