copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Yann Leboulanger 2007-09-27 21:34:00 +00:00
parent 530cc9e62f
commit 5c80d100b7
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -1,5 +1,5 @@
AC_INIT([Gajim - A Jabber Instant Messager], AC_INIT([Gajim - A Jabber Instant Messager],
[0.11.1.5],[http://trac.gajim.org/],[gajim]) [0.11.2.0-svn],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.8]) AM_INIT_AUTOMAKE([1.8])
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)

8
src/common/connection_handlers.py
View file

@ -647,7 +647,8 @@ class ConnectionDisco:
common.xmpp.NS_DISCO, frm = to) common.xmpp.NS_DISCO, frm = to)
iq.setAttr('id', id) iq.setAttr('id', id)
query = iq.setTag('query') 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, \ for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, \
common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS): common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS):
feature = common.xmpp.Node('feature') feature = common.xmpp.Node('feature')
@ -726,7 +727,8 @@ class ConnectionDisco:
extension = None extension = None
if node and node.find('#') != -1: if node and node.find('#') != -1:
extension = node[node.index('#') + 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): if node in (None, client_version):
q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM}) q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM})
@ -848,7 +850,7 @@ class ConnectionVcard:
if len(ext): if len(ext):
c.setAttr('ext', ' '.join(ext)) c.setAttr('ext', ' '.join(ext))
c.setAttr('ver', gajim.version) c.setAttr('ver', gajim.version.split('-', 1)[0])
return p return p
def node_to_dict(self, node): def node_to_dict(self, node):

2
src/common/defs.py
View file

@ -2,7 +2,7 @@ docdir = '../'
datadir = '../' datadir = '../'
version = '0.11.1.5' version = '0.11.2.0-svn'
import sys, os.path import sys, os.path
for base in ('.', 'common'): for base in ('.', 'common'):

2
src/common/optparser.py
View file

@ -61,6 +61,7 @@ class OptionsParser:
return return
new_version = gajim.config.get('version') new_version = gajim.config.get('version')
new_version = new_version.split('-', 1)[0]
for line in fd.readlines(): for line in fd.readlines():
try: try:
line = line.decode('utf-8') line = line.decode('utf-8')
@ -68,6 +69,7 @@ class OptionsParser:
line = line.decode(locale.getpreferredencoding()) line = line.decode(locale.getpreferredencoding())
self.read_line(line) self.read_line(line)
old_version = gajim.config.get('version') old_version = gajim.config.get('version')
old_version = old_version.split('-', 1)[0]
self.update_config(old_version, new_version) self.update_config(old_version, new_version)
self.old_values = {} # clean mem self.old_values = {} # clean mem