Commits October 2012

commits@gajim.org

3 participants
37 discussions

gajim-website: update website for 0.15.2
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 536c9d78818a in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=536c9d78818a description: update website for 0.15.2 diffstat: downloads.php | 2 +- index.php | 28 +++- locale/bg_BG/LC_MESSAGES/msg.po | 73 ++++++----- locale/de_DE/LC_MESSAGES/msg.po | 73 ++++++----- locale/eo/LC_MESSAGES/msg.po | 75 ++++++------ locale/es_ES/LC_MESSAGES/msg.po | 71 ++++++----- locale/fr_FR/LC_MESSAGES/msg.po | 75 ++++++------ locale/he_IL/LC_MESSAGES/msg.po | 230 +++++++++++++++++++++++++-------------- locale/hu_HU/LC_MESSAGES/msg.po | 73 ++++++----- locale/it_IT/LC_MESSAGES/msg.po | 73 ++++++----- locale/pl_PL/LC_MESSAGES/msg.po | 73 ++++++----- locale/pt_BR/LC_MESSAGES/msg.po | 73 ++++++----- locale/ru_RU/LC_MESSAGES/msg.po | 73 ++++++----- msg.pot | 66 ++++++----- 14 files changed, 592 insertions(+), 466 deletions(-) diffs (truncated from 2137 to 300 lines): diff -r 1dbfb7487870 -r 536c9d78818a downloads.php --- a/downloads.php Thu Aug 30 17:58:26 2012 +0200 +++ b/downloads.php Tue Oct 30 18:18:34 2012 +0100 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.15"; -$last_version = "0.15.1"; +$last_version = "0.15.2"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.15-beta4"); diff -r 1dbfb7487870 -r 536c9d78818a index.php --- a/index.php Thu Aug 30 17:58:26 2012 +0200 +++ b/index.php Tue Oct 30 18:18:34 2012 +0100 @@ -50,40 +50,50 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.15.1"), - 1 => sprintf(_("Gajim %s is here!"), "0.15"), + 0 => sprintf(_("Gajim %s is here!"), "0.15.2"), + 1 => sprintf(_("Gajim %s is here!"), "0.15.1"), + 2 => sprintf(_("Gajim %s is here!"), "0.15"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 6 => sprintf(_("Beta-release of Gajim %s"), "0.12"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("29 August 2012"), - 1 => _("18 March 2012"), + 0 => _("30 October 2012"), + 1 => _("29 August 2012"), + 2 => _("18 March 2012"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.15"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.15"), ); // 6 => sprintf(_("Version %s will arrive very soon."), "0.12"), // 7 => sprintf(_("Version %s will arrive soon."), "0.12")); // 3 => sprintf(_("New Windows Installer with GTK+ included.")), $array_news_whats_new = array( - 0 => sprintf(_("What's new since %s:"), "0.15"), - 1 => sprintf(_("What's new since %s:"), "0.14.4"), + 0 => sprintf(_("What's new since %s:"), "0.15.1"), + 1 => sprintf(_("What's new since %s:"), "0.15"), + 2 => sprintf(_("What's new since %s:"), "0.14.4"), ); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Fix crash when pressing ESC in chat window"), + 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.2/ChangeLog\">"._("Full ChangeLog")."</a> ", + 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.2\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Switch to python-farstream"), 1 => _("Fix several issues"), 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.1/ChangeLog\">"._("Full ChangeLog")."</a> ", 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.1\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), diff -r 1dbfb7487870 -r 536c9d78818a locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Thu Aug 30 17:58:26 2012 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Tue Oct 30 18:18:34 2012 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-29 09:56+0200\n" +"POT-Creation-Date: 2012-10-30 18:17+0100\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -257,11 +257,11 @@ msgid " Project is composed of:" msgstr " Проектът се състои от:" -#: dev.php:100 +#: dev.php:99 msgid " We also want to thank" msgstr " Също бихме искали да благодарим на" -#: dev.php:100 +#: dev.php:99 msgid "these people" msgstr "тези хора" @@ -756,76 +756,85 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:53 index.php:54 +#: index.php:53 index.php:54 index.php:55 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:61 +#: index.php:62 +#, fuzzy +msgid "30 October 2012" +msgstr "19 декември 2006 г." + +#: index.php:63 msgid "29 August 2012" msgstr "" -#: index.php:62 +#: index.php:64 msgid "18 March 2012" msgstr "" -#: index.php:66 index.php:67 +#: index.php:68 index.php:69 index.php:70 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:74 index.php:75 +#: index.php:77 index.php:78 index.php:79 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:80 +#: index.php:84 +msgid "Fix crash when pressing ESC in chat window" +msgstr "" + +#: index.php:85 index.php:92 index.php:104 +msgid "Full ChangeLog" +msgstr "Пълен дневник на промените" + +#: index.php:85 index.php:92 index.php:104 +#, fuzzy +msgid "Full changelog, see" +msgstr "Пълен дневник на промените" + +#: index.php:86 index.php:93 index.php:105 +msgid "List of fixed bugs" +msgstr "" + +#: index.php:90 msgid "Switch to python-farstream" msgstr "" -#: index.php:81 +#: index.php:91 #, fuzzy msgid "Fix several issues" msgstr "Нов превод: сръбски" -#: index.php:82 index.php:94 -msgid "Full ChangeLog" -msgstr "Пълен дневник на промените" - -#: index.php:82 index.php:94 -#, fuzzy -msgid "Full changelog, see" -msgstr "Пълен дневник на промените" - -#: index.php:83 index.php:95 -msgid "List of fixed bugs" -msgstr "" - -#: index.php:87 +#: index.php:97 msgid "Plugin system" msgstr "" -#: index.php:88 +#: index.php:98 msgid "Whiteboard (via a plugin)" msgstr "" -#: index.php:89 +#: index.php:99 msgid "Message archiving" msgstr "" -#: index.php:90 +#: index.php:100 msgid "Stream managment" msgstr "" -#: index.php:91 +#: index.php:101 msgid "Nested roster group" msgstr "" -#: index.php:92 +#: index.php:102 msgid "Roster filtrering" msgstr "" -#: index.php:93 +#: index.php:103 msgid "GPG and spell checking support for windows" msgstr "" @@ -878,10 +887,6 @@ #~ msgstr "19 декември 2006 г." #, fuzzy -#~ msgid "08 October 2011" -#~ msgstr "19 декември 2006 г." - -#, fuzzy #~ msgid "17 September 2011" #~ msgstr "19 декември 2006 г." diff -r 1dbfb7487870 -r 536c9d78818a locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Thu Aug 30 17:58:26 2012 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Tue Oct 30 18:18:34 2012 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-29 09:56+0200\n" +"POT-Creation-Date: 2012-10-30 18:17+0100\n" "PO-Revision-Date: 2008-12-22 22:59+0100\n" "Last-Translator: \n" "Language-Team: German <kde-i18n-de(a)lists.kde.org>\n" @@ -265,11 +265,11 @@ msgid " Project is composed of:" msgstr " Gajim ist das Werk von:" -#: dev.php:100 +#: dev.php:99 msgid " We also want to thank" msgstr " Außerdem wollen wir noch" -#: dev.php:100 +#: dev.php:99 msgid "these people" msgstr "diesen Leuten danken" @@ -784,77 +784,86 @@ msgid "NEWS" msgstr "NEUIGKEITEN" -#: index.php:53 index.php:54 +#: index.php:53 index.php:54 index.php:55 #, c-format msgid "Gajim %s is here!" msgstr "Gajim %s ist da!" -#: index.php:61 +#: index.php:62 +#, fuzzy +msgid "30 October 2012" +msgstr "22. September 2007" + +#: index.php:63 #, fuzzy msgid "29 August 2012" msgstr "12. August 2008" -#: index.php:62 +#: index.php:64 msgid "18 March 2012" msgstr "" -#: index.php:66 index.php:67 +#: index.php:68 index.php:69 index.php:70 #, c-format msgid "Version %s of Gajim has been released." msgstr "Version %s von Gajim wurde veröffentlicht." -#: index.php:74 index.php:75 +#: index.php:77 index.php:78 index.php:79 #, c-format msgid "What's new since %s:" msgstr "Was ist neu seit %s:" -#: index.php:80 +#: index.php:84 +msgid "Fix crash when pressing ESC in chat window" +msgstr "" + +#: index.php:85 index.php:92 index.php:104 +msgid "Full ChangeLog" +msgstr "Vollständige Veränderungshistorie" + +#: index.php:85 index.php:92 index.php:104 +#, fuzzy

1 0

gajim: Added tag gajim-0.15.2 for changeset 970a8f2ab76d
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 05d010254411 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05d010254411 description: Added tag gajim-0.15.2 for changeset 970a8f2ab76d diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 970a8f2ab76d -r 05d010254411 .hgtags --- a/.hgtags Tue Oct 30 17:31:43 2012 +0100 +++ b/.hgtags Tue Oct 30 18:15:52 2012 +0100 @@ -11,3 +11,4 @@ 5a486555abcdf2413144d71a0703e618134ca3e6 gajim-0.15-beta4 da5a3cc7b8df6be335142f47cf27b80d5d859e2a gajim-0.15 1db355e55e5a690754adbcf8b530d1b1ba2e286f gajim-0.15.1 +970a8f2ab76d3d00d78e8d5310d24bcbe575368c gajim-0.15.2

1 0

gajim: prepare 0.15.2 release
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 970a8f2ab76d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=970a8f2ab76d description: prepare 0.15.2 release diffstat: ChangeLog | 7 +++++++ autogen.sh | 2 +- gajim.nsi | 2 +- src/common/defs.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diffs (48 lines): diff -r 295fdaf72b2d -r 970a8f2ab76d ChangeLog --- a/ChangeLog Sat Oct 06 19:06:56 2012 +0200 +++ b/ChangeLog Tue Oct 30 17:31:43 2012 +0100 @@ -1,3 +1,10 @@ +Gajim 0.15.2 (30 October 2012) + + * Show punycode encoded urls if they contain non-ascii chars + * Fix crash when pressing Esc in chat window + * Support Network Manager 0.9 + * decrypt GPG messages in the correct order + Gajim 0.15.1 (29 August 2012) * Switch from python-farsight to python-farstream diff -r 295fdaf72b2d -r 970a8f2ab76d autogen.sh --- a/autogen.sh Sat Oct 06 19:06:56 2012 +0200 +++ b/autogen.sh Tue Oct 30 17:31:43 2012 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.1" + gajimversion="0.15.2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 295fdaf72b2d -r 970a8f2ab76d gajim.nsi --- a/gajim.nsi Sat Oct 06 19:06:56 2012 +0200 +++ b/gajim.nsi Tue Oct 30 17:31:43 2012 +0100 @@ -191,7 +191,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.2" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 295fdaf72b2d -r 970a8f2ab76d src/common/defs.py --- a/src/common/defs.py Sat Oct 06 19:06:56 2012 +0200 +++ b/src/common/defs.py Tue Oct 30 17:31:43 2012 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.1' +version = '0.15.2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: don't show Clear in received single message. Fixes #7244
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 295fdaf72b2d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=295fdaf72b2d description: don't show Clear in received single message. Fixes #7244 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4199041f5034 -r 295fdaf72b2d src/dialogs.py --- a/src/dialogs.py Mon Sep 24 12:24:10 2012 +0200 +++ b/src/dialogs.py Sat Oct 06 19:06:56 2012 +0200 @@ -2891,7 +2891,7 @@ self.conversation_scrolledwindow = self.xml.get_object( 'conversation_scrolledwindow') self.conversation_textview = conversation_textview.ConversationTextview( - account) + account, used_in_history_window=True) self.conversation_textview.tv.show() self.conversation_tv_buffer = self.conversation_textview.tv.get_buffer() self.xml.get_object('conversation_scrolledwindow').add(

1 0

gajim: decrease call to get_contact(s) function to improve speed...
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 4199041f5034 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4199041f5034 description: decrease call to get_contact(s) function to improve speed. see #7125 diffstat: src/common/contacts.py | 2 +- src/roster_window.py | 29 ++++++++++++++++++----------- 2 files changed, 19 insertions(+), 12 deletions(-) diffs (79 lines): diff -r 682b687ebdc5 -r 4199041f5034 src/common/contacts.py --- a/src/common/contacts.py Sun Sep 23 13:34:21 2012 +0200 +++ b/src/common/contacts.py Mon Sep 24 12:24:10 2012 +0200 @@ -370,7 +370,7 @@ self.is_big_brother(account, jid, accounts): # count metacontacts only once continue - contact = self.get_contact_with_highest_priority(account, jid) + contact = self._accounts[account].contacts._contacts[jid][0] if _('Not in roster') in contact.groups: continue in_groups = False diff -r 682b687ebdc5 -r 4199041f5034 src/roster_window.py --- a/src/roster_window.py Sun Sep 23 13:34:21 2012 +0200 +++ b/src/roster_window.py Mon Sep 24 12:24:10 2012 +0200 @@ -1136,16 +1136,18 @@ self.draw_contact(parent_jid, parent_account) return False - def draw_contact(self, jid, account, selected=False, focus=False): + def draw_contact(self, jid, account, selected=False, focus=False, contact_instances=None, contact=None): """ Draw the correct state image, name BUT not avatar """ # focus is about if the roster window has toplevel-focus or not # FIXME: We really need a custom cell_renderer - contact_instances = gajim.contacts.get_contacts(account, jid) - contact = gajim.contacts.get_highest_prio_contact_from_contacts( - contact_instances) + if not contact_instances: + contact_instances = gajim.contacts.get_contacts(account, jid) + if not contact: + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) if not contact: return False @@ -1308,11 +1310,11 @@ else: return False - def draw_all_pep_types(self, jid, account): + def draw_all_pep_types(self, jid, account, contact=None): for pep_type in self._pep_type_to_model_column: - self.draw_pep(jid, account, pep_type) - - def draw_pep(self, jid, account, pep_type): + self.draw_pep(jid, account, pep_type, contact=contact) + + def draw_pep(self, jid, account, pep_type, contact=None): if pep_type not in self._pep_type_to_model_column: return if not self._is_pep_shown_in_roster(pep_type): @@ -1322,7 +1324,8 @@ iters = self._get_contact_iter(jid, account, model=self.model) if not iters: return - contact = gajim.contacts.get_contact(account, jid) + if not contact: + contact = gajim.contacts.get_contact(account, jid) if pep_type in contact.pep: pixbuf = contact.pep[pep_type].asPixbufIcon() else: @@ -1345,8 +1348,12 @@ return False def draw_completely(self, jid, account): - self.draw_contact(jid, account) - self.draw_all_pep_types(jid, account) + contact_instances = gajim.contacts.get_contacts(account, jid) + contact = gajim.contacts.get_highest_prio_contact_from_contacts( + contact_instances) + self.draw_contact(jid, account, contact_instances=contact_instances, + contact=contact) + self.draw_all_pep_types(jid, account, contact=contact) self.draw_avatar(jid, account) def adjust_and_draw_contact_context(self, jid, account):

1 0

gajim: fix var name. Fixes #7229
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 682b687ebdc5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=682b687ebdc5 description: fix var name. Fixes #7229 diffstat: src/common/connection_handlers.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (16 lines): diff -r 4f9b0ddf7b2f -r 682b687ebdc5 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 19 09:49:43 2012 +0200 +++ b/src/common/connection_handlers.py Sun Sep 23 13:34:21 2012 +0200 @@ -999,9 +999,9 @@ def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt): - encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] - gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], + self._on_message_decrypted, [obj2]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))

1 0

gajim: fix function argument. Fixes #7229
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 4f9b0ddf7b2f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4f9b0ddf7b2f description: fix function argument. Fixes #7229 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 65424188a04f -r 4f9b0ddf7b2f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Sep 18 16:07:11 2012 +0200 +++ b/src/common/connection_handlers.py Wed Sep 19 09:49:43 2012 +0200 @@ -965,7 +965,7 @@ if sess.enable_encryption: sess.terminate_e2e() - def decrypt_thread(encmsg, keyID, obj): + def decrypt_thread(self, encmsg, keyID, obj): decmsg = self.gpg.decrypt(encmsg, keyID) decmsg = self.connection.Dispatcher.replace_non_character(decmsg) # \x00 chars are not allowed in C (so in GTK)

1 0

gajim: decrypt GPG messages one after the other. Fixes #7229
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 65424188a04f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=65424188a04f description: decrypt GPG messages one after the other. Fixes #7229 diffstat: src/common/connection_handlers.py | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diffs (57 lines): diff -r e0de4f6d0d18 -r 65424188a04f src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Sep 03 22:02:07 2012 +0400 +++ b/src/common/connection_handlers.py Tue Sep 18 16:07:11 2012 +0200 @@ -763,6 +763,9 @@ # keep track of sessions this connection has with other JIDs self.sessions = {} + # We decrypt GPG messages one after the other. Keep queue in mem + self.gpg_messages_to_decrypt = [] + gajim.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, @@ -962,6 +965,14 @@ if sess.enable_encryption: sess.terminate_e2e() + def decrypt_thread(encmsg, keyID, obj): + decmsg = self.gpg.decrypt(encmsg, keyID) + decmsg = self.connection.Dispatcher.replace_non_character(decmsg) + # \x00 chars are not allowed in C (so in GTK) + obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', '')) + obj.encrypted = 'xep27' + self.gpg_messages_to_decrypt.remove([encmsg, keyID, obj]) + def _nec_message_received(self, obj): if obj.conn.name != self.name: return @@ -979,20 +990,18 @@ keyID = gajim.config.get_per('accounts', self.name, 'keyid') if keyID: - def decrypt_thread(encmsg, keyID, obj): - decmsg = self.gpg.decrypt(encmsg, keyID) - decmsg = self.connection.Dispatcher.replace_non_character( - decmsg) - # \x00 chars are not allowed in C (so in GTK) - obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', - '')) - obj.encrypted = 'xep27' - gajim.thread_interface(decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + self.gpg_messages_to_decrypt.append([encmsg, keyID, obj]) + if len(self.gpg_messages_to_decrypt) == 1: + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, + obj], self._on_message_decrypted, [obj]) return self._on_message_decrypted(None, obj) def _on_message_decrypted(self, output, obj): + if len(self.gpg_messages_to_decrypt): + encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], + self._on_message_decrypted, [obj]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))

1 0

gajim: [Aлекс]. Fix time string encoding in the russian windows(...
by Fomin Denis 30 Oct '12

30 Oct '12

changeset e0de4f6d0d18 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e0de4f6d0d18 description: [Aлекс]. Fix time string encoding in the russian windows(cp1251). diffstat: src/conversation_textview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d3368ce04285 -r e0de4f6d0d18 src/conversation_textview.py --- a/src/conversation_textview.py Mon Oct 29 15:11:16 2012 +0100 +++ b/src/conversation_textview.py Mon Sep 03 22:02:07 2012 +0400 @@ -1334,7 +1334,7 @@ timestamp_str = helpers.from_one_line(timestamp_str) format_ += timestamp_str tim_format = time.strftime(format_, tim) - if locale.getpreferredencoding() != 'KOI8-R': + if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'): # if tim_format comes as unicode because of day_str. # we convert it to the encoding that we want (and that is utf-8) tim_format = helpers.ensure_utf8_string(tim_format)

1 0

gajim: change Name in gajim.desktop. Fixes #7256
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset d3368ce04285 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d3368ce04285 description: change Name in gajim.desktop. Fixes #7256 diffstat: data/gajim.desktop.in.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 6f0e22a69b08 -r d3368ce04285 data/gajim.desktop.in.in --- a/data/gajim.desktop.in.in Thu Oct 18 00:36:57 2012 +0400 +++ b/data/gajim.desktop.in.in Mon Oct 29 15:11:16 2012 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Network;InstantMessaging;GTK;GNOME; -_Name=Gajim Instant Messenger +_Name=Gajim _GenericName=Jabber IM Client _Comment=A GTK+ Jabber client Version=1.0

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2012