From 5c80d100b746bf99a4d645aed6b57871b514c8a9 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Thu, 27 Sep 2007 21:34:00 +0000
Subject: [PATCH] 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
---
configure.ac | 2 +-
src/common/connection_handlers.py | 8 +++++---
src/common/defs.py | 2 +-
src/common/optparser.py | 2 ++
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6a9439ba2d..2110a4f026 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
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])
AM_INIT_AUTOMAKE([1.8])
AC_CONFIG_HEADER(config.h)
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index e9b27a6387..4fbba26da6 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -647,7 +647,8 @@ class ConnectionDisco:
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 @@ class ConnectionDisco:
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 @@ class ConnectionVcard:
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):
diff --git a/src/common/defs.py b/src/common/defs.py
index d557e6912e..18af3b5c6a 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -2,7 +2,7 @@ docdir = '../'
datadir = '../'
-version = '0.11.1.5'
+version = '0.11.2.0-svn'
import sys, os.path
for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 6123ab5671..cfed4994db 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -61,6 +61,7 @@ class OptionsParser:
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 @@ class OptionsParser:
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
--
GitLab