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

Timestamp:

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

Author:

asterix

Message:

merge diff from trunk

Files:

• branches/pep/src/common/caps.py (modified) (2 diffs)

branches/pep/src/common/caps.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/>.
 ##
 
@@ -245 +250 @@
                 if not contact.caps_node: return # we didn't asked for that?
                 if not node.startswith(contact.caps_node+'#'): return
-                node, ext = node.split('#')
+                node, ext = node.split('#', 1)
                 if ext==contact.caps_ver:       # this can be also version (like '0.9')
                         exts=None