Commits February 2015

commits@gajim.org

1 participants
20 discussions

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

python-nbxmpp: fix decoding traceback error
by Python-nbxmpp 28 Feb '15

28 Feb '15

changeset 7bd1e7d1b1a2 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=7bd1e7d1b1a2 description: fix decoding traceback error diffstat: nbxmpp/transports_nb.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (40 lines): diff -r cce4e2196327 -r 7bd1e7d1b1a2 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Jan 31 15:17:54 2015 +0100 +++ b/nbxmpp/transports_nb.py Sat Feb 28 21:49:49 2015 +0100 @@ -38,6 +38,7 @@ import traceback import base64 import sys +import locale try: from urllib.parse import urlparse @@ -370,7 +371,8 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno, exc.strerror + errnum, errstr = exc.errno,\ + exc.strerror.decode(locale.getpreferredencoding()) if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress @@ -473,7 +475,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - errstr = e.strerror + errstr = e.strerror.decode(locale.getpreferredencoding()) log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback) @@ -601,7 +603,8 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno, e.strerror + errnum, errstr = e.errno, + e.strerror.decode(locale.getpreferredencoding()) if received == '': errstr = 'zero bytes on recv'

1 0

gajim: prepare 0.16.1 release
by Gajim 28 Feb '15

28 Feb '15

changeset 2a13c86246f0 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=2a13c86246f0 description: prepare 0.16.1 release diffstat: ChangeLog | 3 ++- autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diffs (36 lines): diff -r a18b3e4ca46d -r 2a13c86246f0 ChangeLog --- a/ChangeLog Sat Feb 28 15:47:51 2015 +0100 +++ b/ChangeLog Sat Feb 28 18:06:36 2015 +0100 @@ -1,8 +1,9 @@ -Gajim 0.16.1 () +Gajim 0.16.1 (28 February 2015) * Fix sending Zeroconf messages * Make ipython compatible to version >= 1.0 * Support XEP-0313 MAM + * Minor fixes and improvements Gajim 0.16 (04 October 2014) diff -r a18b3e4ca46d -r 2a13c86246f0 autogen.sh --- a/autogen.sh Sat Feb 28 15:47:51 2015 +0100 +++ b/autogen.sh Sat Feb 28 18:06:36 2015 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16" + gajimversion="0.16.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r a18b3e4ca46d -r 2a13c86246f0 src/common/defs.py --- a/src/common/defs.py Sat Feb 28 15:47:51 2015 +0100 +++ b/src/common/defs.py Sat Feb 28 18:06:36 2015 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.0.1' +version = '0.16.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: punyencode only the host part of the URL. Fixes #7981
by Gajim 28 Feb '15

28 Feb '15

changeset a18b3e4ca46d 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=a18b3e4ca46d description: punyencode only the host part of the URL. Fixes #7981 diffstat: src/common/helpers.py | 9 +++++++++ src/conversation_textview.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diffs (40 lines): diff -r e65be8537323 -r a18b3e4ca46d src/common/helpers.py --- a/src/common/helpers.py Sat Feb 28 15:12:11 2015 +0100 +++ b/src/common/helpers.py Sat Feb 28 15:47:51 2015 +0100 @@ -36,6 +36,7 @@ import subprocess import urllib import urllib2 +from urlparse import urlparse import webbrowser import errno import select @@ -136,6 +137,14 @@ converted_labels.append(idna.ToUnicode(label)) return ".".join(converted_labels) +def puny_encode_url(url): + _url = url + if '//' not in _url: + _url = '//' + _url + o = urlparse(_url) + p_loc = idn_to_ascii(o.netloc) + return url.replace(o.netloc, p_loc) + def parse_resource(resource): """ Perform stringprep on resource and return it diff -r e65be8537323 -r a18b3e4ca46d src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 28 15:12:11 2015 +0100 +++ b/src/conversation_textview.py Sat Feb 28 15:47:51 2015 +0100 @@ -1203,8 +1203,8 @@ all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] buffer_.insert_with_tags(end_iter, special_text, *all_tags) if 'url' in tags: - puny_text = puny_encode(special_text) - if not puny_text.endswith('-'): + puny_text = helpers.puny_encode_url(special_text) + if puny_text != special_text: puny_tags = [] if use_other_tags: puny_tags += other_tags

1 0

gajim: fix missing import
by Gajim 28 Feb '15

28 Feb '15

changeset 552893d68798 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=552893d68798 description: fix missing import diffstat: src/htmltextview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r e4b211e92f94 -r 552893d68798 src/htmltextview.py --- a/src/htmltextview.py Tue Feb 10 12:57:49 2015 +0100 +++ b/src/htmltextview.py Sat Feb 28 15:11:09 2015 +0100 @@ -910,7 +910,7 @@ dialogs.AddNewContactWindow(self.account, jid) def make_link_menu(self, event, kind, text): - from gtkgui_helpers import get_gtk_builder + from gtkgui_helpers import get_gtk_builder, load_icon xml = get_gtk_builder('chat_context_menu.ui') menu = xml.get_object('chat_context_menu') childs = menu.get_children() @@ -927,7 +927,7 @@ else: # It's a mail or a JID # load muc icon join_group_chat_menuitem = xml.get_object('join_group_chat_menuitem') - muc_icon = gtkgui_helpers.load_icon('muc_active') + muc_icon = load_icon('muc_active') if muc_icon: join_group_chat_menuitem.set_image(muc_icon)

1 0

gajim: clean corretly opened window dict. Fixes #7983
by Gajim 28 Feb '15

28 Feb '15

changeset e65be8537323 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=e65be8537323 description: clean corretly opened window dict. Fixes #7983 diffstat: src/dialogs.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (32 lines): diff -r 552893d68798 -r e65be8537323 src/dialogs.py --- a/src/dialogs.py Sat Feb 28 15:11:09 2015 +0100 +++ b/src/dialogs.py Sat Feb 28 15:12:11 2015 +0100 @@ -2362,6 +2362,7 @@ this means room must be automaticaly configured and when done, invities must be automatically invited """ + self.window_account = None if account: if room_jid != '' and room_jid in gajim.gc_connected[account] and \ gajim.gc_connected[account][room_jid]: @@ -2373,6 +2374,7 @@ ErrorDialog(_('You are not connected to the server'), _('You can not join a group chat unless you are connected.')) raise GajimGeneralException, 'You must be connected to join a groupchat' + self.window_account = account self.xml = gtkgui_helpers.get_gtk_builder('join_groupchat_window.ui') @@ -2492,9 +2494,10 @@ self._nec_agent_info_received) gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, self._nec_agent_info_error_received) - if self.account and 'join_gc' in gajim.interface.instances[self.account]: + if self.window_account and 'join_gc' in gajim.interface.instances[ + self.window_account]: # remove us from open windows - del gajim.interface.instances[self.account]['join_gc'] + del gajim.interface.instances[self.window_account]['join_gc'] def on_join_groupchat_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: # ESCAPE

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2015