Commits February 2012

commits@gajim.org

3 participants
51 discussions

gajim: don't override assigned GPG key. Fixes #7111
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset 710c1ada0cdf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=710c1ada0cdf description: don't override assigned GPG key. Fixes #7111 diffstat: src/common/connection_handlers.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 94e0d7ea45ab -r 710c1ada0cdf src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Feb 21 10:12:26 2012 +0100 +++ b/src/common/connection_handlers.py Tue Feb 21 23:53:49 2012 +0100 @@ -893,7 +893,13 @@ obj.contact.show = obj.show obj.contact.status = obj.status obj.contact.priority = obj.prio - obj.contact.keyID = obj.keyID + attached_keys = gajim.config.get_per('accounts', account, + 'attached_gpg_keys').split() + if jid in attached_keys: + obj.contact.keyID = attached_keys[attached_keys.index(jid) + 1] + else: + # Do not override assigned key + obj.contact.keyID = obj.keyID if obj.timestamp: obj.contact.last_status_time = obj.timestamp elif not gajim.block_signed_in_notifications[account]:

1 0

gajim: simplify nsi file for GTK installation / removal
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset 94e0d7ea45ab in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=94e0d7ea45ab description: simplify nsi file for GTK installation / removal diffstat: gajim.nsi | 135 +------------------------------------------------------------ 1 files changed, 4 insertions(+), 131 deletions(-) diffs (152 lines): diff -r 0b35dd2016dd -r 94e0d7ea45ab gajim.nsi --- a/gajim.nsi Fri Feb 17 11:17:35 2012 +0400 +++ b/gajim.nsi Tue Feb 21 10:12:26 2012 +0100 @@ -224,16 +224,8 @@ SetOutPath "$INSTDIR\bin\gtk" File /r "bin\gtk\bin" File /r "bin\gtk\etc" - SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines" - File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll" - File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll" - File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll" - SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0" - SetOutPath "$INSTDIR\bin\gtk\lib" - File "bin\gtk\lib\charset.alias" - SetOutPath "$INSTDIR\bin\gtk\share" - File /r "bin\gtk\share\gtkthemeselector" - File /r "bin\gtk\share\xml" + File /r "bin\gtk\lib" + File /r "bin\gtk\share" SectionEnd Section "Plugins" SecPlugins @@ -525,127 +517,8 @@ Section "Uninstall" RMDir /r "$INSTDIR\bin\gtk\bin" RMDir /r "$INSTDIR\bin\gtk\etc" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libwimp.dll" - RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines" - RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0" - RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0" - Delete "$INSTDIR\bin\gtk\lib\charset.alias" - RMDir "$INSTDIR\bin\gtk\lib" - RMDir /r "$INSTDIR\bin\gtk\share\locale\de" - RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB" - RMDir /r "$INSTDIR\bin\gtk\share\locale\es" - RMDir /r "$INSTDIR\bin\gtk\share\locale\fr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\it" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ru" - RMDir /r "$INSTDIR\bin\gtk\share\locale\af" - RMDir /r "$INSTDIR\bin\gtk\share\locale\am" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ang" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ar" - RMDir /r "$INSTDIR\bin\gtk\share\locale\as" - RMDir /r "$INSTDIR\bin\gtk\share\locale\az" - RMDir /r "$INSTDIR\bin\gtk\share\locale\az_IR" - RMDir /r "$INSTDIR\bin\gtk\share\locale\be" - RMDir /r "$INSTDIR\bin\gtk\share\locale\be@latin" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bg" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bn_IN" - RMDir /r "$INSTDIR\bin\gtk\share\locale\br" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bs" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ca" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ca@valencia" - RMDir /r "$INSTDIR\bin\gtk\share\locale\cs" - RMDir /r "$INSTDIR\bin\gtk\share\locale\cy" - RMDir /r "$INSTDIR\bin\gtk\share\locale\da" - RMDir /r "$INSTDIR\bin\gtk\share\locale\dz" - RMDir /r "$INSTDIR\bin\gtk\share\locale\el" - RMDir /r "$INSTDIR\bin\gtk\share\locale\en_CA" - RMDir /r "$INSTDIR\bin\gtk\share\locale\eo" - RMDir /r "$INSTDIR\bin\gtk\share\locale\et" - RMDir /r "$INSTDIR\bin\gtk\share\locale\eu" - RMDir /r "$INSTDIR\bin\gtk\share\locale\fa" - RMDir /r "$INSTDIR\bin\gtk\share\locale\fi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ga" - RMDir /r "$INSTDIR\bin\gtk\share\locale\gl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\gu" - RMDir /r "$INSTDIR\bin\gtk\share\locale\he" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hu" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hy" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ia" - RMDir /r "$INSTDIR\bin\gtk\share\locale\id" - RMDir /r "$INSTDIR\bin\gtk\share\locale\io" - RMDir /r "$INSTDIR\bin\gtk\share\locale\is" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ja" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ka" - RMDir /r "$INSTDIR\bin\gtk\share\locale\kn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ko" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ku" - RMDir /r "$INSTDIR\bin\gtk\share\locale\li" - RMDir /r "$INSTDIR\bin\gtk\share\locale\lt" - RMDir /r "$INSTDIR\bin\gtk\share\locale\lv" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mai" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mg" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ml" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ms" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nb" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ne" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nso" - RMDir /r "$INSTDIR\bin\gtk\share\locale\oc" - RMDir /r "$INSTDIR\bin\gtk\share\locale\or" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pa" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ps" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pt" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pt_BR" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ro" - RMDir /r "$INSTDIR\bin\gtk\share\locale\rw" - RMDir /r "$INSTDIR\bin\gtk\share\locale\si" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sq" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@ije" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@latin" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sv" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ta" - RMDir /r "$INSTDIR\bin\gtk\share\locale\te" - RMDir /r "$INSTDIR\bin\gtk\share\locale\th" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tt" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ug" - RMDir /r "$INSTDIR\bin\gtk\share\locale\uk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ur" - RMDir /r "$INSTDIR\bin\gtk\share\locale\uz" - RMDir /r "$INSTDIR\bin\gtk\share\locale\uz@cyrillic" - RMDir /r "$INSTDIR\bin\gtk\share\locale\vi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\wa" - RMDir /r "$INSTDIR\bin\gtk\share\locale\xh" - RMDir /r "$INSTDIR\bin\gtk\share\locale\yi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_CN" - RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_HK" - RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_TW" - RMDir "$INSTDIR\bin\gtk\share\locale" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Clearlooks" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Default" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy-js" - RMDir /r "$INSTDIR\bin\gtk\share\themes\MS-Windows" - RMDir "$INSTDIR\bin\gtk\share\themes" - RMDir /r "$INSTDIR\bin\gtk\share\gtkthemeselector" - RMDir /r "$INSTDIR\bin\gtk\share\xml" - RMDir "$INSTDIR\bin\gtk\share" + RMDir /r "$INSTDIR\bin\gtk\lib" + RMDir /r "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" Delete "$INSTDIR\bin\_bsddb.pyd" Delete "$INSTDIR\bin\_ctypes.pyd"

1 0

gajim: fix some string
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset 8d4593f3997f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8d4593f3997f description: fix some string diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 4a0392615d81 -r 8d4593f3997f src/common/connection.py --- a/src/common/connection.py Tue Feb 21 23:53:49 2012 +0100 +++ b/src/common/connection.py Wed Feb 22 10:07:16 2012 +0100 @@ -1387,7 +1387,7 @@ gajim.nec.push_incoming_event(InformationEvent(None, conn=self, level='error', pri_txt=_('Authentication failed with "%s"') % \ self._hostname, sec_txt=_('Please check your login and password' - 'for correctness.'))) + ' for correctness.'))) if self.on_connect_auth: self.on_connect_auth(None) self.on_connect_auth = None @@ -1464,7 +1464,7 @@ level='error', pri_txt=_('Error while removing privacy ' 'list'), sec_txt=_('Privacy list %s has not been removed. ' 'It is maybe active in one of your connected resources. ' - 'Deactivate it and tryagain.') % privacy_list)) + 'Deactivate it and try again.') % privacy_list)) common.xmpp.features_nb.delPrivacyList(self.connection, privacy_list, _on_del_privacy_list_result)

1 0

gajim: don't override assigned GPG key. Fixes #7111
by Yann Leboulanger 21 Feb '12

21 Feb '12

changeset 4a0392615d81 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a0392615d81 description: don't override assigned GPG key. Fixes #7111 diffstat: src/common/connection_handlers.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (18 lines): diff -r 3b47eed7ab33 -r 4a0392615d81 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Feb 21 10:12:26 2012 +0100 +++ b/src/common/connection_handlers.py Tue Feb 21 23:53:49 2012 +0100 @@ -893,7 +893,13 @@ obj.contact.show = obj.show obj.contact.status = obj.status obj.contact.priority = obj.prio - obj.contact.keyID = obj.keyID + attached_keys = gajim.config.get_per('accounts', account, + 'attached_gpg_keys').split() + if jid in attached_keys: + obj.contact.keyID = attached_keys[attached_keys.index(jid) + 1] + else: + # Do not override assigned key + obj.contact.keyID = obj.keyID if obj.timestamp: obj.contact.last_status_time = obj.timestamp elif not gajim.block_signed_in_notifications[account]:

1 0

gajim: simplify nsi file for GTK installation / removal
by Yann Leboulanger 21 Feb '12

21 Feb '12

changeset 3b47eed7ab33 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b47eed7ab33 description: simplify nsi file for GTK installation / removal diffstat: gajim.nsi | 138 +------------------------------------------------------------ 1 files changed, 4 insertions(+), 134 deletions(-) diffs (155 lines): diff -r 95ad415add80 -r 3b47eed7ab33 gajim.nsi --- a/gajim.nsi Sat Feb 18 23:06:08 2012 +0400 +++ b/gajim.nsi Tue Feb 21 10:12:26 2012 +0100 @@ -224,18 +224,8 @@ SetOutPath "$INSTDIR\bin\gtk" File /r "bin\gtk\bin" File /r "bin\gtk\etc" - SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0" - File /r "bin\gtk\lib\gtk-2.0\2.10.0\loaders" - SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines" - File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll" - File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll" - File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll" - SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0" - SetOutPath "$INSTDIR\bin\gtk\lib" - File "bin\gtk\lib\charset.alias" - SetOutPath "$INSTDIR\bin\gtk\share" - File /r "bin\gtk\share\gtkthemeselector" - File /r "bin\gtk\share\xml" + File /r "bin\gtk\lib" + File /r "bin\gtk\share" SectionEnd Section "Plugins" SecPlugins @@ -527,128 +517,8 @@ Section "Uninstall" RMDir /r "$INSTDIR\bin\gtk\bin" RMDir /r "$INSTDIR\bin\gtk\etc" - RMDir /r "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\loaders" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll" - Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libwimp.dll" - RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines" - RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0" - RMDir "$INSTDIR\bin\gtk\lib\gtk-2.0" - Delete "$INSTDIR\bin\gtk\lib\charset.alias" - RMDir "$INSTDIR\bin\gtk\lib" - RMDir /r "$INSTDIR\bin\gtk\share\locale\de" - RMDir /r "$INSTDIR\bin\gtk\share\locale\en_GB" - RMDir /r "$INSTDIR\bin\gtk\share\locale\es" - RMDir /r "$INSTDIR\bin\gtk\share\locale\fr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\it" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ru" - RMDir /r "$INSTDIR\bin\gtk\share\locale\af" - RMDir /r "$INSTDIR\bin\gtk\share\locale\am" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ang" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ar" - RMDir /r "$INSTDIR\bin\gtk\share\locale\as" - RMDir /r "$INSTDIR\bin\gtk\share\locale\az" - RMDir /r "$INSTDIR\bin\gtk\share\locale\az_IR" - RMDir /r "$INSTDIR\bin\gtk\share\locale\be" - RMDir /r "$INSTDIR\bin\gtk\share\locale\be@latin" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bg" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bn_IN" - RMDir /r "$INSTDIR\bin\gtk\share\locale\br" - RMDir /r "$INSTDIR\bin\gtk\share\locale\bs" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ca" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ca@valencia" - RMDir /r "$INSTDIR\bin\gtk\share\locale\cs" - RMDir /r "$INSTDIR\bin\gtk\share\locale\cy" - RMDir /r "$INSTDIR\bin\gtk\share\locale\da" - RMDir /r "$INSTDIR\bin\gtk\share\locale\dz" - RMDir /r "$INSTDIR\bin\gtk\share\locale\el" - RMDir /r "$INSTDIR\bin\gtk\share\locale\en_CA" - RMDir /r "$INSTDIR\bin\gtk\share\locale\eo" - RMDir /r "$INSTDIR\bin\gtk\share\locale\et" - RMDir /r "$INSTDIR\bin\gtk\share\locale\eu" - RMDir /r "$INSTDIR\bin\gtk\share\locale\fa" - RMDir /r "$INSTDIR\bin\gtk\share\locale\fi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ga" - RMDir /r "$INSTDIR\bin\gtk\share\locale\gl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\gu" - RMDir /r "$INSTDIR\bin\gtk\share\locale\he" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hu" - RMDir /r "$INSTDIR\bin\gtk\share\locale\hy" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ia" - RMDir /r "$INSTDIR\bin\gtk\share\locale\id" - RMDir /r "$INSTDIR\bin\gtk\share\locale\io" - RMDir /r "$INSTDIR\bin\gtk\share\locale\is" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ja" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ka" - RMDir /r "$INSTDIR\bin\gtk\share\locale\kn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ko" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ku" - RMDir /r "$INSTDIR\bin\gtk\share\locale\li" - RMDir /r "$INSTDIR\bin\gtk\share\locale\lt" - RMDir /r "$INSTDIR\bin\gtk\share\locale\lv" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mai" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mg" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ml" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\mr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ms" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nb" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ne" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nn" - RMDir /r "$INSTDIR\bin\gtk\share\locale\nso" - RMDir /r "$INSTDIR\bin\gtk\share\locale\oc" - RMDir /r "$INSTDIR\bin\gtk\share\locale\or" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pa" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ps" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pt" - RMDir /r "$INSTDIR\bin\gtk\share\locale\pt_BR" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ro" - RMDir /r "$INSTDIR\bin\gtk\share\locale\rw" - RMDir /r "$INSTDIR\bin\gtk\share\locale\si" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sq" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@ije" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sr@latin" - RMDir /r "$INSTDIR\bin\gtk\share\locale\sv" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ta" - RMDir /r "$INSTDIR\bin\gtk\share\locale\te" - RMDir /r "$INSTDIR\bin\gtk\share\locale\th" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tl" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tr" - RMDir /r "$INSTDIR\bin\gtk\share\locale\tt" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ug" - RMDir /r "$INSTDIR\bin\gtk\share\locale\uk" - RMDir /r "$INSTDIR\bin\gtk\share\locale\ur" - RMDir /r "$INSTDIR\bin\gtk\share\locale\uz" - RMDir /r "$INSTDIR\bin\gtk\share\locale\uz@cyrillic" - RMDir /r "$INSTDIR\bin\gtk\share\locale\vi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\wa" - RMDir /r "$INSTDIR\bin\gtk\share\locale\xh" - RMDir /r "$INSTDIR\bin\gtk\share\locale\yi" - RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_CN" - RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_HK" - RMDir /r "$INSTDIR\bin\gtk\share\locale\zh_TW" - RMDir "$INSTDIR\bin\gtk\share\locale" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Clearlooks" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Default" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy" - RMDir /r "$INSTDIR\bin\gtk\share\themes\Glossy-js" - RMDir /r "$INSTDIR\bin\gtk\share\themes\MS-Windows" - RMDir "$INSTDIR\bin\gtk\share\themes" - RMDir /r "$INSTDIR\bin\gtk\share\gtkthemeselector" - RMDir /r "$INSTDIR\bin\gtk\share\xml" - RMDir "$INSTDIR\bin\gtk\share" + RMDir /r "$INSTDIR\bin\gtk\lib" + RMDir /r "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" Delete "$INSTDIR\bin\_bsddb.pyd" Delete "$INSTDIR\bin\_ctypes.pyd"

