Commits

commits@gajim.org

17632 discussions

gajim: simplify code to compute how many logs do we request when...
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset 0a5aa768f117 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a5aa768f117 description: simplify code to compute how many logs do we request when we re-join a room diffstat: src/common/connection.py | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diffs (20 lines): diff -r 8d4593f3997f -r 0a5aa768f117 src/common/connection.py --- a/src/common/connection.py Wed Feb 22 10:07:16 2012 +0100 +++ b/src/common/connection.py Wed Feb 22 15:36:35 2012 +0100 @@ -2349,15 +2349,11 @@ last_date = self.last_history_time[room_jid] if last_date == 0: last_date = time.time() - timeout - else: + elif not rejoin: last_date = min(last_date, time.time() - timeout) 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))) nb = gajim.config.get('muc_restore_lines') if nb >= 0: tags['maxstanzas'] = nb

1 0

gajim: fix missing space in 2 strings
by Yann Leboulanger 22 Feb '12

22 Feb '12

changeset e6fe13f2bfbd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e6fe13f2bfbd description: fix missing space in 2 strings diffstat: po/be.po | 4 ++-- po/be(a)latin.po | 4 ++-- po/bg.po | 4 ++-- po/br.po | 4 ++-- po/cs.po | 4 ++-- po/da.po | 4 ++-- po/de.po | 4 ++-- po/el.po | 4 ++-- po/en_GB.po | 4 ++-- po/eo.po | 4 ++-- po/es.po | 4 ++-- po/eu.po | 4 ++-- po/fr.po | 4 ++-- po/gl.po | 4 ++-- po/hr.po | 4 ++-- po/it.po | 4 ++-- po/ja.po | 4 ++-- po/kk.po | 4 ++-- po/lt.po | 4 ++-- po/nb.po | 4 ++-- po/nl.po | 4 ++-- po/no.po | 4 ++-- po/pl.po | 4 ++-- po/pt.po | 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po | 4 ++-- po/sk.po | 4 ++-- po/sr.po | 4 ++-- po/sr(a)Latn.po | 4 ++-- po/sv.po | 4 ++-- po/uk.po | 4 ++-- po/zh_CN.po | 4 ++-- po/zh_TW.po | 4 ++-- 33 files changed, 66 insertions(+), 66 deletions(-) diffs (truncated from 693 to 300 lines): diff -r 117e6ac5081a -r e6fe13f2bfbd po/be.po --- a/po/be.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/be.po Wed Feb 22 10:34:15 2012 +0100 @@ -5394,7 +5394,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Праверце звесткі аўтарызацыі." #: ../src/common/connection.py:1475 @@ -5405,7 +5405,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых " "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні." diff -r 117e6ac5081a -r e6fe13f2bfbd po/be(a)latin.po --- a/po/be(a)latin.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/be(a)latin.po Wed Feb 22 10:34:15 2012 +0100 @@ -5417,7 +5417,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Kali łaska, pravier pravilnaść loginu i parolu." #: ../src/common/connection.py:1475 @@ -5428,7 +5428,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Śpis pryvatnaści %s nia vydaleny. Jon vykarystoŭvajecca adnoj z dałučanych " "krynic. Adklučy jaje i paŭtary znoŭ." diff -r 117e6ac5081a -r e6fe13f2bfbd po/bg.po --- a/po/bg.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/bg.po Wed Feb 22 10:34:15 2012 +0100 @@ -5358,7 +5358,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Проверете дали името и паролата са правилни." #: ../src/common/connection.py:1475 @@ -5369,7 +5369,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от " "свързаните ви ресурси. Изключете го и опитайте отново." diff -r 117e6ac5081a -r e6fe13f2bfbd po/br.po --- a/po/br.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/br.po Wed Feb 22 10:34:15 2012 +0100 @@ -5368,7 +5368,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ." #: ../src/common/connection.py:1475 @@ -5380,7 +5380,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/cs.po --- a/po/cs.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/cs.po Wed Feb 22 10:34:15 2012 +0100 @@ -5303,7 +5303,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Prosím zkontrolujte správnost jména a hesla." #: ../src/common/connection.py:1475 @@ -5314,7 +5314,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privacy list %s nebyl odstraněn. Možná je aktivní v jednom z připojených " "zdrojů. Zruště jeho používání a zkuste znovu." diff -r 117e6ac5081a -r e6fe13f2bfbd po/da.po --- a/po/da.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/da.po Wed Feb 22 10:34:15 2012 +0100 @@ -5326,7 +5326,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Venligst kontroller om dit logind og adgangskode er korrekt." #: ../src/common/connection.py:1475 @@ -5337,7 +5337,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privatlivs liste %s er ikke blevet fjernet. Den er måske aktiv i en af dine " "tilsluttede ressourcer. Deaktivér den og prøv igen." diff -r 117e6ac5081a -r e6fe13f2bfbd po/de.po --- a/po/de.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/de.po Wed Feb 22 10:34:15 2012 +0100 @@ -5379,7 +5379,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Bitte überprüfen Sie Benutzernamen und Passwort." #: ../src/common/connection.py:1475 @@ -5390,7 +5390,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Die Privatsphären-Liste %s wurde nicht entfernt. Möglicherweise ist sie noch " "in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie " diff -r 117e6ac5081a -r e6fe13f2bfbd po/el.po --- a/po/el.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/el.po Wed Feb 22 10:34:15 2012 +0100 @@ -5415,7 +5415,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας." #: ../src/common/connection.py:1475 @@ -5427,7 +5427,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/en_GB.po --- a/po/en_GB.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/en_GB.po Wed Feb 22 10:34:15 2012 +0100 @@ -5286,7 +5286,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Please check your login and password for correctness." #: ../src/common/connection.py:1475 @@ -5297,7 +5297,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privacy list %s has not been removed. It is maybe active in one of your " "connected resources. Deactivate it and try again." diff -r 117e6ac5081a -r e6fe13f2bfbd po/eo.po --- a/po/eo.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/eo.po Wed Feb 22 10:34:15 2012 +0100 @@ -5397,7 +5397,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto." #: ../src/common/connection.py:1475 @@ -5408,7 +5408,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "Privata listo %s ne forigitis. Ĝi eble estas aktiva en unu el viaj " "konektitaj risurcoj. Malaktivigu ĝin kaj provu denove." diff -r 117e6ac5081a -r e6fe13f2bfbd po/es.po --- a/po/es.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/es.po Wed Feb 22 10:34:15 2012 +0100 @@ -5337,7 +5337,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "" "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos." @@ -5349,7 +5349,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "La lista de privacidad %s no se ha eliminado. Podría estar activa en uno de " "tus recursos conectados. Desactívalo y prueba de nuevo." diff -r 117e6ac5081a -r e6fe13f2bfbd po/eu.po --- a/po/eu.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/eu.po Wed Feb 22 10:34:15 2012 +0100 @@ -5412,7 +5412,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz." #: ../src/common/connection.py:1475 @@ -5424,7 +5424,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/fr.po --- a/po/fr.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/fr.po Wed Feb 22 10:34:15 2012 +0100 @@ -5332,7 +5332,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects." #: ../src/common/connection.py:1475 @@ -5343,7 +5343,7 @@ #, fuzzy, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" "La liste privée %s n'a pas été supprimée. Elle est peut-être active dans une " "des ressources connectées. Désactivez la et réessayez." diff -r 117e6ac5081a -r e6fe13f2bfbd po/gl.po --- a/po/gl.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/gl.po Wed Feb 22 10:34:15 2012 +0100 @@ -5434,7 +5434,7 @@ #: ../src/common/connection.py:1400 #, fuzzy -msgid "Please check your login and passwordfor correctness." +msgid "Please check your login and password for correctness." msgstr "" "Por favor, comprobe que o seu nome de usuario e o seu contrasinal sexan os " "correctos." @@ -5448,7 +5448,7 @@ #, python-format msgid "" "Privacy list %s has not been removed. It is maybe active in one of your " -"connected resources. Deactivate it and tryagain." +"connected resources. Deactivate it and try again." msgstr "" #: ../src/common/connection.py:1858 diff -r 117e6ac5081a -r e6fe13f2bfbd po/hr.po --- a/po/hr.po Wed Feb 22 10:07:16 2012 +0100 +++ b/po/hr.po Wed Feb 22 10:34:15 2012 +0100 @@ -5316,7 +5316,7 @@ #: ../src/common/connection.py:1400

1 0

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

22 Feb '12

changeset 117e6ac5081a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=117e6ac5081a description: fix some string diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 710c1ada0cdf -r 117e6ac5081a 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 @@ -1398,7 +1398,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 @@ -1475,7 +1475,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 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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits