svn version is 0.11.1.1, not 0.12
This commit is contained in:
parent
1dd251bb91
commit
161cdf1e49
3 changed files with 6 additions and 6 deletions
|
@ -1,5 +1,5 @@
|
||||||
AC_INIT([Gajim - A Jabber Instant Messager],
|
AC_INIT([Gajim - A Jabber Instant Messager],
|
||||||
[0.11.1.0],[http://trac.gajim.org/],[gajim])
|
[0.11.1.1],[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)
|
||||||
|
|
|
@ -2,7 +2,7 @@ docdir = '../'
|
||||||
|
|
||||||
datadir = '../'
|
datadir = '../'
|
||||||
|
|
||||||
version = '0.11.1.0'
|
version = '0.11.1.1'
|
||||||
|
|
||||||
import sys, os.path
|
import sys, os.path
|
||||||
for base in ('.', 'common'):
|
for base in ('.', 'common'):
|
||||||
|
|
|
@ -153,8 +153,8 @@ class OptionsParser:
|
||||||
self.update_config_to_01101()
|
self.update_config_to_01101()
|
||||||
if old < [0, 11, 0, 2] and new >= [0, 11, 0, 2]:
|
if old < [0, 11, 0, 2] and new >= [0, 11, 0, 2]:
|
||||||
self.update_config_to_01102()
|
self.update_config_to_01102()
|
||||||
if old < [0, 12] and new >= [0, 12]:
|
if old < [0, 11, 1, 1] and new >= [0, 11, 1, 1]:
|
||||||
self.update_config_to_012()
|
self.update_config_to_01111()
|
||||||
|
|
||||||
gajim.logger.init_vars()
|
gajim.logger.init_vars()
|
||||||
gajim.config.set('version', new_version)
|
gajim.config.set('version', new_version)
|
||||||
|
@ -387,11 +387,11 @@ class OptionsParser:
|
||||||
self.old_values['ft_override_host_to_send'])
|
self.old_values['ft_override_host_to_send'])
|
||||||
gajim.config.set('version', '0.11.0.2')
|
gajim.config.set('version', '0.11.0.2')
|
||||||
|
|
||||||
def update_config_to_012(self):
|
def update_config_to_01111(self):
|
||||||
'''always_hide_chatbuttons -> compact_view'''
|
'''always_hide_chatbuttons -> compact_view'''
|
||||||
if self.old_values.has_key('always_hide_groupchat_buttons') and \
|
if self.old_values.has_key('always_hide_groupchat_buttons') and \
|
||||||
self.old_values.has_key('always_hide_chat_buttons'):
|
self.old_values.has_key('always_hide_chat_buttons'):
|
||||||
gajim.config.set('compact_view', self.old_values['always_hide_groupchat_buttons'] and \
|
gajim.config.set('compact_view', self.old_values['always_hide_groupchat_buttons'] and \
|
||||||
self.old_values['always_hide_chat_buttons'])
|
self.old_values['always_hide_chat_buttons'])
|
||||||
gajim.config.set('version', '0.12')
|
gajim.config.set('version', '0.11.1.1')
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue