Author: asterix Date: 2007-09-27 23:34:00 +0200 (Thu, 27 Sep 2007) New Revision: 8872

Modified: trunk/configure.ac trunk/src/common/connection_handlers.py trunk/src/common/defs.py trunk/src/common/optparser.py Log: handle - in version name. It's not taken into account for config file updates and caps. fixes #3011. svn version is not 0.11.2.0-svn

Modified: trunk/configure.ac =================================================================== --- trunk/configure.ac 2007-09-27 20:39:42 UTC (rev 8871) +++ trunk/configure.ac 2007-09-27 21:34:00 UTC (rev 8872) @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.11.1.5],[http://trac.gajim.org/%5D,%5Bgajim]) + [0.11.2.0-svn],[http://trac.gajim.org/%5D,%5Bgajim]) AC_PREREQ([2.59]) AM_INIT_AUTOMAKE([1.8]) AC_CONFIG_HEADER(config.h)

Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-09-27 20:39:42 UTC (rev 8871) +++ trunk/src/common/connection_handlers.py 2007-09-27 21:34:00 UTC (rev 8872) @@ -647,7 +647,8 @@ common.xmpp.NS_DISCO, frm = to) iq.setAttr('id', id) query = iq.setTag('query') - query.setAttr('node','http://gajim.org/caps#' + gajim.version) + query.setAttr('node','http://gajim.org/caps#' + gajim.version.split('-', + 1)[0]) for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, \ common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): feature = common.xmpp.Node('feature') @@ -726,7 +727,8 @@ extension = None if node and node.find('#') != -1: extension = node[node.index('#') + 1:] - client_version = 'http://gajim.org/caps#' + gajim.version + client_version = 'http://gajim.org/caps#' + gajim.version.split('-', + 1)[0]

if node in (None, client_version): q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM}) @@ -848,7 +850,7 @@

if len(ext): c.setAttr('ext', ' '.join(ext)) - c.setAttr('ver', gajim.version) + c.setAttr('ver', gajim.version.split('-', 1)[0]) return p def node_to_dict(self, node):

Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2007-09-27 20:39:42 UTC (rev 8871) +++ trunk/src/common/defs.py 2007-09-27 21:34:00 UTC (rev 8872) @@ -2,7 +2,7 @@

datadir = '../'

-version = '0.11.1.5' +version = '0.11.2.0-svn'

import sys, os.path for base in ('.', 'common'):

Modified: trunk/src/common/optparser.py =================================================================== --- trunk/src/common/optparser.py 2007-09-27 20:39:42 UTC (rev 8871) +++ trunk/src/common/optparser.py 2007-09-27 21:34:00 UTC (rev 8872) @@ -61,6 +61,7 @@ return

new_version = gajim.config.get('version') + new_version = new_version.split('-', 1)[0] for line in fd.readlines(): try: line = line.decode('utf-8') @@ -68,6 +69,7 @@ line = line.decode(locale.getpreferredencoding()) self.read_line(line) old_version = gajim.config.get('version') + old_version = old_version.split('-', 1)[0]

self.update_config(old_version, new_version) self.old_values = {} # clean mem