Commits

commits@gajim.org

17632 discussions

python-nbxmpp: Fix for missing entry in default secure_tuple. Fi...
by Python-nbxmpp 17 Mar '15

17 Mar '15

changeset 25f8a6d152cc in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=25f8a6d152cc description: Fix for missing entry in default secure_tuple. Fixes #32 diffstat: nbxmpp/client_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bf4ecad8b061 -r 25f8a6d152cc nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Sat Feb 28 21:51:56 2015 +0100 +++ b/nbxmpp/client_nb.py Tue Mar 10 18:12:16 2015 +0100 @@ -150,7 +150,7 @@ def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, on_proxy_failure=None, on_stream_error_cb=None, proxy=None, - secure_tuple=('tls', None, None, None)): + secure_tuple=('tls', None, None, None, None)): """ Open XMPP connection (open XML streams in both directions)

1 0

gajim: fix translation typo
by Gajim 10 Mar '15

10 Mar '15

changeset dcad0e19d3b8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dcad0e19d3b8 description: fix translation typo diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4b6ab138eb75 -r dcad0e19d3b8 po/fr.po --- a/po/fr.po Sat Mar 07 21:03:25 2015 +0100 +++ b/po/fr.po Tue Mar 10 20:45:05 2015 +0100 @@ -9587,7 +9587,7 @@ #: ../src/groupchat_control.py:1636 msgid "The server has assigned or modified your roomnick" -msgstr "Le serveur à défini ou midifié votre Surnom de salon" +msgstr "Le serveur à défini ou modifié votre Surnom de salon" #. do not print 'kicked by None' #: ../src/groupchat_control.py:1642

1 0

gajim: prevent traceback. Fixes #7960
by Gajim 07 Mar '15

07 Mar '15

changeset 4b6ab138eb75 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4b6ab138eb75 description: prevent traceback. Fixes #7960 diffstat: src/roster_window.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 06f40d177c27 -r 4b6ab138eb75 src/roster_window.py --- a/src/roster_window.py Sat Mar 07 15:04:41 2015 +0100 +++ b/src/roster_window.py Sat Mar 07 21:03:25 2015 +0100 @@ -976,6 +976,9 @@ # FIXME: maybe move to gajim.py def remove_newly_added(self, jid, account): + if account not in gajim.newly_added: + # Account has been deleted during the timeout that called us + return if jid in gajim.newly_added[account]: gajim.newly_added[account].remove(jid) self.draw_contact(jid, account)

1 0

gajim: don't request privacy lists when connecting if server doe...
by Gajim 07 Mar '15

07 Mar '15

changeset 06f40d177c27 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=06f40d177c27 description: don't request privacy lists when connecting if server doesn't support that. Fixes #7990 diffstat: src/common/connection.py | 41 ++++++++++++++++++++++++++++++++------ src/common/connection_handlers.py | 30 +++++---------------------- 2 files changed, 40 insertions(+), 31 deletions(-) diffs (118 lines): diff -r 0b4f8f6bfcdc -r 06f40d177c27 src/common/connection.py --- a/src/common/connection.py Sun Mar 01 15:07:14 2015 +0100 +++ b/src/common/connection.py Sat Mar 07 15:04:41 2015 +0100 @@ -1837,7 +1837,6 @@ if iq_obj.getType() == 'error': # server doesn't support privacy lists return # active the privacy rule - self.privacy_rules_supported = True self.activate_privacy_rule('invisible') self.connected = gajim.SHOW_LIST.index('invisible') self.status = msg @@ -1915,13 +1914,40 @@ self.awaiting_answers[id_] = (PRIVACY_ARRIVED, ) self.connection.send(iq) + def _continue_connection_request_privacy(self): + if self.privacy_rules_supported: + if not self.privacy_rules_requested: + self.privacy_rules_requested = True + self._request_privacy() + else: + if self.continue_connect_info and self.continue_connect_info[0]\ + == 'invisible': + # Trying to login as invisible but privacy list not + # supported + self.disconnect(on_purpose=True) + gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, + show='offline')) + gajim.nec.push_incoming_event(InformationEvent(None, + conn=self, level='error', pri_txt=_('Invisibility not ' + 'supported'), sec_txt=_('Account %s doesn\'t support ' + 'invisibility.') % self.name)) + return + if self.blocking_supported: + iq = nbxmpp.Iq('get', xmlns='') + query = iq.setQuery(name='blocklist') + query.setNamespace(nbxmpp.NS_BLOCKING) + id2_ = self.connection.getAnID() + iq.setID(id2_) + self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) + self.connection.send(iq) + # Ask metacontacts before roster + self.get_metacontacts() + def _nec_agent_info_error_received(self, obj): if obj.conn.name != self.name: return if obj.id_[:6] == 'Gajim_': - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() + self._continue_connection_request_privacy() def _nec_agent_info_received(self, obj): if obj.conn.name != self.name: @@ -1992,6 +2018,9 @@ iq = nbxmpp.Iq('set') iq.setTag('enable', namespace=nbxmpp.NS_CARBONS) self.connection.send(iq) + if nbxmpp.NS_PRIVACY in obj.features: + self.privacy_rules_supported = True + if nbxmpp.NS_BYTESTREAM in obj.features and \ gajim.config.get_per('accounts', self.name, 'use_ft_proxies'): our_fjid = helpers.parse_jid(our_jid + '/' + \ @@ -2008,9 +2037,7 @@ self.available_transports[transport_type].append(obj.fjid) else: self.available_transports[transport_type] = [obj.fjid] - if not self.privacy_rules_requested: - self.privacy_rules_requested = True - self._request_privacy() + self._continue_connection_request_privacy() def send_custom_status(self, show, msg, jid): if not show in gajim.SHOW_LIST: diff -r 0b4f8f6bfcdc -r 06f40d177c27 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Mar 01 15:07:14 2015 +0100 +++ b/src/common/connection_handlers.py Sat Mar 07 15:04:41 2015 +0100 @@ -575,32 +575,14 @@ elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() != 'error': - self.privacy_rules_supported = True self.get_privacy_list('block') + # Ask metacontacts before roster + self.get_metacontacts() else: - if self.blocking_supported: - iq = nbxmpp.Iq('get', xmlns='') - query = iq.setQuery(name='blocklist') - query.setNamespace(nbxmpp.NS_BLOCKING) - id2_ = self.connection.getAnID() - iq.setID(id2_) - self.awaiting_answers[id2_] = (BLOCKING_ARRIVED, ) - self.connection.send(iq) - - if self.continue_connect_info and self.continue_connect_info[0]\ - == 'invisible': - # Trying to login as invisible but privacy list not - # supported - self.disconnect(on_purpose=True) - gajim.nec.push_incoming_event(OurShowEvent(None, conn=self, - show='offline')) - gajim.nec.push_incoming_event(InformationEvent(None, - conn=self, level='error', pri_txt=_('Invisibility not ' - 'supported'), sec_txt=_('Account %s doesn\'t support ' - 'invisibility.') % self.name)) - return - # Ask metacontacts before roster - self.get_metacontacts() + # That should never happen, but as it's blocking in the + # connection process, we don't take the risk + self.privacy_rules_supported = False + self._continue_connection_request_privacy() elif self.awaiting_answers[id_][0] == BLOCKING_ARRIVED: del self.awaiting_answers[id_] if iq_obj.getType() == 'result':

1 0

gajim: fix seclabel. see #7010
by Gajim 01 Mar '15

01 Mar '15

changeset 0b4f8f6bfcdc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0b4f8f6bfcdc description: fix seclabel. see #7010 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3ea8b4238200 -r 0b4f8f6bfcdc src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Feb 28 22:43:01 2015 +0100 +++ b/src/common/connection_handlers.py Sun Mar 01 15:07:14 2015 +0100 @@ -1623,7 +1623,7 @@ def seclabel_catalogue_request(self, to, callback): if to not in self.seclabel_catalogues: - self.seclabel_catalogues[to] = [[], None, None] + self.seclabel_catalogues[to] = [[], None, None, None] self.seclabel_catalogues[to][0].append(callback) def _rosterSetCB(self, con, iq_obj):

1 0

gajim-website: update website for 0.16.1 release
by Gajim Website 28 Feb '15

28 Feb '15

