Commits September 2011

commits@gajim.org

2 participants
107 discussions

gajim: don't call a function as default function argument! Fixes...
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 2a983ea40af2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2a983ea40af2 description: don't call a function as default function argument! Fixes time when sending forwarded message diffstat: src/common/events.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r f18b321a9709 -r 2a983ea40af2 src/common/events.py --- a/src/common/events.py Sat Sep 17 22:23:12 2011 +0200 +++ b/src/common/events.py Sun Sep 18 16:11:27 2011 +0200 @@ -122,8 +122,10 @@ def remove_account(self, account): del self._events[account] - def create_event(self, type_, parameters, time_ = time.time(), - show_in_roster = False, show_in_systray = True): + def create_event(self, type_, parameters, time_=None, + show_in_roster=False, show_in_systray=True): + if not time_: + time_ = time.time() return Event(type_, time_, parameters, show_in_roster, show_in_systray)

1 0

gajim: merge
by Fomin Denis 27 Sep '11

27 Sep '11

changeset e159576e9f2e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e159576e9f2e description: merge diffstat: .hgtags | 1 + ChangeLog | 2 ++ autogen.sh | 2 +- setup_win32.py | 6 +++--- src/common/defs.py | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diffs (60 lines): diff -r 0dad513e58f5 -r e159576e9f2e .hgtags --- a/.hgtags Tue Sep 27 18:16:06 2011 +0300 +++ b/.hgtags Tue Sep 27 18:17:43 2011 +0300 @@ -5,3 +5,4 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1 +50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1 diff -r 0dad513e58f5 -r e159576e9f2e ChangeLog --- a/ChangeLog Tue Sep 27 18:16:06 2011 +0300 +++ b/ChangeLog Tue Sep 27 18:17:43 2011 +0300 @@ -7,6 +7,8 @@ * IBB * Nested roster group * Roster filtrering + * UPower support + * GPG support for windows Gajim 0.14.4 (22 July 2011) diff -r 0dad513e58f5 -r e159576e9f2e autogen.sh --- a/autogen.sh Tue Sep 27 18:16:06 2011 +0300 +++ b/autogen.sh Tue Sep 27 18:17:43 2011 +0300 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-alpha1" + gajimversion="0.15-beta2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 0dad513e58f5 -r e159576e9f2e setup_win32.py --- a/setup_win32.py Tue Sep 27 18:16:06 2011 +0300 +++ b/setup_win32.py Tue Sep 27 18:17:43 2011 +0300 @@ -49,11 +49,11 @@ setup( name='Gajim', - version='0.14.1', + version='0.15', description='A full featured Jabber client', author='Gajim Development Team', - url='http://www.gajim.org/', - download_url='http://www.gajim.org/downloads.php', + url='http://gajim.org/', + download_url='http://gajim.org/downloads.php', license='GPL', options=options, executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'), diff -r 0dad513e58f5 -r e159576e9f2e src/common/defs.py --- a/src/common/defs.py Tue Sep 27 18:16:06 2011 +0300 +++ b/src/common/defs.py Tue Sep 27 18:17:43 2011 +0300 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15-alpha1' +version = '0.15-beta2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: Fix #6906 again. is_groupchat() are not working as it sh...
by Fomin Denis 27 Sep '11

27 Sep '11

changeset 0dad513e58f5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0dad513e58f5 description: Fix #6906 again. is_groupchat() are not working as it should. it checks whether the gc connected(is_groupchat_connected()). diffstat: src/dialogs.py | 2 +- src/gui_interface.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 7d68115746e2 -r 0dad513e58f5 src/dialogs.py --- a/src/dialogs.py Tue Sep 27 16:52:30 2011 +0200 +++ b/src/dialogs.py Tue Sep 27 18:16:06 2011 +0300 @@ -2482,7 +2482,7 @@ return if gajim.contacts.get_contact(self.account, room_jid) and \ - not gajim.contacts.get_contact(self.account, room_jid).is_groupchat(): + not gajim.contacts.get_contact(self.account, room_jid).is_transport(): ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return diff -r 7d68115746e2 -r 0dad513e58f5 src/gui_interface.py --- a/src/gui_interface.py Tue Sep 27 16:52:30 2011 +0200 +++ b/src/gui_interface.py Tue Sep 27 18:16:06 2011 +0300 @@ -1903,7 +1903,7 @@ """ if gajim.contacts.get_contact(account, room_jid) and \ - not gajim.contacts.get_contact(account, room_jid).is_groupchat(): + gajim.contacts.get_contact(account, room_jid).is_transport(): dialogs.ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return

1 0

gajim: prepare beta2
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 3396a4a4a2d2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3396a4a4a2d2 description: prepare beta2 diffstat: autogen.sh | 2 +- src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (22 lines): diff -r a76e90b1ec48 -r 3396a4a4a2d2 autogen.sh --- a/autogen.sh Sat Sep 17 22:23:12 2011 +0200 +++ b/autogen.sh Tue Sep 27 17:14:40 2011 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-beta1" + gajimversion="0.15-beta2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r a76e90b1ec48 -r 3396a4a4a2d2 src/common/defs.py --- a/src/common/defs.py Sat Sep 17 22:23:12 2011 +0200 +++ b/src/common/defs.py Tue Sep 27 17:14:40 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15-beta1' +version = '0.15-beta2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: update windows build script
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 5f61bc50cd7a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5f61bc50cd7a description: update windows build script diffstat: setup_win32.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (18 lines): diff -r 92007f042846 -r 5f61bc50cd7a setup_win32.py --- a/setup_win32.py Sat Sep 17 19:47:10 2011 +0200 +++ b/setup_win32.py Sat Sep 17 22:22:56 2011 +0200 @@ -49,11 +49,11 @@ setup( name='Gajim', - version='0.14.1', + version='0.15', description='A full featured Jabber client', author='Gajim Development Team', - url='http://www.gajim.org/', - download_url='http://www.gajim.org/downloads.php', + url='http://gajim.org/', + download_url='http://gajim.org/downloads.php', license='GPL', options=options, executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'),

1 0

gajim: Added tag gajim-0.15-beta1 for changeset 50d609e2b30b
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset a76e90b1ec48 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a76e90b1ec48 description: Added tag gajim-0.15-beta1 for changeset 50d609e2b30b diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 5f61bc50cd7a -r a76e90b1ec48 .hgtags --- a/.hgtags Sat Sep 17 22:22:56 2011 +0200 +++ b/.hgtags Sat Sep 17 22:23:12 2011 +0200 @@ -5,3 +5,4 @@ a0ec82dc6b7c10708e23f5ec30bab75d596b6fc6 gajim-0.12-beta1 91ceabbf74309d7bbd79b43552b89768842b4e8a gajim-0.14.1 db4ecb0d1f187578732ceb2fa9beab0591125341 gajim-0.15-alpha1 +50d609e2b30b4eaded2af345580fdd7125d4e179 gajim-0.15-beta1

1 0

gajim: prepare 0.15-beta1
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 92007f042846 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=92007f042846 description: prepare 0.15-beta1 diffstat: ChangeLog | 2 ++ autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diffs (34 lines): diff -r 7d68115746e2 -r 92007f042846 ChangeLog --- a/ChangeLog Tue Sep 27 16:52:30 2011 +0200 +++ b/ChangeLog Sat Sep 17 19:47:10 2011 +0200 @@ -7,6 +7,8 @@ * IBB * Nested roster group * Roster filtrering + * UPower support + * GPG support for windows Gajim 0.14.4 (22 July 2011) diff -r 7d68115746e2 -r 92007f042846 autogen.sh --- a/autogen.sh Tue Sep 27 16:52:30 2011 +0200 +++ b/autogen.sh Sat Sep 17 19:47:10 2011 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-alpha1" + gajimversion="0.15-beta1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 7d68115746e2 -r 92007f042846 src/common/defs.py --- a/src/common/defs.py Tue Sep 27 16:52:30 2011 +0200 +++ b/src/common/defs.py Sat Sep 17 19:47:10 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15-alpha1' +version = '0.15-beta1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: fix typo in french translation. see #6987
by Yann Leboulanger 27 Sep '11

27 Sep '11

changeset 7d68115746e2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7d68115746e2 description: fix typo in french translation. see #6987 diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5902e53da71a -r 7d68115746e2 po/fr.po --- a/po/fr.po Tue Sep 27 17:23:10 2011 +0300 +++ b/po/fr.po Tue Sep 27 16:52:30 2011 +0200 @@ -10332,7 +10332,7 @@ "\n" "Continue with the session?" msgstr "" -"Le client distant à choisi ces options :\n" +"Le client distant a choisi ces options :\n" "\n" "%s\n" "\n"

1 0

gajim: fix var name
by Fomin Denis 27 Sep '11

27 Sep '11

changeset 5902e53da71a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5902e53da71a description: fix var name diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a59f75f16645 -r 5902e53da71a src/dialogs.py --- a/src/dialogs.py Tue Sep 27 16:19:20 2011 +0300 +++ b/src/dialogs.py Tue Sep 27 17:23:10 2011 +0300 @@ -2482,7 +2482,7 @@ return if gajim.contacts.get_contact(self.account, room_jid) and \ - not gajim.contacts.get_contact(account, room_jid).is_groupchat(): + not gajim.contacts.get_contact(self.account, room_jid).is_groupchat(): ErrorDialog(_('This is not a group chat'), _('%s is not the name of a group chat.') % room_jid) return

1 0

gajim: merge
by Fomin Denis 27 Sep '11

27 Sep '11

changeset a59f75f16645 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a59f75f16645 description: merge diffstat: src/common/stanza_session.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r e5d88e75800c -r a59f75f16645 src/common/stanza_session.py --- a/src/common/stanza_session.py Tue Sep 27 16:13:12 2011 +0300 +++ b/src/common/stanza_session.py Tue Sep 27 16:19:20 2011 +0300 @@ -493,7 +493,10 @@ stanza.addChild(node=child) # replace non-character unicode - stranza = self.conn.connection.Dispatcher.replace_non_character(stanza) + body = stanza.getBody() + if body: + stanza.setBody( + self.conn.connection.Dispatcher.replace_non_character(body)) return stanza

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2011