1 0

gtk-win32-bin: update to gtk 2.24.10
by Yann Leboulanger 19 Feb '12

19 Feb '12

changeset 4c2e175bb31e in /home/hg/repos/gtk-win32-bin details:http://hg.gajim.org/gtk-win32-bin?cmd=changeset;node=4c2e175bb31e description: update to gtk 2.24.10 diffstat: bin/freetype6.dll | Bin bin/libatk-1.0-0.dll | Bin bin/libgailutil-18.dll | Bin bin/libgdk-win32-2.0-0.dll | Bin bin/libgtk-win32-2.0-0.dll | Bin etc/gtk-2.0/gtk.immodules | 9 ++++++--- etc/pango/pango.aliases | 7 +++++++ etc/pango/pango.modules | 2 +- lib/gtk-2.0/2.10.0/engines/libpixmap.dll | Bin lib/gtk-2.0/2.10.0/engines/libsvg.dll | Bin lib/gtk-2.0/2.10.0/engines/libwimp.dll | Bin lib/gtk-2.0/modules/libgail.dll | Bin 12 files changed, 14 insertions(+), 4 deletions(-) diffs (52 lines): diff -r 960b584e0f06 -r 4c2e175bb31e bin/freetype6.dll Binary file bin/freetype6.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e bin/libatk-1.0-0.dll Binary file bin/libatk-1.0-0.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e bin/libgailutil-18.dll Binary file bin/libgailutil-18.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e bin/libgdk-win32-2.0-0.dll Binary file bin/libgdk-win32-2.0-0.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e bin/libgtk-win32-2.0-0.dll Binary file bin/libgtk-win32-2.0-0.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e etc/gtk-2.0/gtk.immodules --- a/etc/gtk-2.0/gtk.immodules Sat Jan 07 16:10:56 2012 +0100 +++ b/etc/gtk-2.0/gtk.immodules Sun Feb 19 17:11:52 2012 +0100 @@ -1,3 +1,6 @@ -# GTK+ Input Method Modules file -# -# +# GTK+ Input Method Modules file +# Automatically generated file, do not edit +# Created by C:\Python27\Lib\site-packages\gtk-2.0\runtime\bin\gtk-query-immodules-2.0.exe from gtk+-2.24.10 +# +# ModulesPath = C:\Documents and Settings\Administrateur\.gtk-2.0\2.10.0\i686-pc-mingw32\immodules;C:\Documents and Settings\Administrateur\.gtk-2.0\2.10.0\immodules;C:\Documents and Settings\Administrateur\.gtk-2.0\i686-pc-mingw32\immodules;C:\Documents and Settings\Administrateur\.gtk-2.0\immodules;C:\Python27\Lib\site-packages\gtk-2.0\runtime\lib\gtk-2.0\2.10.0\i686-pc-mingw32\immodules;C:\Python27\Lib\site-packages\gtk-2.0\runtime\lib\gtk-2.0\2.10.0\immodules;C:\Python27\Lib\site-packages\gtk-2.0\runtime\lib\gtk-2.0\i686-pc-mingw32\immodules;C:\Python27\Lib\site-packages\gtk-2.0\runtime\lib\gtk-2.0\immodules +# diff -r 960b584e0f06 -r 4c2e175bb31e etc/pango/pango.aliases --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/pango/pango.aliases Sun Feb 19 17:11:52 2012 +0100 @@ -0,0 +1,7 @@ +courier = "courier new,courier monothai" +mono = "consolas,courier new,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,kartika,latha,mangal,raavi" +monospace = "consolas,courier new,lucida console,courier monothai,mingliu,simsun,gulimche,ms gothic,kartika,latha,mangal,raavi" +sans = "arial,lucida sans unicode,browallia new,mingliu,simhei,gulimche,ms gothic,kartika,latha,mangal,raavi" +"segoe ui" = "segoe ui,meiryo,malgun gothic,microsoft jhenghei,microsoft yahei,gisha,leelawadee" +serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,kartika,latha,mangal,raavi" +tahoma = "tahoma,lucida sans unicode,browallia new,mingliu,simhei,gulimche,ms gothic,kartika,latha,mangal,raavi" diff -r 960b584e0f06 -r 4c2e175bb31e etc/pango/pango.modules --- a/etc/pango/pango.modules Sat Jan 07 16:10:56 2012 +0100 +++ b/etc/pango/pango.modules Sun Feb 19 17:11:52 2012 +0100 @@ -1,5 +1,5 @@ # Pango Modules file # Automatically generated file, do not edit # -# ModulesPath = c:/devel/target/7ca1014c83646156ccc6c0586654cdeb/lib/pango\1.6.0\modules +# ModulesPath = C:\Python27\Lib\site-packages\gtk-2.0\runtime\lib\pango\1.6.0\modules # diff -r 960b584e0f06 -r 4c2e175bb31e lib/gtk-2.0/2.10.0/engines/libpixmap.dll Binary file lib/gtk-2.0/2.10.0/engines/libpixmap.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e lib/gtk-2.0/2.10.0/engines/libsvg.dll Binary file lib/gtk-2.0/2.10.0/engines/libsvg.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e lib/gtk-2.0/2.10.0/engines/libwimp.dll Binary file lib/gtk-2.0/2.10.0/engines/libwimp.dll has changed diff -r 960b584e0f06 -r 4c2e175bb31e lib/gtk-2.0/modules/libgail.dll Binary file lib/gtk-2.0/modules/libgail.dll has changed

1 0

gajim: revert debug test
by Yann Leboulanger 18 Feb '12

18 Feb '12

changeset d7c0c10fce32 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d7c0c10fce32 description: revert debug test diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8eb475cfdb1d -r d7c0c10fce32 src/gui_interface.py --- a/src/gui_interface.py Sat Feb 18 21:06:08 2012 +0100 +++ b/src/gui_interface.py Sat Feb 18 21:21:00 2012 +0100 @@ -929,7 +929,7 @@ # If the hash we received and the hash of the file are the same, # then the file is not corrupt jid = unicode(file_props['sender']) - if session.file_hash != hash_: + if session.file_hash == hash_: self.popup_ft_result(account, jid, file_props) ft_win.set_status(file_props['type'], file_props['sid'], 'ok') else:

1 0

gajim: handle GUI while checking file hash. Show show re-request...
by Yann Leboulanger 18 Feb '12

18 Feb '12

changeset 8eb475cfdb1d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8eb475cfdb1d description: handle GUI while checking file hash. Show show re-request dialog when hash is incorrect. TODO: re-request file to sender. diffstat: src/dialogs.py | 7 ++-- src/filetransfers_window.py | 61 ++++++++++++++++++++++++++++++++++++++++++-- src/gui_interface.py | 52 ++++++++++++++++++++++++++++++-------- src/roster_window.py | 3 ++ 4 files changed, 104 insertions(+), 19 deletions(-) diffs (296 lines): diff -r 01e82472cc5b -r 8eb475cfdb1d src/dialogs.py --- a/src/dialogs.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/dialogs.py Sat Feb 18 21:06:08 2012 +0100 @@ -1615,16 +1615,15 @@ """ def __init__(self, pritext, sectext='', checktext='', on_response_yes=None, - on_response_no=None): + on_response_no=None, type_=gtk.MESSAGE_QUESTION): self.user_response_yes = on_response_yes self.user_response_no = on_response_no if hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None - HigDialog.__init__(self, parent, gtk.MESSAGE_QUESTION, - gtk.BUTTONS_YES_NO, pritext, sectext, - on_response_yes=self.on_response_yes, + HigDialog.__init__(self, parent, type_, gtk.BUTTONS_YES_NO, pritext, + sectext, on_response_yes=self.on_response_yes, on_response_no=self.on_response_no) if checktext: diff -r 01e82472cc5b -r 8eb475cfdb1d src/filetransfers_window.py --- a/src/filetransfers_window.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/filetransfers_window.py Sat Feb 18 21:06:08 2012 +0100 @@ -46,7 +46,8 @@ C_TIME = 3 C_PROGRESS = 4 C_PERCENT = 5 -C_SID = 6 +C_PULSE = 6 +C_SID = 7 class FileTransfersWindow: @@ -65,7 +66,8 @@ shall_notify = gajim.config.get('notify_on_file_complete') self.notify_ft_checkbox.set_active(shall_notify ) - self.model = gtk.ListStore(gtk.gdk.Pixbuf, str, str, str, str, int, str) + self.model = gtk.ListStore(gtk.gdk.Pixbuf, str, str, str, str, int, + int, str) self.tree.set_model(self.model) col = gtk.TreeViewColumn() @@ -112,6 +114,7 @@ col.pack_start(renderer, expand=False) col.add_attribute(renderer, 'text', C_PROGRESS) col.add_attribute(renderer, 'value', C_PERCENT) + col.add_attribute(renderer, 'pulse', C_PULSE) col.set_resizable(True) col.set_expand(False) self.tree.append_column(col) @@ -125,6 +128,8 @@ 'pause': gtk.STOCK_MEDIA_PAUSE, 'continue': gtk.STOCK_MEDIA_PLAY, 'ok': gtk.STOCK_APPLY, + 'computing': gtk.STOCK_EXECUTE, + 'hash_error': gtk.STOCK_STOP, } self.tree.get_selection().set_mode(gtk.SELECTION_SINGLE) @@ -244,6 +249,21 @@ dialogs.ErrorDialog(_('File transfer stopped'), sectext) self.tree.get_selection().unselect_all() + def show_hash_error(self, jid, file_props): + def on_yes(dummy): + # TODO: Request the file to the sender + pass + + if file_props['type'] == 'r': + file_name = os.path.basename(file_props['file-name']) + else: + file_name = file_props['name'] + dialogs.YesNoDialog(('File transfer error'), + _('The file %(file)s has been fully received, but it seems to be ' + 'wrongly received.\nDo you want to reload it?') % \ + {'file': file_name}, on_response_yes=on_yes, + type_=gtk.MESSAGE_ERROR) + def show_file_send_request(self, account, contact): win = gtk.ScrolledWindow() win.set_shadow_type(gtk.SHADOW_IN) @@ -449,6 +469,36 @@ file_props['stopped'] = True elif status == 'ok': file_props['completed'] = True + text = self._format_percent(100) + received_size = int(file_props['received-len']) + full_size = int(file_props['size']) + text += helpers.convert_bytes(received_size) + '/' + \ + helpers.convert_bytes(full_size) + self.model.set(iter_, C_PROGRESS, text) + self.model.set(iter_, C_PULSE, gobject.constants.G_MAXINT) + elif status == 'computing': + self.model.set(iter_, C_PULSE, 1) + text = _('Checking file...') + '\n' + received_size = int(file_props['received-len']) + full_size = int(file_props['size']) + text += helpers.convert_bytes(received_size) + '/' + \ + helpers.convert_bytes(full_size) + self.model.set(iter_, C_PROGRESS, text) + def pulse(): + p = self.model.get(iter_, C_PULSE)[0] + if p == gobject.constants.G_MAXINT: + return False + self.model.set(iter_, C_PULSE, p + 1) + return True + gobject.timeout_add(100, pulse) + elif status == 'hash_error': + text = _('File error') + '\n' + received_size = int(file_props['received-len']) + full_size = int(file_props['size']) + text += helpers.convert_bytes(received_size) + '/' + \ + helpers.convert_bytes(full_size) + self.model.set(iter_, C_PROGRESS, text) + self.model.set(iter_, C_PULSE, gobject.constants.G_MAXINT) self.model.set(iter_, C_IMAGE, self.get_icon(status)) path = self.model.get_path(iter_) self.select_func(path) @@ -589,7 +639,10 @@ status = 'stop' self.model.set(iter_, 0, self.get_icon(status)) if transfered_size == full_size: - self.set_status(typ, sid, 'ok') + if file_props['type'] == 'r': + self.set_status(typ, sid, 'computing') + else: + self.set_status(typ, sid, 'ok') elif just_began: path = self.model.get_path(iter_) self.select_func(path) @@ -655,7 +708,7 @@ file_name = file_props['name'] text_props = gobject.markup_escape_text(file_name) + '\n' text_props += contact.get_shown_name() - self.model.set(iter_, 1, text_labels, 2, text_props, C_SID, + self.model.set(iter_, 1, text_labels, 2, text_props, C_PULSE, -1, C_SID, file_props['type'] + file_props['sid']) self.set_progress(file_props['type'], file_props['sid'], 0, iter_) if 'started' in file_props and file_props['started'] is False: diff -r 01e82472cc5b -r 8eb475cfdb1d src/gui_interface.py --- a/src/gui_interface.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/gui_interface.py Sat Feb 18 21:06:08 2012 +0100 @@ -913,6 +913,12 @@ def __compare_hashes(self, account, file_props): session = gajim.connections[account].get_jingle_session(jid=None, sid=file_props['session-sid']) + ft_win = self.instances['file_transfers'] + if not session.file_hash: + # We disn't get the hash, sender probably don't support that + jid = unicode(file_props['sender']) + self.popup_ft_result(account, jid, file_props) + ft_win.set_status(file_props['type'], file_props['sid'], 'ok') h = Hashes() try: file_ = open(file_props['file-name'], 'r') @@ -922,8 +928,16 @@ file_.close() # If the hash we received and the hash of the file are the same, # then the file is not corrupt - if session.file_hash == hash_: - print "they are te same" + jid = unicode(file_props['sender']) + if session.file_hash != hash_: + self.popup_ft_result(account, jid, file_props) + ft_win.set_status(file_props['type'], file_props['sid'], 'ok') + else: + # wrong hash, we need to get the file again! + file_props['error'] = -10 + self.popup_ft_result(account, jid, file_props) + ft_win.set_status(file_props['type'], file_props['sid'], + 'hash_error') # End jingle session if session: session.end_session() @@ -949,7 +963,10 @@ else: # we send a file jid = unicode(file_props['receiver']) gajim.socks5queue.remove_sender(file_props['sid'], True, True) + self.popup_ft_result(account, jid, file_props) + def popup_ft_result(self, account, jid, file_props): + ft = self.instances['file_transfers'] if helpers.allow_popup_window(account): if file_props['error'] == 0: if gajim.config.get('notify_on_file_complete'): @@ -960,6 +977,8 @@ elif file_props['error'] == -6: ft.show_stopped(jid, file_props, error_msg=_('Error opening file')) + elif file_props['error'] == -10: + ft.show_hash_error(jid, file_props) return msg_type = '' @@ -971,6 +990,9 @@ elif file_props['error'] in (-1, -6): msg_type = 'file-stopped' event_type = _('File Transfer Stopped') + elif file_props['error'] == -10: + msg_type = 'file-hash-error' + event_type = _('File Transfer Failed') if event_type == '': # FIXME: ugly workaround (this can happen Gajim sent, Gaim recvs) @@ -988,16 +1010,20 @@ # get the name of the sender, as it is in the roster sender = unicode(file_props['sender']).split('/')[0] name = gajim.contacts.get_first_contact_from_jid(account, - sender).get_shown_name() + sender).get_shown_name() filename = os.path.basename(file_props['file-name']) if event_type == _('File Transfer Completed'): txt = _('You successfully received %(filename)s from ' '%(name)s.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_done' - else: # ft stopped + elif event_type == _('File Transfer Stopped'): txt = _('File transfer of %(filename)s from %(name)s ' 'stopped.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_stopped' + else: # ft hash error + txt = _('File transfer of %(filename)s from %(name)s ' + 'failed.') % {'filename': filename, 'name': name} + img_name = 'gajim-ft_stopped' else: receiver = file_props['receiver'] if hasattr(receiver, 'jid'): @@ -1005,24 +1031,28 @@ receiver = receiver.split('/')[0] # get the name of the contact, as it is in the roster name = gajim.contacts.get_first_contact_from_jid(account, - receiver).get_shown_name() + receiver).get_shown_name() filename = os.path.basename(file_props['file-name']) if event_type == _('File Transfer Completed'): txt = _('You successfully sent %(filename)s to %(name)s.')\ - % {'filename': filename, 'name': name} + % {'filename': filename, 'name': name} img_name = 'gajim-ft_done' - else: # ft stopped + elif event_type == _('File Transfer Stopped'): txt = _('File transfer of %(filename)s to %(name)s ' 'stopped.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_stopped' + else: # ft hash error + txt = _('File transfer of %(filename)s to %(name)s ' + 'failed.') % {'filename': filename, 'name': name} + img_name = 'gajim-ft_stopped' path = gtkgui_helpers.get_icon_path(img_name, 48) else: txt = '' path = '' if gajim.config.get('notify_on_file_complete') and \ - (gajim.config.get('autopopupaway') or \ - gajim.connections[account].connected in (2, 3)): + (gajim.config.get('autopopupaway') or \ + gajim.connections[account].connected in (2, 3)): # we want to be notified and we are online/chat or we don't mind # bugged when away/na/busy notify.popup(event_type, jid, account, msg_type, path_to_image=path, @@ -1514,7 +1544,7 @@ no_queue = len(gajim.events.get_events(account, jid)) == 0 # type_ can be gc-invitation file-send-error file-error # file-request-error file-request file-completed file-stopped - # jingle-incoming + # file-hash-error jingle-incoming # event_type can be in advancedNotificationWindow.events_list event_types = {'file-request': 'ft_request', 'file-completed': 'ft_finished'} @@ -1643,7 +1673,7 @@ w = ctrl.parent_win elif type_ in ('normal', 'file-request', 'file-request-error', 'file-send-error', 'file-error', 'file-stopped', 'file-completed', - 'jingle-incoming'): + 'file-hash-error', 'jingle-incoming'): # Get the first single message event event = gajim.events.get_first_event(account, fjid, type_) if not event: diff -r 01e82472cc5b -r 8eb475cfdb1d src/roster_window.py --- a/src/roster_window.py Sun Feb 12 19:36:20 2012 -0500 +++ b/src/roster_window.py Sat Feb 18 21:06:08 2012 +0100 @@ -1917,6 +1917,9 @@ ft.show_stopped(jid, data, error_msg=msg_err) gajim.events.remove_events(account, jid, event) return True + elif event.type_ == 'file-hash-error': + ft.show_hash_error(jid, data) + gajim.events.remove_events(account, jid, event) elif event.type_ == 'file-completed': ft.show_completed(jid, data) gajim.events.remove_events(account, jid, event)

1 0

gajim: Quick fix [6de66f624e71]. print last message in room then...
by Fomin Denis 18 Feb '12

18 Feb '12

changeset 95ad415add80 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95ad415add80 description: Quick fix [6de66f624e71]. print last message in room then reconnect diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6de66f624e71 -r 95ad415add80 src/common/connection.py --- a/src/common/connection.py Sat Feb 18 22:48:03 2012 +0400 +++ b/src/common/connection.py Sat Feb 18 23:06:08 2012 +0400 @@ -2357,7 +2357,7 @@ if rejoin: tags['since'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime(gajim.logger.get_last_date_that_has_logs( - room_jid, is_room=True) + 1)) + room_jid, is_room=True))) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: do not duplicate messages in the room when the connection...
by Fomin Denis 18 Feb '12

18 Feb '12

changeset 6de66f624e71 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6de66f624e71 description: do not duplicate messages in the room when the connection is lost diffstat: src/common/connection.py | 7 ++++++- src/groupchat_control.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diffs (45 lines): diff -r cd12ea68f371 -r 6de66f624e71 src/common/connection.py --- a/src/common/connection.py Fri Feb 17 11:17:35 2012 +0400 +++ b/src/common/connection.py Sat Feb 18 22:48:03 2012 +0400 @@ -2304,7 +2304,8 @@ room_id=resp.getTag('unique').getData())) self.connection.SendAndCallForResponse(iq, _on_response) - def join_gc(self, nick, room_jid, password, change_nick=False): + def join_gc(self, nick, room_jid, password, change_nick=False, + rejoin=False): # FIXME: This room JID needs to be normalized; see #1364 if not gajim.account_is_connected(self.name): return @@ -2353,6 +2354,10 @@ last_date = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime( last_date)) tags['since'] = last_date + if rejoin: + tags['since'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(gajim.logger.get_last_date_that_has_logs( + room_jid, is_room=True) + 1)) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb diff -r cd12ea68f371 -r 6de66f624e71 src/groupchat_control.py --- a/src/groupchat_control.py Fri Feb 17 11:17:35 2012 +0400 +++ b/src/groupchat_control.py Sat Feb 18 22:48:03 2012 +0400 @@ -1274,7 +1274,7 @@ gajim.gc_connected[obj.conn.name][self.room_jid]: return password = gajim.gc_passwords.get(self.room_jid, '') - obj.conn.join_gc(self.nick, self.room_jid, password) + obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1351,7 +1351,7 @@ return False password = gajim.gc_passwords.get(self.room_jid, '') gajim.connections[self.account].join_gc(self.nick, self.room_jid, - password) + password, rejoin=True) return True def draw_roster(self):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2012