changeset 387c4d4e41fd in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=387c4d4e41fd description: update website for 0.16.1 release diffstat: downloads.php | 2 +- index.php | 18 +++++++-- locale/ar_AE/LC_MESSAGES/msg.po | 56 +++++++++++++++------------ locale/bg_BG/LC_MESSAGES/msg.po | 59 ++++++++++++++++------------- locale/de_DE/LC_MESSAGES/msg.po | 59 ++++++++++++++++------------- locale/eo/LC_MESSAGES/msg.po | 61 ++++++++++++++++-------------- locale/es_ES/LC_MESSAGES/msg.po | 57 +++++++++++++++------------- locale/fr_FR/LC_MESSAGES/msg.po | 58 +++++++++++++++-------------- locale/he_IL/LC_MESSAGES/msg.po | 82 ++++++++++++++++++++++------------------- locale/hu_HU/LC_MESSAGES/msg.po | 54 +++++++++++++++----------- locale/it_IT/LC_MESSAGES/msg.po | 60 ++++++++++++++++-------------- locale/pl_PL/LC_MESSAGES/msg.po | 59 ++++++++++++++++------------- locale/pt_BR/LC_MESSAGES/msg.po | 59 ++++++++++++++++------------- locale/ru_RU/LC_MESSAGES/msg.po | 58 ++++++++++++++++------------- msg.pot | 52 +++++++++++++++----------- 15 files changed, 437 insertions(+), 357 deletions(-) diffs (truncated from 1577 to 300 lines): diff -r f26d90ae388f -r 387c4d4e41fd downloads.php --- a/downloads.php Fri Oct 10 22:10:46 2014 +0200 +++ b/downloads.php Sat Feb 28 22:58:13 2015 +0100 @@ -5,7 +5,7 @@ Entete (_("Gajim, a Jabber client"), "GAJIM"); $download_folder = "0.16"; -$last_version = "0.16"; +$last_version = "0.16.1"; print (" \n"); print _(" Latest version of Gajim is")." ".$last_version." \n"; #printf(_(" A %s version is in test"), "0.16-rc2"); diff -r f26d90ae388f -r 387c4d4e41fd index.php --- a/index.php Fri Oct 10 22:10:46 2014 +0200 +++ b/index.php Sat Feb 28 22:58:13 2015 +0100 @@ -50,27 +50,37 @@ $tpl->set_var("NEWS_MAIN", _("NEWS")); $array_news_title = array( - 0 => sprintf(_("Gajim %s is here!"), "0.16"), + 0 => sprintf(_("Gajim %s is here!"), "0.16.1"), + 1 => sprintf(_("Gajim %s is here!"), "0.16"), ); // 5 => sprintf(_("Release candidate 5 of Gajim %s"), "0.13"), // 7 => sprintf(_("Alpha-release of Gajim %s"), "0.12")); // 3 => sprintf(_("New windows installer")), $array_news_date = array( - 0 => _("04 October 2014"), + 0 => _("28 February 2015"), + 1 => _("04 October 2014"), ); $array_news_desc = array( - 0 => sprintf(_("Version %s of Gajim has been released."), "0.16"), + 0 => sprintf(_("Version %s of Gajim has been released."), "0.16.1"), + 1 => sprintf(_("Version %s of Gajim has been released."), "0.16"), ); // 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.4"), + 0 => sprintf(_("What's new since %s:"), "0.16"), + 1 => sprintf(_("What's new since %s:"), "0.15.4"), ); $array_news_items[0] = array( + 0 => _("Message Archive Management") . " (<a href=\"http://xmpp.org/extensions/xep-0313.html\">XEP-0313</a>)", + 1 => _("Full changelog, see") . " <a href = \"http://hg.gajim.org/gajim/file/gajim-0.16.1/ChangeLog\">"._("Full ChangeLog")."</a> ", + 2 => "<a href = \"http://trac.gajim.org/query?status=closed&milestone=0.16.1\">"._("List of fixed bugs")."</a>", + ); + +$array_news_items[1] = array( 0 => _("Improve File transfer"), 1 => _("Improve security"), 2 => _("Improve audio / video calls"), diff -r f26d90ae388f -r 387c4d4e41fd locale/ar_AE/LC_MESSAGES/msg.po --- a/locale/ar_AE/LC_MESSAGES/msg.po Fri Oct 10 22:10:46 2014 +0200 +++ b/locale/ar_AE/LC_MESSAGES/msg.po Sat Feb 28 22:58:13 2015 +0100 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: mag\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-04 23:18+0200\n" +"POT-Creation-Date: 2015-02-28 22:57+0100\n" "PO-Revision-Date: 2014-06-02 01:08+0300\n" "Last-Translator: Yann <asterix(a)asterix.lagaule.org>\n" "Language-Team: Arabic <karrar.kazuya(a)gmail.com>\n" @@ -626,58 +626,67 @@ msgid "NEWS" msgstr "الاخبار" -#: index.php:53 +#: index.php:53 index.php:54 #, c-format msgid "Gajim %s is here!" msgstr "كاجيم %s هنا!" -#: index.php:59 +#: index.php:60 +msgid "28 February 2015" +msgstr "" + +#: index.php:61 #, fuzzy msgid "04 October 2014" msgstr "30 اوكتوبر 2012" -#: index.php:63 +#: index.php:65 index.php:66 #, c-format msgid "Version %s of Gajim has been released." msgstr "النسخة %s من كاجيم تم اصدارها." -#: index.php:70 +#: index.php:73 index.php:74 #, c-format msgid "What's new since %s:" msgstr "الجديد منذ %s:" -#: index.php:74 +#: index.php:78 +#, fuzzy +msgid "Message Archive Management" +msgstr "ارشفة الرسالة" + +#: index.php:79 index.php:89 +msgid "Full ChangeLog" +msgstr "سجل التغيير الكامل" + +#: index.php:79 index.php:89 +msgid "Full changelog, see" +msgstr "سجل التغيير الكامل, شاهد " + +#: index.php:80 index.php:90 +msgid "List of fixed bugs" +msgstr "قائمة المشاكل التي تم اصلاحها" + +#: index.php:84 msgid "Improve File transfer" msgstr "تطوير ارسال ملفات" -#: index.php:75 +#: index.php:85 msgid "Improve security" msgstr "تطوير الامن" -#: index.php:76 +#: index.php:86 msgid "Improve audio / video calls" msgstr "تطوير الاتصال الصوتي و المرئي" -#: index.php:77 +#: index.php:87 msgid "Last message correction" msgstr "تصحيح اخر رسالة" -#: index.php:78 +#: index.php:88 msgid "Jingle Audio under windows" msgstr " دعم صوت Jingle للوندوز" -#: index.php:79 -msgid "Full ChangeLog" -msgstr "سجل التغيير الكامل" - -#: index.php:79 -msgid "Full changelog, see" -msgstr "سجل التغيير الكامل, شاهد " - -#: index.php:80 -msgid "List of fixed bugs" -msgstr "قائمة المشاكل التي تم اصلاحها" - #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" msgstr "بعض الصور لبرنامج الكاجيم:" @@ -766,9 +775,6 @@ #~ msgid "Whiteboard (via a plugin)" #~ msgstr "السبورة (عن طريق بلوجن)" -#~ msgid "Message archiving" -#~ msgstr "ارشفة الرسالة" - #~ msgid "Stream managment" #~ msgstr "ادارة الستريم" diff -r f26d90ae388f -r 387c4d4e41fd locale/bg_BG/LC_MESSAGES/msg.po --- a/locale/bg_BG/LC_MESSAGES/msg.po Fri Oct 10 22:10:46 2014 +0200 +++ b/locale/bg_BG/LC_MESSAGES/msg.po Sat Feb 28 22:58:13 2015 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-04 23:18+0200\n" +"POT-Creation-Date: 2015-02-28 22:57+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" @@ -652,61 +652,70 @@ msgid "NEWS" msgstr "НОВИНИ" -#: index.php:53 +#: index.php:53 index.php:54 #, fuzzy, c-format msgid "Gajim %s is here!" msgstr "Излезе Gajim 0.11!" -#: index.php:59 +#: index.php:60 +#, fuzzy +msgid "28 February 2015" +msgstr "7 февруари 2007 г." + +#: index.php:61 #, fuzzy msgid "04 October 2014" msgstr "19 декември 2006 г." -#: index.php:63 +#: index.php:65 index.php:66 #, fuzzy, c-format msgid "Version %s of Gajim has been released." msgstr "Издадена е версия 0.11 на Gajim." -#: index.php:70 +#: index.php:73 index.php:74 #, fuzzy, c-format msgid "What's new since %s:" msgstr "Какво е новото спрямо " -#: index.php:74 +#: index.php:78 +msgid "Message Archive Management" +msgstr "" + +#: index.php:79 index.php:89 +msgid "Full ChangeLog" +msgstr "Пълен дневник на промените" + +#: index.php:79 index.php:89 +#, fuzzy +msgid "Full changelog, see" +msgstr "Пълен дневник на промените" + +#: index.php:80 index.php:90 +msgid "List of fixed bugs" +msgstr "" + +#: index.php:84 #, fuzzy msgid "Improve File transfer" msgstr "Инсталатор за „Уиндоус“" -#: index.php:75 +#: index.php:85 #, fuzzy msgid "Improve security" msgstr "Инсталатор за „Уиндоус“" -#: index.php:76 +#: index.php:86 msgid "Improve audio / video calls" msgstr "" -#: index.php:77 +#: index.php:87 msgid "Last message correction" msgstr "" -#: index.php:78 +#: index.php:88 msgid "Jingle Audio under windows" msgstr "" -#: index.php:79 -msgid "Full ChangeLog" -msgstr "Пълен дневник на промените" - -#: index.php:79 -#, fuzzy -msgid "Full changelog, see" -msgstr "Пълен дневник на промените" - -#: index.php:80 -msgid "List of fixed bugs" -msgstr "" - #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" msgstr "Ето и някои снимки на Gajim:" @@ -901,10 +910,6 @@ #~ msgstr "Предварително издание на Gajim 0.11.1" #, fuzzy -#~ msgid "23 February 2010" -#~ msgstr "7 февруари 2007 г." - -#, fuzzy #~ msgid "28 November 2009" #~ msgstr "19 декември 2006 г." diff -r f26d90ae388f -r 387c4d4e41fd locale/de_DE/LC_MESSAGES/msg.po --- a/locale/de_DE/LC_MESSAGES/msg.po Fri Oct 10 22:10:46 2014 +0200 +++ b/locale/de_DE/LC_MESSAGES/msg.po Sat Feb 28 22:58:13 2015 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-04 23:18+0200\n" +"POT-Creation-Date: 2015-02-28 22:57+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" @@ -666,62 +666,71 @@ msgid "NEWS" msgstr "NEUIGKEITEN"

