Commits July 2011

commits@gajim.org

3 participants
40 discussions

gajim: update po files
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset 90d08c78b0a2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=90d08c78b0a2 description: update po files diffstat: po/be.po | 234 ++++++++++++++++++++++++++++---------------------------- po/be(a)latin.po | 234 ++++++++++++++++++++++++++++---------------------------- po/bg.po | 234 ++++++++++++++++++++++++++++---------------------------- po/br.po | 234 ++++++++++++++++++++++++++++---------------------------- po/cs.po | 234 ++++++++++++++++++++++++++++---------------------------- po/da.po | 234 ++++++++++++++++++++++++++++---------------------------- po/de.po | 234 ++++++++++++++++++++++++++++---------------------------- po/el.po | 234 ++++++++++++++++++++++++++++---------------------------- po/en_GB.po | 234 ++++++++++++++++++++++++++++---------------------------- po/eo.po | 234 ++++++++++++++++++++++++++++---------------------------- po/es.po | 234 ++++++++++++++++++++++++++++---------------------------- po/eu.po | 234 ++++++++++++++++++++++++++++---------------------------- po/fr.po | 234 ++++++++++++++++++++++++++++---------------------------- po/gl.po | 234 ++++++++++++++++++++++++++++---------------------------- po/hr.po | 234 ++++++++++++++++++++++++++++---------------------------- po/it.po | 234 ++++++++++++++++++++++++++++---------------------------- po/ja.po | 234 ++++++++++++++++++++++++++++---------------------------- po/kk.po | 234 ++++++++++++++++++++++++++++---------------------------- po/lt.po | 234 ++++++++++++++++++++++++++++---------------------------- po/nb.po | 234 ++++++++++++++++++++++++++++---------------------------- po/nl.po | 234 ++++++++++++++++++++++++++++---------------------------- po/no.po | 234 ++++++++++++++++++++++++++++---------------------------- po/pl.po | 234 ++++++++++++++++++++++++++++---------------------------- po/pt.po | 234 ++++++++++++++++++++++++++++---------------------------- po/pt_BR.po | 234 ++++++++++++++++++++++++++++---------------------------- po/ru.po | 234 ++++++++++++++++++++++++++++---------------------------- po/sk.po | 234 ++++++++++++++++++++++++++++---------------------------- po/sr.po | 234 ++++++++++++++++++++++++++++---------------------------- po/sr(a)Latn.po | 234 ++++++++++++++++++++++++++++---------------------------- po/sv.po | 234 ++++++++++++++++++++++++++++---------------------------- po/uk.po | 234 ++++++++++++++++++++++++++++---------------------------- po/zh_CN.po | 234 ++++++++++++++++++++++++++++---------------------------- 32 files changed, 3744 insertions(+), 3744 deletions(-) diffs (truncated from 23235 to 300 lines): diff -r 8ea4f6a49c13 -r 90d08c78b0a2 po/be.po --- a/po/be.po Fri Jul 22 12:14:55 2011 +0200 +++ b/po/be.po Fri Jul 22 12:17:46 2011 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.10.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-22 13:32+0200\n" +"POT-Creation-Date: 2011-07-22 12:15+0200\n" "PO-Revision-Date: 2009-08-19 23:42+0200\n" "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka(a)gmail.com>\n" "Language-Team: Belarusian <i18n(a)mova.org>\n" @@ -3674,7 +3674,7 @@ #. sorted alphanum #: ../src/common/config.py:106 ../src/common/config.py:501 #: ../src/common/optparser.py:292 ../src/common/optparser.py:488 -#: ../src/common/optparser.py:522 ../src/gui_interface.py:3405 +#: ../src/common/optparser.py:522 ../src/gui_interface.py:3407 #, fuzzy msgid "default" msgstr "Прадвызначана" @@ -6678,17 +6678,17 @@ msgid "To unregister from a server, account must be enabled." msgstr "" -#: ../src/config.py:2983 ../src/gui_interface.py:1140 -#: ../src/gui_interface.py:1251 +#: ../src/config.py:2983 ../src/gui_interface.py:1142 +#: ../src/gui_interface.py:1253 msgid "Password Required" msgstr "Патрабуецца пароль" -#: ../src/config.py:2984 ../src/gui_interface.py:1231 +#: ../src/config.py:2984 ../src/gui_interface.py:1233 #, python-format msgid "Enter your password for account %s" msgstr "Увядзіце пароль для рахунка %s" -#: ../src/config.py:2985 ../src/gui_interface.py:1251 +#: ../src/config.py:2985 ../src/gui_interface.py:1253 msgid "Save password" msgstr "Захаваць пароль" @@ -6800,12 +6800,12 @@ msgid "Please provide a server on which you want to register." msgstr "Вызначце сваю новую мянушку:" -#: ../src/config.py:3678 ../src/gui_interface.py:1931 +#: ../src/config.py:3678 ../src/gui_interface.py:1933 #, fuzzy msgid "Certificate Already in File" msgstr "Чалавек ужо ёсць у кантактным лісце" -#: ../src/config.py:3679 ../src/gui_interface.py:1932 +#: ../src/config.py:3679 ../src/gui_interface.py:1934 #, python-format msgid "This certificate is already in file %s, so it's not added again." msgstr "" @@ -6820,7 +6820,7 @@ "Do you still want to connect to this server?" msgstr "" -#: ../src/config.py:3762 ../src/gui_interface.py:1959 +#: ../src/config.py:3762 ../src/gui_interface.py:1961 #, python-format msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -7159,7 +7159,7 @@ msgid "Subscription request from %s" msgstr "Запыт увагі ад %s" -#: ../src/dialogs.py:2141 ../src/gui_interface.py:2705 +#: ../src/dialogs.py:2141 ../src/gui_interface.py:2714 #, python-format msgid "You are already in group chat %s" msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s" @@ -7191,7 +7191,7 @@ msgstr "Няправільнае імя карыстальніка" #: ../src/dialogs.py:2335 ../src/dialogs.py:2341 -#: ../src/groupchat_control.py:1853 +#: ../src/groupchat_control.py:1854 msgid "Invalid group chat Jabber ID" msgstr "Няправільны Jabber ID групавой размовы" @@ -7200,15 +7200,15 @@ msgid "Please enter the group chat Jabber ID as room@server." msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі." -#: ../src/dialogs.py:2342 ../src/groupchat_control.py:1854 +#: ../src/dialogs.py:2342 ../src/groupchat_control.py:1855 msgid "The group chat Jabber ID has not allowed characters." msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі." -#: ../src/dialogs.py:2346 ../src/gui_interface.py:2693 +#: ../src/dialogs.py:2346 ../src/gui_interface.py:2696 msgid "This is not a group chat" msgstr "Гэта не групавая размова" -#: ../src/dialogs.py:2347 ../src/gui_interface.py:2694 +#: ../src/dialogs.py:2347 ../src/gui_interface.py:2697 #, python-format msgid "%s is not the name of a group chat." msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы." @@ -7327,30 +7327,30 @@ msgid "New Private Message" msgstr "Новае прыватнае паведамленне" -#: ../src/dialogs.py:2634 ../src/gui_interface.py:1374 ../src/notify.py:489 +#: ../src/dialogs.py:2634 ../src/gui_interface.py:1376 ../src/notify.py:489 msgid "New E-mail" msgstr "Новы ліст" -#: ../src/dialogs.py:2636 ../src/gui_interface.py:1436 ../src/notify.py:482 +#: ../src/dialogs.py:2636 ../src/gui_interface.py:1438 ../src/notify.py:482 msgid "File Transfer Request" msgstr "Запыт на перадачу файла" -#: ../src/dialogs.py:2638 ../src/gui_interface.py:1336 -#: ../src/gui_interface.py:1405 ../src/notify.py:484 +#: ../src/dialogs.py:2638 ../src/gui_interface.py:1338 +#: ../src/gui_interface.py:1407 ../src/notify.py:484 msgid "File Transfer Error" msgstr "Памылка перадачы файла" -#: ../src/dialogs.py:2640 ../src/gui_interface.py:1482 -#: ../src/gui_interface.py:1505 ../src/gui_interface.py:1522 +#: ../src/dialogs.py:2640 ../src/gui_interface.py:1484 +#: ../src/gui_interface.py:1507 ../src/gui_interface.py:1524 #: ../src/notify.py:486 msgid "File Transfer Completed" msgstr "Перадача файла скончаная" -#: ../src/dialogs.py:2641 ../src/gui_interface.py:1485 ../src/notify.py:487 +#: ../src/dialogs.py:2641 ../src/gui_interface.py:1487 ../src/notify.py:487 msgid "File Transfer Stopped" msgstr "Перадача файла спыненая" -#: ../src/dialogs.py:2643 ../src/gui_interface.py:1160 ../src/notify.py:491 +#: ../src/dialogs.py:2643 ../src/gui_interface.py:1162 ../src/notify.py:491 msgid "Groupchat Invitation" msgstr "Запрашэнне ў групавую размову" @@ -7770,20 +7770,20 @@ msgid "Id" msgstr "Id" -#: ../src/disco.py:1816 ../src/gui_interface.py:3217 +#: ../src/disco.py:1816 ../src/gui_interface.py:3219 msgid "Bookmark already set" msgstr "Закладка ўжо ўсталяваная" -#: ../src/disco.py:1817 ../src/gui_interface.py:3218 +#: ../src/disco.py:1817 ../src/gui_interface.py:3220 #, python-format msgid "Group Chat \"%s\" is already in your bookmarks." msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках." -#: ../src/disco.py:1826 ../src/gui_interface.py:3232 +#: ../src/disco.py:1826 ../src/gui_interface.py:3234 msgid "Bookmark has been added successfully" msgstr "Закладка паспяхова дададзеная" -#: ../src/disco.py:1827 ../src/gui_interface.py:3233 +#: ../src/disco.py:1827 ../src/gui_interface.py:3235 msgid "You can manage your bookmarks via Actions menu in your roster." msgstr "" "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага " @@ -8791,169 +8791,169 @@ #. Can be a message (see handle_event_gc_config_change in #. gajim.py) -#: ../src/groupchat_control.py:1300 +#: ../src/groupchat_control.py:1301 msgid "Room logging is enabled" msgstr "" -#: ../src/groupchat_control.py:1302 +#: ../src/groupchat_control.py:1303 #, fuzzy msgid "A new room has been created" msgstr "Новы рахунак паспяхова створаны" -#: ../src/groupchat_control.py:1305 +#: ../src/groupchat_control.py:1306 msgid "The server has assigned or modified your roomnick" msgstr "" #. do not print 'kicked by None' -#: ../src/groupchat_control.py:1311 +#: ../src/groupchat_control.py:1312 #, python-format msgid "%(nick)s has been kicked: %(reason)s" msgstr "%(nick)s пакараны: %(reason)s" -#: ../src/groupchat_control.py:1315 +#: ../src/groupchat_control.py:1316 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" msgstr "%(who)s пакараў %(nick)s: %(reason)s" #. do not print 'banned by None' -#: ../src/groupchat_control.py:1324 +#: ../src/groupchat_control.py:1325 #, python-format msgid "%(nick)s has been banned: %(reason)s" msgstr "Для %(nick)s забаронена казанне: %(reason)s" -#: ../src/groupchat_control.py:1327 +#: ../src/groupchat_control.py:1328 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s" -#: ../src/groupchat_control.py:1338 ../src/groupchat_control.py:1442 +#: ../src/groupchat_control.py:1339 ../src/groupchat_control.py:1443 #, python-format msgid "You are now known as %s" msgstr "Вашая мянушка змененая на %s" -#: ../src/groupchat_control.py:1354 ../src/gui_interface.py:922 +#: ../src/groupchat_control.py:1355 ../src/gui_interface.py:922 #, fuzzy, python-format msgid "%(nick)s is now known as %(new_nick)s" msgstr "%s змяніў мянушку на %s" -#: ../src/groupchat_control.py:1396 ../src/groupchat_control.py:1401 -#: ../src/groupchat_control.py:1407 +#: ../src/groupchat_control.py:1397 ../src/groupchat_control.py:1402 +#: ../src/groupchat_control.py:1408 #, fuzzy, python-format msgid "%(nick)s has been removed from the room (%(reason)s)" msgstr "%(who)s пакараў %(nick)s: %(reason)s" -#: ../src/groupchat_control.py:1398 +#: ../src/groupchat_control.py:1399 #, fuzzy msgid "affiliation changed" msgstr "Адносіны: " -#: ../src/groupchat_control.py:1403 +#: ../src/groupchat_control.py:1404 msgid "room configuration changed to members-only" msgstr "" -#: ../src/groupchat_control.py:1409 +#: ../src/groupchat_control.py:1410 msgid "system shutdown" msgstr "" -#: ../src/groupchat_control.py:1492 +#: ../src/groupchat_control.py:1493 #, python-format msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s" msgstr "" -#: ../src/groupchat_control.py:1496 +#: ../src/groupchat_control.py:1497 #, python-format msgid "** Affiliation of %(nick)s has been set to %(affiliation)s" msgstr "" -#: ../src/groupchat_control.py:1511 +#: ../src/groupchat_control.py:1512 #, fuzzy, python-format msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s" msgstr "%(who)s пакараў %(nick)s: %(reason)s" -#: ../src/groupchat_control.py:1515 +#: ../src/groupchat_control.py:1516 #, fuzzy, python-format msgid "** Role of %(nick)s has been set to %(role)s" msgstr "%(nick)s пакараны: %(reason)s" -#: ../src/groupchat_control.py:1544 +#: ../src/groupchat_control.py:1545 #, python-format msgid "%s has left" msgstr "%s сышоў" -#: ../src/groupchat_control.py:1549 +#: ../src/groupchat_control.py:1550 #, python-format msgid "%s has joined the group chat" msgstr "%s далучыўся да групавой размовы" -#: ../src/groupchat_control.py:1551 ../src/gui_interface.py:949 +#: ../src/groupchat_control.py:1552 ../src/gui_interface.py:949 #: ../src/history_window.py:447 ../src/notify.py:236 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s цяпер %(status)s" -#: ../src/groupchat_control.py:1780 +#: ../src/groupchat_control.py:1781 #, python-format msgid "Are you sure you want to leave group chat \"%s\"?" msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?" -#: ../src/groupchat_control.py:1782

1 0

gajim: prepare 0.14.4 release
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset 8ea4f6a49c13 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8ea4f6a49c13 description: prepare 0.14.4 release diffstat: ChangeLog | 5 +++++ configure.ac | 2 +- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diffs (58 lines): diff -r 1b3016540402 -r 8ea4f6a49c13 ChangeLog --- a/ChangeLog Fri Jul 22 12:05:38 2011 +0200 +++ b/ChangeLog Fri Jul 22 12:14:55 2011 +0200 @@ -1,3 +1,8 @@ +Gajim 0.14.4 (22 July 2011) + + * Fix translation issue + * other minor fixes + Gajim 0.14.3 (19 June 2011) * Fix history viewer diff -r 1b3016540402 -r 8ea4f6a49c13 configure.ac --- a/configure.ac Fri Jul 22 12:05:38 2011 +0200 +++ b/configure.ac Fri Jul 22 12:14:55 2011 +0200 @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - [0.14.3],[http://trac.gajim.org/],[gajim]) + [0.14.4],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) diff -r 1b3016540402 -r 8ea4f6a49c13 gajim.nsi --- a/gajim.nsi Fri Jul 22 12:05:38 2011 +0200 +++ b/gajim.nsi Fri Jul 22 12:14:55 2011 +0200 @@ -188,7 +188,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.14.3" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.14.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 1b3016540402 -r 8ea4f6a49c13 setup_win32.py --- a/setup_win32.py Fri Jul 22 12:05:38 2011 +0200 +++ b/setup_win32.py Fri Jul 22 12:14:55 2011 +0200 @@ -49,7 +49,7 @@ setup( name='Gajim', - version='0.14.3', + version='0.14.4', description='A full featured Jabber client', author='Gajim Development Team', url='http://www.gajim.org/', diff -r 1b3016540402 -r 8ea4f6a49c13 src/common/defs.py --- a/src/common/defs.py Fri Jul 22 12:05:38 2011 +0200 +++ b/src/common/defs.py Fri Jul 22 12:14:55 2011 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.14.3' +version = '0.14.4' import sys, os.path for base in ('.', 'common'):

1 0

gajim: fix traceback when Gajim dev tries to nrgociate only arch...
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset a1c1525d1af3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1c1525d1af3 description: fix traceback when Gajim dev tries to nrgociate only archiving and not E2E session diffstat: src/session.py | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diffs (35 lines): diff -r 63e5a47485dd -r a1c1525d1af3 src/session.py --- a/src/session.py Fri Jul 22 11:18:26 2011 +0200 +++ b/src/session.py Fri Jul 22 12:05:22 2011 +0200 @@ -409,7 +409,8 @@ try: # bob responds - if form.getType() == 'form' and 'security' in form.asDict(): + if form.getType() == 'form' and 'security' in form.asDict() and \ + [x[1] for x in form.getField('security').getOptions()] != ['none']: # we don't support 3-message negotiation as the responder if 'dhkeys' in form.asDict(): self.fail_bad_negotiation('3 message negotiation not supported ' @@ -506,21 +507,3 @@ self.conn.delete_session(str(self.jid), self.thread_id) return - - # non-esession negotiation. this isn't very useful, but i'm keeping it - # around to test my test suite. - if form.getType() == 'form': - if not self.control: - jid, resource = gajim.get_room_and_nick_from_fjid(self.jid) - - account = self.conn.name - contact = gajim.contacts.get_contact(account, self.jid, resource) - - if not contact: - contact = gajim.contacts.create_contact(jid=jid, account=account, - resource=resource, show=self.conn.get_status()) - - gajim.interface.new_chat(contact, account, resource=resource, - session=self) - - negotiation.FeatureNegotiationWindow(account, self.jid, self, form)

1 0

gajim: fix weird traceback
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset 1b3016540402 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1b3016540402 description: fix weird traceback diffstat: src/message_window.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r a1c1525d1af3 -r 1b3016540402 src/message_window.py --- a/src/message_window.py Fri Jul 22 12:05:22 2011 +0200 +++ b/src/message_window.py Fri Jul 22 12:05:38 2011 +0200 @@ -589,7 +589,10 @@ self.notebook.set_show_tabs(show_tabs_if_one_tab) def redraw_tab(self, ctrl, chatstate = None): - hbox = self.notebook.get_tab_label(ctrl.widget).get_children()[0] + tab = self.notebook.get_tab_label(ctrl.widget) + if not tab: + return + hbox = tab.get_children()[0] status_img = hbox.get_children()[0] nick_label = hbox.get_children()[1]

1 0

gajim: fix detecting non-anonymous when 100 code is sent in init...
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset 63e5a47485dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=63e5a47485dd description: fix detecting non-anonymous when 100 code is sent in initial presence. diffstat: src/groupchat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 7bb6c6b8c2c1 -r 63e5a47485dd src/groupchat_control.py --- a/src/groupchat_control.py Thu Jul 21 23:50:22 2011 +0200 +++ b/src/groupchat_control.py Fri Jul 22 11:18:26 2011 +0200 @@ -1294,6 +1294,7 @@ # gajim.py) self.print_conversation(\ _('Any occupant is allowed to see your full JID')) + self.is_anonymous = False if '170' in statusCode: # Can be a message (see handle_event_gc_config_change in # gajim.py)

1 0

gajim: fix detecting non-anonymous when 100 code is sent in init...
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset 42651bfe5568 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=42651bfe5568 description: fix detecting non-anonymous when 100 code is sent in initial presence. diffstat: src/groupchat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 76f21c4e5c58 -r 42651bfe5568 src/groupchat_control.py --- a/src/groupchat_control.py Thu Jul 21 23:50:22 2011 +0200 +++ b/src/groupchat_control.py Fri Jul 22 11:18:26 2011 +0200 @@ -1503,6 +1503,7 @@ # gajim.py) self.print_conversation( _('Any occupant is allowed to see your full JID')) + self.is_anonymous = False if '170' in obj.status_code: # Can be a message (see handle_event_gc_config_change in # gajim.py)

1 0

gajim: fix nameprep for wrong jids. Fixes #6925
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset 7bb6c6b8c2c1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7bb6c6b8c2c1 description: fix nameprep for wrong jids. Fixes #6925 diffstat: src/common/xmpp/stringprepare.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (21 lines): diff -r 3cb11e1c2d6a -r 7bb6c6b8c2c1 src/common/xmpp/stringprepare.py --- a/src/common/xmpp/stringprepare.py Wed Jul 20 00:08:13 2011 +0200 +++ b/src/common/xmpp/stringprepare.py Thu Jul 21 23:50:22 2011 +0200 @@ -2,7 +2,7 @@ ## src/common/xmpp/stringprepare.py ## ## Copyright (C) 2001-2005 Twisted Matrix Laboratories -## Copyright (C) 2005-2010 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2011 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## @@ -202,6 +202,8 @@ def nameprep(self, label): label = idna.nameprep(label) self.check_prohibiteds(label) + if len(label) == 0: + raise UnicodeError, "Invalid empty name" if label[0] == '-': raise UnicodeError, "Invalid leading hyphen-minus" if label[-1] == '-':

1 0

gajim: cleanup gc_control.error_dialog attribute when we close t...
by Yann Leboulanger 22 Jul '11

22 Jul '11

changeset 3cb11e1c2d6a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3cb11e1c2d6a description: cleanup gc_control.error_dialog attribute when we close the error dialog. See #6925 diffstat: src/gui_interface.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 93a3916f2788 -r 3cb11e1c2d6a src/gui_interface.py --- a/src/gui_interface.py Fri Jul 01 16:08:15 2011 +0200 +++ b/src/gui_interface.py Wed Jul 20 00:08:13 2011 +0200 @@ -1122,6 +1122,7 @@ def on_ok(text): gajim.connections[account].join_gc(nick, room_jid, text) gajim.gc_passwords[room_jid] = text + gc_control.error_dialog = None def on_cancel(): # get and destroy window @@ -1131,6 +1132,7 @@ win = self.msg_win_mgr.get_window(room_jid, account) ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) win.remove_tab(ctrl, 3) + gc_control.error_dialog = None gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) if gc_control:

1 0

gajim: fix nameprep for wrong jids. Fixes #6925
by Yann Leboulanger 21 Jul '11

21 Jul '11

changeset 76f21c4e5c58 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=76f21c4e5c58 description: fix nameprep for wrong jids. Fixes #6925 diffstat: src/common/xmpp/stringprepare.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (21 lines): diff -r 02c5e2e21574 -r 76f21c4e5c58 src/common/xmpp/stringprepare.py --- a/src/common/xmpp/stringprepare.py Wed Jul 20 00:08:13 2011 +0200 +++ b/src/common/xmpp/stringprepare.py Thu Jul 21 23:50:22 2011 +0200 @@ -2,7 +2,7 @@ ## src/common/xmpp/stringprepare.py ## ## Copyright (C) 2001-2005 Twisted Matrix Laboratories -## Copyright (C) 2005-2010 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2011 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## @@ -202,6 +202,8 @@ def nameprep(self, label): label = idna.nameprep(label) self.check_prohibiteds(label) + if len(label) == 0: + raise UnicodeError, "Invalid empty name" if label[0] == '-': raise UnicodeError, "Invalid leading hyphen-minus" if label[-1] == '-':

1 0

gajim: cleanup gc_control.error_dialog attribute when we close t...
by Yann Leboulanger 19 Jul '11

19 Jul '11

changeset 02c5e2e21574 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=02c5e2e21574 description: cleanup gc_control.error_dialog attribute when we close the error dialog. See #6925 diffstat: src/gui_interface.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r c0119fce8654 -r 02c5e2e21574 src/gui_interface.py --- a/src/gui_interface.py Tue Jul 19 23:05:32 2011 +0200 +++ b/src/gui_interface.py Wed Jul 20 00:08:13 2011 +0200 @@ -251,6 +251,7 @@ def on_ok(text): gajim.connections[account].join_gc(nick, room_jid, text) gajim.gc_passwords[room_jid] = text + gc_control.error_dialog = None def on_cancel(): # get and destroy window @@ -260,6 +261,7 @@ win = self.msg_win_mgr.get_window(room_jid, account) ctrl = self.msg_win_mgr.get_gc_control(room_jid, account) win.remove_tab(ctrl, 3) + gc_control.error_dialog = None gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) if gc_control:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2011