Commits May 2013

commits@gajim.org

3 participants
25 discussions

python-nbxmpp: Catches more general exception on socket, then di...
by Jefry Lagrange 26 May '13

26 May '13

changeset 56ba7bd207d3 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=56ba7bd207d3 description: Catches more general exception on socket, then disconnect. diffstat: nbxmpp/client_nb.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 1c866be7c020 -r 56ba7bd207d3 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Wed May 15 14:47:33 2013 +0200 +++ b/nbxmpp/client_nb.py Sun May 26 12:30:51 2013 -0400 @@ -252,6 +252,10 @@ except socket.gaierror, (errnum, errstr): self.disconnect(message='Lookup failure for %s:%s, hostname: %s - %s' % (self.Server, self.Port, hostname, errstr)) + except socket.error , (errnum, errstr): + # Catches an unexpected error with the socket + self.disconnect(message='General socket error for %s:%s, hostname: %s - %s' % + (self.Server, self.Port, hostname, errstr)) else: on_success()

1 0

gajim: fix privacy lists: Don't use several time the same order ...
by Yann Leboulanger 26 May '13

26 May '13

changeset 4bb338fce36f in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4bb338fce36f description: fix privacy lists: Don't use several time the same order number. Fixes #7352 diffstat: src/common/connection.py | 14 ++++++++++++-- src/groupchat_control.py | 3 ++- 2 files changed, 14 insertions(+), 3 deletions(-) diffs (51 lines): diff -r 38a2c340f3c0 -r 4bb338fce36f src/common/connection.py --- a/src/common/connection.py Sat May 25 20:53:36 2013 +0200 +++ b/src/common/connection.py Sun May 26 12:58:19 2013 +0200 @@ -1603,6 +1603,14 @@ iq.setQuery().setTag('active', {'name': name}) self.connection.send(iq) + def get_max_blocked_list_order(self): + max_order = 0 + for rule in self.blocked_list: + order = int(rule['order']) + if order > max_order: + max_order = order + return max_order + def block_contacts(self, contact_list, message): if not self.privacy_rules_supported: if self.blocking_supported: #XEP-0191 @@ -1616,7 +1624,8 @@ return for contact in contact_list: self.send_custom_status('offline', message, contact.jid) - new_rule = {'order': '1', 'type': 'jid', 'action': 'deny', + max_order = self.get_max_blocked_list_order() + new_rule = {'order': str(max_order + 1), 'type': 'jid', 'action': 'deny', 'value' : contact.jid, 'child': ['message', 'iq', 'presence-out']} self.blocked_list.append(new_rule) @@ -1672,7 +1681,8 @@ self.blocked_groups.append(group) for contact in contact_list: self.send_custom_status('offline', message, contact.jid) - new_rule = {'order': '1', 'type': 'group', 'action': 'deny', + max_order = self.get_max_blocked_list_order() + new_rule = {'order': str(max_order + 1), 'type': 'group', 'action': 'deny', 'value' : group, 'child': ['message', 'iq', 'presence-out']} self.blocked_list.append(new_rule) self.set_privacy_list('block', self.blocked_list) diff -r 38a2c340f3c0 -r 4bb338fce36f src/groupchat_control.py --- a/src/groupchat_control.py Sat May 25 20:53:36 2013 +0200 +++ b/src/groupchat_control.py Sun May 26 12:58:19 2013 +0200 @@ -2757,7 +2757,8 @@ connection = gajim.connections[self.account] if fjid in connection.blocked_contacts: return - new_rule = {'order': u'1', 'type': u'jid', 'action': u'deny', + max_order = connection.get_max_blocked_list_order() + new_rule = {'order': str(max_order + 1), 'type': u'jid', 'action': u'deny', 'value' : fjid, 'child': [u'message', u'iq', u'presence-out']} connection.blocked_list.append(new_rule) connection.blocked_contacts.append(fjid)

1 0

gajim: get files from 0.15 branch
by Yann Leboulanger 25 May '13

25 May '13

changeset 38a2c340f3c0 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=38a2c340f3c0 description: get files from 0.15 branch diffstat: ChangeLog | 6 ++++++ autogen.sh | 2 +- gajim.nsi | 2 +- src/common/defs.py | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diffs (50 lines): diff -r 2313eaeaa7ca -r 38a2c340f3c0 ChangeLog --- a/ChangeLog Sun May 19 20:40:20 2013 +0400 +++ b/ChangeLog Sat May 25 20:53:36 2013 +0200 @@ -8,6 +8,12 @@ * Support XEP-0224 Attention * Support XEP-0191 Blocking command +Gajim 0.15.4 (25 May 2013) + + * Fix usage of OTR plugin + * Fix connection to non-SSL server + * Fix receiving GPG-encrypted messages while offline. + Gajim 0.15.3 (17 March 2013) * Better handling of SSL errors diff -r 2313eaeaa7ca -r 38a2c340f3c0 autogen.sh --- a/autogen.sh Sun May 19 20:40:20 2013 +0400 +++ b/autogen.sh Sat May 25 20:53:36 2013 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.3" + gajimversion="0.15.4" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 2313eaeaa7ca -r 38a2c340f3c0 gajim.nsi --- a/gajim.nsi Sun May 19 20:40:20 2013 +0400 +++ b/gajim.nsi Sat May 25 20:53:36 2013 +0200 @@ -200,7 +200,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.3" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 2313eaeaa7ca -r 38a2c340f3c0 src/common/defs.py --- a/src/common/defs.py Sun May 19 20:40:20 2013 +0400 +++ b/src/common/defs.py Sat May 25 20:53:36 2013 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.3.0' +version = '0.15.4.0' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: Added tag gajim-0.15.4 for changeset 4fd195463911
by Yann Leboulanger 25 May '13

25 May '13

changeset 9308975f6127 in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=9308975f6127 description: Added tag gajim-0.15.4 for changeset 4fd195463911 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 4fd195463911 -r 9308975f6127 .hgtags --- a/.hgtags Tue Mar 19 10:25:10 2013 +0100 +++ b/.hgtags Sat May 25 20:41:27 2013 +0200 @@ -13,3 +13,4 @@ 1db355e55e5a690754adbcf8b530d1b1ba2e286f gajim-0.15.1 970a8f2ab76d3d00d78e8d5310d24bcbe575368c gajim-0.15.2 aef163617c5634482d6feb46cefd4206432810d2 gajim-0.15.3 +4fd195463911e5272999920de43feffe9faf0dd2 gajim-0.15.4

1 0

gajim-website: update website for 0.15.4
by Yann Leboulanger 25 May '13

25 May '13

changeset 0a80169ad848 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=0a80169ad848 description: update website for 0.15.4 diffstat: downloads.php | 4 +- index.php | 49 +++++++++++++-------- locale/bg_BG/LC_MESSAGES/msg.po | 75 +++++++++++++++++++--------------- locale/de_DE/LC_MESSAGES/msg.po | 85 +++++++++++++++++++++----------------- locale/eo/LC_MESSAGES/msg.po | 75 +++++++++++++++++++--------------- locale/es_ES/LC_MESSAGES/msg.po | 83 +++++++++++++++++++++----------------- locale/fr_FR/LC_MESSAGES/msg.po | 84 ++++++++++++++++++++----------------- locale/he_IL/LC_MESSAGES/msg.po | 71 +++++++++++++++++++------------- locale/hu_HU/LC_MESSAGES/msg.po | 76 +++++++++++++++++++--------------- locale/it_IT/LC_MESSAGES/msg.po | 75 +++++++++++++++++++--------------- locale/pl_PL/LC_MESSAGES/msg.po | 85 +++++++++++++++++++++----------------- locale/pt_BR/LC_MESSAGES/msg.po | 85 +++++++++++++++++++++----------------- locale/ru_RU/LC_MESSAGES/msg.po | 89 ++++++++++++++++++++++------------------ msg.pot | 78 ++++++++++++++++++++--------------- 14 files changed, 568 insertions(+), 446 deletions(-) diffs (truncated from 2145 to 300 lines): diff -r d07b22999e56 -r 0a80169ad848 downloads.php --- a/downloads.php Mon May 20 16:51:39 2013 +0200 +++ b/downloads.php Sat May 25 20:44:10 2013 +0200 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.15"; -$last_version = "0.15.3"; +$last_version = "0.15.4"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.15-beta4"); @@ -145,7 +145,7 @@ print (" </h2>\n"); print ("</a>\n"); #print _("Installer for 0.14 will be available as soon as possible. Currently available:")." <a href=\"downloads/0.13/gajim-0.13.4-2.exe\">"._("Gajim 0.13.4 installer")."</a>.\n"; -print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-2.exe\">"._("Gajim installer")."</a>.\n"; +print _(" There is a ")." <a href=\"downloads/".$download_folder."/gajim-".$last_version."-1.exe\">"._("Gajim installer")."</a>.\n"; #print _("The installer doesn't contain translations because of a") . " <a href=\"https://bugzilla.gnome.org/show_bug.cgi?id=574520\">" . _("GTK bug") . "</a>.\n"; print (" \n"); #print _(" Here is a")." <a href=\"downloads/0.15/gajim-0.15-beta4-2.exe\">"._("Gajim installer")."</a> "; diff -r d07b22999e56 -r 0a80169ad848 index.php --- a/index.php Mon May 20 16:51:39 2013 +0200 +++ b/index.php Sat May 25 20:44:10 2013 +0200 @@ -50,41 +50,52 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.15.3"), - 1 => sprintf(_("Gajim %s is here!"), "0.15.2"), - 2 => sprintf(_("Gajim %s is here!"), "0.15.1"), - 3 => sprintf(_("Gajim %s is here!"), "0.15"), + 0 => sprintf(_("Gajim %s is here!"), "0.15.4"), + 1 => sprintf(_("Gajim %s is here!"), "0.15.3"), + 2 => sprintf(_("Gajim %s is here!"), "0.15.2"), + 3 => sprintf(_("Gajim %s is here!"), "0.15.1"), + 4 => 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 => _("17 March 2013"), - 1 => _("30 October 2012"), - 2 => _("29 August 2012"), - 3 => _("18 March 2012"), + 0 => _("25 May 2013"), + 1 => _("17 March 2013"), + 2 => _("30 October 2012"), + 3 => _("29 August 2012"), + 4 => _("18 March 2012"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), - 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), - 2 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), - 3 => sprintf(_("Version %s of Gajim has been released."), "0.15"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.15.4"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.15.3"), + 2 => sprintf(_("Version %s of Gajim has been released."), "0.15.2"), + 3 => sprintf(_("Version %s of Gajim has been released."), "0.15.1"), + 4 => 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.2"), - 1 => sprintf(_("What's new since %s:"), "0.15.1"), - 1 => sprintf(_("What's new since %s:"), "0.15"), - 3 => sprintf(_("What's new since %s:"), "0.14.4"), + 0 => sprintf(_("What's new since %s:"), "0.15.3"), + 1 => sprintf(_("What's new since %s:"), "0.15.2"), + 2 => sprintf(_("What's new since %s:"), "0.15.1"), + 3 => sprintf(_("What's new since %s:"), "0.15"), + 4 => sprintf(_("What's new since %s:"), "0.14.4"), ); // 3 => sprintf(_("What's new in it:")), $array_news_items[0] = array( + 0 => _("Fix connection to non-SSL servers"), + 1 => _("Minor other fixes"), + 2 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.15.4/ChangeLog\">"._("Full ChangeLog")."</a> ", + 3 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.4\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Better handling of SSL errors"), 1 => _("Better handling of canceling file transfer"), 2 => _("Improve farstream calls"), @@ -92,20 +103,20 @@ 4 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.15.3\">"._("List of fixed bugs")."</a>", ); -$array_news_items[1] = array( +$array_news_items[2] = 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[2] = array( +$array_news_items[3] = 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[3] = array( +$array_news_items[4] = array( 0 => _("Plugin system"), 1 => _("Whiteboard (via a plugin)"), 2 => _("Message archiving"), diff -r d07b22999e56 -r 0a80169ad848 locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Mon May 20 16:51:39 2013 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sat May 25 20:44:10 2013 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 19:25+0100\n" +"POT-Creation-Date: 2013-05-25 20:43+0200\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" @@ -761,101 +761,114 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:53 index.php:54 index.php:55 index.php:56 +#: index.php:53 index.php:54 index.php:55 index.php:56 index.php:57 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:63 +#: index.php:64 +#, fuzzy +msgid "25 May 2013" +msgstr "18 февруари 2007 г." + +#: index.php:65 msgid "17 March 2013" msgstr "" -#: index.php:64 +#: index.php:66 #, fuzzy msgid "30 October 2012" msgstr "19 декември 2006 г." -#: index.php:65 +#: index.php:67 msgid "29 August 2012" msgstr "" -#: index.php:66 +#: index.php:68 msgid "18 March 2012" msgstr "" -#: index.php:70 index.php:71 index.php:72 index.php:73 +#: index.php:72 index.php:73 index.php:74 index.php:75 index.php:76 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:80 index.php:81 index.php:82 index.php:83 +#: index.php:83 index.php:84 index.php:85 index.php:86 index.php:87 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:88 -msgid "Better handling of SSL errors" +#: index.php:92 +msgid "Fix connection to non-SSL servers" msgstr "" -#: index.php:89 -msgid "Better handling of canceling file transfer" +#: index.php:93 +msgid "Minor other fixes" msgstr "" -#: index.php:90 -msgid "Improve farstream calls" -msgstr "" - -#: index.php:91 index.php:97 index.php:104 index.php:116 +#: index.php:94 index.php:102 index.php:108 index.php:115 index.php:127 msgid "Full ChangeLog" msgstr "Пълен дневник на промените" -#: index.php:91 index.php:97 index.php:104 index.php:116 +#: index.php:94 index.php:102 index.php:108 index.php:115 index.php:127 #, fuzzy msgid "Full changelog, see" msgstr "Пълен дневник на промените" -#: index.php:92 index.php:98 index.php:105 index.php:117 +#: index.php:95 index.php:103 index.php:109 index.php:116 index.php:128 msgid "List of fixed bugs" msgstr "" -#: index.php:96 +#: index.php:99 +msgid "Better handling of SSL errors" +msgstr "" + +#: index.php:100 +msgid "Better handling of canceling file transfer" +msgstr "" + +#: index.php:101 +msgid "Improve farstream calls" +msgstr "" + +#: index.php:107 msgid "Fix crash when pressing ESC in chat window" msgstr "" -#: index.php:102 +#: index.php:113 msgid "Switch to python-farstream" msgstr "" -#: index.php:103 +#: index.php:114 #, fuzzy msgid "Fix several issues" msgstr "Нов превод: сръбски" -#: index.php:109 +#: index.php:120 msgid "Plugin system" msgstr "" -#: index.php:110 +#: index.php:121 msgid "Whiteboard (via a plugin)" msgstr "" -#: index.php:111 +#: index.php:122 msgid "Message archiving" msgstr "" -#: index.php:112 +#: index.php:123 msgid "Stream managment" msgstr "" -#: index.php:113 +#: index.php:124 msgid "Nested roster group" msgstr "" -#: index.php:114 +#: index.php:125 msgid "Roster filtrering" msgstr "" -#: index.php:115 +#: index.php:126 msgid "GPG and spell checking support for windows" msgstr "" @@ -900,10 +913,6 @@ #~ msgstr "Предварително издание на Gajim 0.11.1" #, fuzzy -#~ msgid "22 January 2012" -#~ msgstr "18 февруари 2007 г." - -#, fuzzy #~ msgid "18 December 2011" #~ msgstr "19 декември 2006 г." diff -r d07b22999e56 -r 0a80169ad848 locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Mon May 20 16:51:39 2013 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Sat May 25 20:44:10 2013 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 19:25+0100\n" +"POT-Creation-Date: 2013-05-25 20:43+0200\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" @@ -789,103 +789,116 @@ msgid "NEWS" msgstr "NEUIGKEITEN" -#: index.php:53 index.php:54 index.php:55 index.php:56

1 0

gajim: use GED to send messages via gajim-remote. Fixes #7321
by Yann Leboulanger 25 May '13

25 May '13

changeset 4fd195463911 in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=4fd195463911 description: use GED to send messages via gajim-remote. Fixes #7321 diffstat: src/remote_control.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 46e27d4d6a9c -r 4fd195463911 src/remote_control.py --- a/src/remote_control.py Sun Apr 21 10:13:47 2013 +0200 +++ b/src/remote_control.py Tue Mar 19 10:25:10 2013 +0100 @@ -37,6 +37,7 @@ from time import time from dialogs import AddNewContactWindow, NewChatDialog, JoinGroupchatWindow from common import ged +from common.connection_handlers_events import MessageOutgoingEvent from common import dbus_support if dbus_support.supported: @@ -442,8 +443,10 @@ if ctrl: ctrl.print_conversation(message, frm='outgoing') - connection.send_message(jid, message, keyID, type_, subject, - session=session) + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, + account=connected_account, jid=jid, message=message, + keyID=keyID, type_=type_, control=ctrl)) + return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False) @@ -463,7 +466,7 @@ keyID is specified, encrypt the message with the pgp key """ jid = self._get_real_jid(jid, account) - return self._send_message(jid, message, keyID, account, type, subject) + return self._send_message(jid, message, keyID, account, 'normal', subject) @dbus.service.method(INTERFACE, in_signature='sss', out_signature='b') def send_groupchat_message(self, room_jid, message, account):

1 0

gajim: translate also files in src/command_system/*.py. Fixes #7324
by Yann Leboulanger 25 May '13

25 May '13

changeset 46e27d4d6a9c in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=46e27d4d6a9c description: translate also files in src/command_system/*.py. Fixes #7324 diffstat: autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 70a278c9676d -r 46e27d4d6a9c autogen.sh --- a/autogen.sh Sat May 25 17:21:02 2013 +0200 +++ b/autogen.sh Sun Apr 21 10:13:47 2013 +0200 @@ -15,7 +15,7 @@ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ && ls -1 data/gajim.desktop.in.in \ - src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ + src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then

1 0

gajim: prepare 0.15.4 release
by Yann Leboulanger 25 May '13

25 May '13

changeset 70a278c9676d in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=70a278c9676d description: prepare 0.15.4 release diffstat: ChangeLog | 7 +++++++ autogen.sh | 2 +- gajim.nsi | 2 +- src/common/defs.py | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diffs (49 lines): diff -r b6e2c800391a -r 70a278c9676d ChangeLog --- a/ChangeLog Sun Apr 14 08:49:10 2013 +0200 +++ b/ChangeLog Sat May 25 17:21:02 2013 +0200 @@ -1,4 +1,11 @@ +Gajim 0.15.4 (25 May 2013) + + * Fix usage of OTR plugin + * Fix connection to non-SSL server + * Fix receiving GPG-encrypted messages while offline. + Gajim 0.15.3 (17 March 2013) + * Better handling of SSL errors * Better handling of canceling file transfer * Improve farstream calls diff -r b6e2c800391a -r 70a278c9676d autogen.sh --- a/autogen.sh Sun Apr 14 08:49:10 2013 +0200 +++ b/autogen.sh Sat May 25 17:21:02 2013 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.3" + gajimversion="0.15.4" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r b6e2c800391a -r 70a278c9676d gajim.nsi --- a/gajim.nsi Sun Apr 14 08:49:10 2013 +0200 +++ b/gajim.nsi Sat May 25 17:21:02 2013 +0200 @@ -200,7 +200,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.3" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r b6e2c800391a -r 70a278c9676d src/common/defs.py --- a/src/common/defs.py Sun Apr 14 08:49:10 2013 +0200 +++ b/src/common/defs.py Sat May 25 17:21:02 2013 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.3' +version = '0.15.4' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: make FakeDataform instructino label selectable. Fixes #7331
by Yann Leboulanger 25 May '13

25 May '13

changeset b6e2c800391a in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=b6e2c800391a description: make FakeDataform instructino label selectable. Fixes #7331 diffstat: src/config.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (39 lines): diff -r 97eea48bdf04 -r b6e2c800391a src/config.py --- a/src/config.py Fri Apr 05 20:59:17 2013 +0200 +++ b/src/config.py Sun Apr 14 08:49:10 2013 +0200 @@ -2669,9 +2669,10 @@ table {entry1: value1} """ - def __init__(self, infos): + def __init__(self, infos, selectable=False): gtk.Table.__init__(self) self.infos = infos + self.selectable = selectable self.entries = {} self._draw_table() @@ -2684,6 +2685,8 @@ nbrow = 1 self.resize(rows = nbrow, columns = 2) label = gtk.Label(self.infos['instructions']) + if self.selectable: + label.set_selectable(True) self.attach(label, 0, 2, 0, 1, 0, 0, 0, 0) for name in self.infos.keys(): if name in ('key', 'instructions', 'x', 'registered'): @@ -3793,10 +3796,12 @@ empty_config = True if obj.is_form: dataform = dataforms.ExtendForm(node=obj.config) - self.data_form_widget = dataforms_widget.DataFormWidget(dataform) + self.data_form_widget = dataforms_widget.DataFormWidget() + self.data_form_widget.selectable = True + self.data_form_widget.set_data_form(dataform) empty_config = False else: - self.data_form_widget = FakeDataForm(obj.config) + self.data_form_widget = FakeDataForm(obj.config, selectable=True) for field in obj.config: if field in ('key', 'instructions', 'x', 'registered'): continue

1 0

gajim: don't run several GPG threads when we receive a non-GPG m...
by Yann Leboulanger 25 May '13

25 May '13

changeset 97eea48bdf04 in /home/hg/repos/gajim branches: gajim_0.15 details:http://hg.gajim.org/gajim?cmd=changeset;node=97eea48bdf04 description: don't run several GPG threads when we receive a non-GPG message. Fixes #7311 diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 6ea7617701ab -r 97eea48bdf04 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Mar 19 13:32:03 2013 +0100 +++ b/src/common/connection_handlers.py Fri Apr 05 20:59:17 2013 +0200 @@ -995,7 +995,8 @@ gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], self._on_message_decrypted, [obj]) return - self._on_message_decrypted(None, obj) + gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt):

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2013