1 0

gajim: Added tag gajim-0.16.1 for changeset 33a5521fed87
by Gajim 28 Feb '15

28 Feb '15

changeset 3ea8b4238200 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=3ea8b4238200 description: Added tag gajim-0.16.1 for changeset 33a5521fed87 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 33a5521fed87 -r 3ea8b4238200 .hgtags --- a/.hgtags Sat Feb 28 22:30:39 2015 +0100 +++ b/.hgtags Sat Feb 28 22:43:01 2015 +0100 @@ -13,3 +13,4 @@ f4acdfbbe30bd29b832a34c14bd18ade9be9845d gajim-0.16-rc1 129d3cce62cb497e490fef80e56bf97f57dc098b gajim-0.16-rc2 f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 +33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1

1 0

gajim: update debian folder
by Gajim 28 Feb '15

28 Feb '15

changeset 33a5521fed87 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=33a5521fed87 description: update debian folder diffstat: debian/changelog | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 65ca00adf9d3 -r 33a5521fed87 debian/changelog --- a/debian/changelog Sat Feb 28 22:22:14 2015 +0100 +++ b/debian/changelog Sat Feb 28 22:30:39 2015 +0100 @@ -1,3 +1,9 @@ +gajim (0.16.1-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 28 Feb 2014 22:30:10 +0200 + gajim (0.16-1) unstable; urgency=low * New upstream release

1 0

gajim: gtk-spell-check icon is not available under windows
by Gajim 28 Feb '15

28 Feb '15

changeset 65ca00adf9d3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=65ca00adf9d3 description: gtk-spell-check icon is not available under windows diffstat: icons/hicolor/16x16/actions/gajim-message_corrected.png | Bin src/conversation_textview.py | 7 ++++++- 2 files changed, 6 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 2a13c86246f0 -r 65ca00adf9d3 icons/hicolor/16x16/actions/gajim-message_corrected.png Binary file icons/hicolor/16x16/actions/gajim-message_corrected.png has changed diff -r 2a13c86246f0 -r 65ca00adf9d3 src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 28 18:06:36 2015 +0100 +++ b/src/conversation_textview.py Sat Feb 28 22:22:14 2015 +0100 @@ -169,7 +169,12 @@ ) ) - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check', + quiet=True) + if not MESSAGE_CORRECTED_PIXBUF: + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( + 'gajim-message_corrected') + # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds

1 0

python-nbxmpp: fix typo
by Python-nbxmpp 28 Feb '15

28 Feb '15

changeset bf4ecad8b061 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=bf4ecad8b061 description: fix typo diffstat: nbxmpp/transports_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7bd1e7d1b1a2 -r bf4ecad8b061 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Feb 28 21:49:49 2015 +0100 +++ b/nbxmpp/transports_nb.py Sat Feb 28 21:51:56 2015 +0100 @@ -603,7 +603,7 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno, + errnum, errstr = e.errno,\ e.strerror.decode(locale.getpreferredencoding()) if received == '':

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