Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Weblate
gajim
Commits
4ce9d890
Commit
4ce9d890
authored
17 years ago
by
Liorithiel
Browse files
Options
Downloads
Patches
Plain Diff
caps: Real fix for [3295] -- changing separator from ' ' to '\0'.
parent
38753884
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure.ac
+1
-1
1 addition, 1 deletion
configure.ac
src/common/defs.py
+1
-1
1 addition, 1 deletion
src/common/defs.py
src/common/logger.py
+2
-2
2 additions, 2 deletions
src/common/logger.py
src/common/optparser.py
+21
-0
21 additions, 0 deletions
src/common/optparser.py
with
25 additions
and
4 deletions
configure.ac
+
1
−
1
View file @
4ce9d890
AC_INIT([Gajim - A Jabber Instant Messager],
[0.11.1.
4
],[http://trac.gajim.org/],[gajim])
[0.11.1.
5
],[http://trac.gajim.org/],[gajim])
AC_PREREQ([2.59])
AM_INIT_AUTOMAKE([1.8])
AC_CONFIG_HEADER(config.h)
...
...
This diff is collapsed.
Click to expand it.
src/common/defs.py
+
1
−
1
View file @
4ce9d890
...
...
@@ -2,7 +2,7 @@ docdir = '../'
datadir
=
'
../
'
version
=
'
0.11.1.
4
'
version
=
'
0.11.1.
5
'
import
sys
,
os
.
path
for
base
in
(
'
.
'
,
'
common
'
):
...
...
This diff is collapsed.
Click to expand it.
src/common/logger.py
+
2
−
2
View file @
4ce9d890
...
...
@@ -664,7 +664,7 @@ class Logger:
# (format: (category, type, name, category, type, name, ...
# ..., 'FEAT', feature1, feature2, ...).join(' '))
# NOTE: if there's a need to do more gzip, put that to a function
data
=
GzipFile
(
fileobj
=
StringIO
(
str
(
data
))).
read
().
split
(
'
'
)
# (2) -- note above
data
=
GzipFile
(
fileobj
=
StringIO
(
str
(
data
))).
read
().
split
(
'
\0
'
)
# (2) -- note above
i
=
0
identities
=
set
()
features
=
set
()
...
...
@@ -694,7 +694,7 @@ class Logger:
data
.
extend
(
identity
)
data
.
append
(
'
FEAT
'
)
data
.
extend
(
features
)
data
=
'
'
.
join
(
data
)
data
=
'
\0
'
.
join
(
data
)
string
=
StringIO
()
# if there's a need to do more gzip, put that to a function
gzip
=
GzipFile
(
fileobj
=
string
,
mode
=
'
w
'
)
gzip
.
write
(
data
)
...
...
This diff is collapsed.
Click to expand it.
src/common/optparser.py
+
21
−
0
View file @
4ce9d890
...
...
@@ -161,6 +161,8 @@ class OptionsParser:
self
.
update_config_to_01113
()
if
old
<
[
0
,
11
,
1
,
4
]
and
new
>=
[
0
,
11
,
1
,
4
]:
self
.
update_config_to_01114
()
if
old
<
[
0
,
11
,
1
,
5
]
and
new
>=
[
0
,
11
,
1
,
5
]:
self
.
update_config_to_01115
()
gajim
.
logger
.
init_vars
()
gajim
.
config
.
set
(
'
version
'
,
new_version
)
...
...
@@ -455,3 +457,22 @@ class OptionsParser:
for
o
in
d
:
gajim
.
config
.
set_per
(
'
themes
'
,
theme_name
,
o
,
theme
[
d
.
index
(
o
)])
gajim
.
config
.
set
(
'
version
'
,
'
0.11.1.4
'
)
def
update_config_to_01115
(
self
):
# copy&pasted from update_config_to_01013, possibly 'FIXME see #2812' applies too
back
=
os
.
getcwd
()
os
.
chdir
(
logger
.
LOG_DB_FOLDER
)
con
=
sqlite
.
connect
(
logger
.
LOG_DB_FILE
)
os
.
chdir
(
back
)
cur
=
con
.
cursor
()
try
:
cur
.
executescript
(
'''
DELETE FROM caps_cache;
'''
)
con
.
commit
()
except
sqlite
.
OperationalError
,
e
:
pass
con
.
close
()
gajim
.
config
.
set
(
'
version
'
,
'
0.11.1.5
'
)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment