Commits June 2010

commits@gajim.org

4 participants
38 discussions

gajim: l10n: Updated Kazakh (kk) translation to 64%
by Baurzhan Muftakhidinov 30 Jun '10

30 Jun '10

changeset 2188b5fc28cf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2188b5fc28cf description: l10n: Updated Kazakh (kk) translation to 64% New status: 1336 messages complete with 5 fuzzies and 740 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/kk.po | 514 ++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 263 insertions(+), 251 deletions(-) diffs (truncated from 1716 to 300 lines): diff -r 6027a3694664 -r 2188b5fc28cf po/kk.po --- a/po/kk.po Wed Jun 30 05:38:21 2010 +0300 +++ b/po/kk.po Wed Jun 30 03:23:18 2010 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim.trunk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-30 17:23+0600\n" -"PO-Revision-Date: 2010-06-27 22:38+0600\n" +"PO-Revision-Date: 2010-06-29 11:45+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -412,7 +412,7 @@ #: ../data/gui/accounts_window.ui.h:50 msgid "Use G_PG Agent" -msgstr "G_PG агентті қолдану" +msgstr "G_PG агентін қолдану" #: ../data/gui/accounts_window.ui.h:51 msgid "Use cust_om hostname/port" @@ -434,7 +434,7 @@ #: ../data/gui/accounts_window.ui.h:55 #: ../data/gui/xml_console_window.ui.h:11 msgid "_Enable" -msgstr "Қ_осу" +msgstr "Іске қ_осу" #: ../data/gui/accounts_window.ui.h:56 msgid "_Hostname: " @@ -509,7 +509,7 @@ #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" -msgstr "" +msgstr "П_айдаланушы ID-і:" #: ../data/gui/adhoc_commands_window.ui.h:1 msgid "An error has occurred:" @@ -533,11 +533,11 @@ #: ../data/gui/adhoc_commands_window.ui.h:6 msgid "Please wait while retrieving command list..." -msgstr "" +msgstr "Командалар тізімін алғанша күте тұрыңыз..." #: ../data/gui/adhoc_commands_window.ui.h:7 msgid "Please wait while the command is sending..." -msgstr "" +msgstr "Команда жіберілгенше күте тұрыңыз..." #: ../data/gui/adhoc_commands_window.ui.h:8 msgid "Please wait..." @@ -627,15 +627,15 @@ #: ../data/gui/advanced_notifications_window.ui.h:5 msgid "Advanced Actions" -msgstr "" +msgstr "Кеңейтілген әрекеттер" #: ../data/gui/advanced_notifications_window.ui.h:6 msgid "Advanced Notifications Control" -msgstr "" +msgstr "Кеңейтілген әрекеттерді басқару" #: ../data/gui/advanced_notifications_window.ui.h:7 msgid "All statuses" -msgstr "" +msgstr "Барлық күйлер" #: ../data/gui/advanced_notifications_window.ui.h:8 #: ../src/common/commands.py:106 @@ -648,14 +648,12 @@ msgstr "Бос емес" #: ../data/gui/advanced_notifications_window.ui.h:10 -#, fuzzy msgid "Contact Change Status " -msgstr "Қалып-күйді өзгерту" +msgstr "Контакт қалып-күйді өзгерту" #: ../data/gui/advanced_notifications_window.ui.h:11 -#, fuzzy msgid "Contact Disconnected " -msgstr "Байланыспаған" +msgstr "Контакт байланыспаған" #: ../data/gui/advanced_notifications_window.ui.h:12 msgid "Don't have " @@ -709,12 +707,11 @@ #: ../data/gui/advanced_notifications_window.ui.h:24 msgid "Play a sound" -msgstr "" +msgstr "Дыбысты ойнату" #: ../data/gui/advanced_notifications_window.ui.h:25 -#, fuzzy msgid "Receive a Message" -msgstr "_Жеке хабарлама жіберу" +msgstr "Хабарлама алу" #: ../data/gui/advanced_notifications_window.ui.h:26 msgid "When " @@ -844,11 +841,11 @@ #: ../data/gui/change_password_dialog.ui.h:2 msgid "Enter it again for confirmation:" -msgstr "" +msgstr "Растау үшін қайта енгізіңіз:" #: ../data/gui/change_password_dialog.ui.h:3 msgid "Enter new password:" -msgstr "" +msgstr "Жаңа парольді енгізіңіз:" #: ../data/gui/change_status_message_dialog.ui.h:1 msgid "Type your new status message" @@ -883,7 +880,7 @@ #: ../data/gui/chat_context_menu.ui.h:3 msgid "_Copy JID/Email Address" -msgstr "" +msgstr "JID/Email _адресін көшіру" #: ../data/gui/chat_context_menu.ui.h:4 msgid "_Copy Link Location" @@ -1129,7 +1126,7 @@ #: ../data/gui/features_window.ui.h:2 msgid "List of possible features in Gajim:" -msgstr "" +msgstr "Gajim мүмкіндіктер тізімі:" #: ../data/gui/features_window.ui.h:3 msgid "Features" @@ -1617,7 +1614,7 @@ #: ../data/gui/preferences_window.ui.h:8 msgid "Connection" -msgstr "Бауланыс" +msgstr "Байланыс" #. a header for custom browser/client/file manager. so translate sth like: Custom Settings #: ../data/gui/preferences_window.ui.h:10 @@ -1727,7 +1724,7 @@ #: ../data/gui/preferences_window.ui.h:38 msgid "Autodetect on every Gajim startup" -msgstr "Gajim қосылғанда, әр ре_т автоанықтау" +msgstr "Gajim қосылғанда, әр рет автоанықтау" #: ../data/gui/preferences_window.ui.h:39 msgid "Chat message:" @@ -1746,14 +1743,12 @@ msgstr "" #: ../data/gui/preferences_window.ui.h:43 -#, fuzzy msgid "Contact's message:" -msgstr "Чат хабарламасы:" +msgstr "Контакт хабарламасы:" #: ../data/gui/preferences_window.ui.h:44 -#, fuzzy msgid "Contact's nickname:" -msgstr "Контакт аты" +msgstr "Контакт аты:" #: ../data/gui/preferences_window.ui.h:45 msgid "Custom" @@ -1761,19 +1756,19 @@ #: ../data/gui/preferences_window.ui.h:46 msgid "Detached roster with chat grouped by account" -msgstr "" +msgstr "Бөлек ростер мен тіркелгі бойынша топталған чаттар" #: ../data/gui/preferences_window.ui.h:47 msgid "Detached roster with chat grouped by type" -msgstr "" +msgstr "Бөлек ростер мен түрі бойынша топталған чаттар" #: ../data/gui/preferences_window.ui.h:48 msgid "Detached roster with detached chats" -msgstr "" +msgstr "Бөлек ростер мен бөлек чаттар" #: ../data/gui/preferences_window.ui.h:49 msgid "Detached roster with single chat" -msgstr "" +msgstr "Бөлек ростер мен бір чат" #: ../data/gui/preferences_window.ui.h:50 #: ../src/config.py:170 @@ -1790,9 +1785,8 @@ msgstr "_Пошта ақпаратын толығырақ көрсету" #: ../data/gui/preferences_window.ui.h:53 -#, fuzzy msgid "Display _location of contacts in roster" -msgstr "Ростерде_гі контакттардың көңіл-күйлерін көрсету" +msgstr "Ростерде_гі контакттардың орналасуын көрсету" #: ../data/gui/preferences_window.ui.h:54 msgid "Display _tunes of contacts in roster" @@ -1855,9 +1849,8 @@ msgstr "" #: ../data/gui/preferences_window.ui.h:70 -#, fuzzy msgid "If checked, Gajim will display the location of contacts in the roster window" -msgstr "Белгіленген болса, Gajim қосылғанда бұл чат бөлмесіне автоматты түрде кіреді" +msgstr "Белгіленген болса, Gajim ростерде контакттардың орналасуын көрсетеді" #: ../data/gui/preferences_window.ui.h:71 msgid "If checked, Gajim will display the mood of contacts in the roster window" @@ -1979,7 +1972,7 @@ #: ../data/gui/preferences_window.ui.h:101 msgid "Single window for everything" -msgstr "" +msgstr "Барлығы үшін де бір терезе" #: ../data/gui/preferences_window.ui.h:102 msgid "Some messages may include rich content (formatting, colors etc). If checked, Gajim will just display the raw message text." @@ -2134,11 +2127,11 @@ #: ../data/gui/privacy_list_window.ui.h:1 msgid "Add / Edit a rule" -msgstr "" +msgstr "Ережені қосу / түзету" #: ../data/gui/privacy_list_window.ui.h:2 msgid "List of rules" -msgstr "" +msgstr "Ережелер тізімі" #: ../data/gui/privacy_list_window.ui.h:3 msgid "Privacy List" @@ -2435,7 +2428,7 @@ #: ../data/gui/roster_window.ui.h:9 msgid "Show Only _Active Contacts" -msgstr "" +msgstr "Те_к белсенді контакттарды көрсету" #: ../data/gui/roster_window.ui.h:10 msgid "Show Trans_ports" @@ -2730,7 +2723,7 @@ #: ../data/gui/zeroconf_information_window.ui.h:7 msgid "Personal" -msgstr "" +msgstr "Жеке" #: ../data/gui/zeroconf_information_window.ui.h:8 msgid "Resource:" @@ -2746,7 +2739,7 @@ #: ../data/gajim.desktop.in.in.h:2 msgid "Gajim Instant Messenger" -msgstr "Gajim жедел хабарламалар" +msgstr "Gajim хабарламалармен алмасу" #: ../data/gajim.desktop.in.in.h:3 msgid "Jabber IM Client" @@ -2802,7 +2795,7 @@ #: ../src/advanced_configuration_window.py:107 msgid "Preference Name" -msgstr "" +msgstr "Баптау аты" #: ../src/advanced_configuration_window.py:113 msgid "Value" @@ -3168,13 +3161,13 @@ #: ../src/common/check_paths.py:325 #: ../src/common/check_paths.py:333 msgid "Gajim will now exit" -msgstr "" +msgstr "Gajim қазір өз жұмысын аяқтайды" #: ../src/common/check_paths.py:317 #: ../src/common/check_paths.py:332 #, python-format msgid "%s is a directory but should be a file" -msgstr "" +msgstr "%s бума екен, алайда файл болуы керек еді" #: ../src/common/check_paths.py:337 #, python-format @@ -3233,7 +3226,7 @@ #: ../src/common/commands.py:201 msgid "You have not joined a groupchat." -msgstr "" +msgstr "Сіз топтық чатқа кірген жоқсыз." #: ../src/common/commands.py:208

1 0

gajim: Minor fixes for CAPTCHA
by Alexander Cherniuk 30 Jun '10

30 Jun '10

changeset 6027a3694664 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6027a3694664 description: Minor fixes for CAPTCHA diffstat: src/common/dataforms.py | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diffs (42 lines): diff -r bce533950334 -r 6027a3694664 src/common/dataforms.py --- a/src/common/dataforms.py Mon Jun 28 04:17:38 2010 +0000 +++ b/src/common/dataforms.py Wed Jun 30 05:38:21 2010 +0300 @@ -236,10 +236,8 @@ media = self.getTag('media', namespace=xmpp.NS_DATA_MEDIA) if media: return Media(media) - return None def fset(self, value): - assert isinstance(value, Media) fdel(self) self.addChild(node=value) @@ -263,7 +261,6 @@ return self.getAttr('type') def fset(self, value): - assert isinstance(value, basestring) self.setAttr('type', value) def fdel(self): @@ -280,7 +277,6 @@ return self.getData() def fset(self, value): - assert isinstance(value, basestring) self.setData(value) def fdel(self): @@ -298,10 +294,7 @@ URIs of the media element. """ def fget(self): - uris = [] - for element in self.getTags('uri'): - uris.append(Uri(element)) - return uris + return map(Uri, self.getTags('uri')) def fset(self, value): fdel(self)

1 0

gajim-website: MOPSLinux and AgiliaLinux use the same package sy...
by Yann Leboulanger 29 Jun '10

29 Jun '10

changeset 43bd1633cb6d in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=43bd1633cb6d description: MOPSLinux and AgiliaLinux use the same package system diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d7d4e30a813d -r 43bd1633cb6d downloads.php --- a/downloads.php Sat May 08 14:14:59 2010 +0200 +++ b/downloads.php Tue Jun 29 23:00:37 2010 +0200 @@ -109,7 +109,7 @@ print ("<a name=\"mopslinux\">\n"); print (" <h2>\n"); -print (" MOPSLinux\n"); +print (" AgiliaLinux (MOPSLinux)\n"); print (" </h2>\n"); print ("</a>\n"); print _(" Just")." mpkg-install gajim\n";

1 0

gajim: l10n: Updated Kazakh (kk) translation to 53%
by Baurzhan Muftakhidinov 28 Jun '10

28 Jun '10

changeset bce533950334 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bce533950334 description: l10n: Updated Kazakh (kk) translation to 53% New status: 1103 messages complete with 19 fuzzies and 959 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/kk.po | 702 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 322 insertions(+), 380 deletions(-) diffs (truncated from 2295 to 300 lines): diff -r 03ecf0285581 -r bce533950334 po/kk.po --- a/po/kk.po Sun Jun 27 23:09:07 2010 +0200 +++ b/po/kk.po Mon Jun 28 04:17:38 2010 +0000 @@ -1,14 +1,14 @@ # Kazakh translation for gajim. # Copyright (C) 2009 gajim team # This file is distributed under the same license as the PACKAGE package. -# Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>, 2008. +# Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>, 2010. # msgid "" msgstr "" "Project-Id-Version: gajim.trunk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-03-30 17:23+0600\n" -"PO-Revision-Date: 2010-03-30 17:34+0600\n" +"PO-Revision-Date: 2010-06-27 22:38+0600\n" "Last-Translator: Baurzhan Muftakhidinov <baurthefirst(a)gmail.com>\n" "Language-Team: Kazakh <kk_KZ(a)googlegroups.com>\n" "MIME-Version: 1.0\n" @@ -92,7 +92,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:11 msgid "Anon_ymous authentication" -msgstr "" +msgstr "Анони_мды аутентификация" #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Connect when I press Finish" @@ -216,7 +216,7 @@ #: ../data/gui/accounts_window.ui.h:5 msgid "A_djust to status" -msgstr "" +msgstr "Күйге сә_йкес" #: ../data/gui/accounts_window.ui.h:6 #: ../data/gui/join_groupchat_window.ui.h:1 @@ -233,7 +233,7 @@ #: ../data/gui/accounts_window.ui.h:9 msgid "Anonymous authentication" -msgstr "" +msgstr "Анонимды аутентификация" #: ../data/gui/accounts_window.ui.h:10 msgid "Auto-reconnect when connection is lost" @@ -265,7 +265,7 @@ #: ../data/gui/accounts_window.ui.h:17 msgid "Co_nnect on Gajim startup" -msgstr "" +msgstr "Gajim қо_сылғанда байланыс орнату" #: ../data/gui/accounts_window.ui.h:18 msgid "Connection" @@ -391,36 +391,36 @@ #: ../data/gui/accounts_window.ui.h:44 msgid "Save conversation _logs for all contacts" -msgstr "" +msgstr "Барлық к_онтакттар үшін хабарламалар тарихын сақтау" #: ../data/gui/accounts_window.ui.h:46 msgid "Send _keep-alive packets" -msgstr "" +msgstr "Keep-alive д_естелерін жіберіп отыру" #: ../data/gui/accounts_window.ui.h:47 msgid "Synch_ronize account status with global status" -msgstr "" +msgstr "Тіркелгі күйі_н ортақ күймен тең ұстау" #: ../data/gui/accounts_window.ui.h:48 msgid "Synchroni_ze account status with global status" -msgstr "" +msgstr "Тіркел_гі күйін ортақ күймен тең ұстау" #: ../data/gui/accounts_window.ui.h:49 #: ../data/gui/synchronise_select_account_dialog.ui.h:2 msgid "Synchronise contacts" -msgstr "" +msgstr "Контакттарды синхрондау" #: ../data/gui/accounts_window.ui.h:50 msgid "Use G_PG Agent" -msgstr "" +msgstr "G_PG агентті қолдану" #: ../data/gui/accounts_window.ui.h:51 msgid "Use cust_om hostname/port" -msgstr "" +msgstr "Таңдауыңызша _хост аты/порт қолдану" #: ../data/gui/accounts_window.ui.h:52 msgid "Use cust_om port:" -msgstr "" +msgstr "Таңдауыңызша _портты қолдану" #: ../data/gui/accounts_window.ui.h:53 msgid "Use file transfer proxies" @@ -450,11 +450,11 @@ #: ../data/gui/accounts_window.ui.h:61 msgid "_Warn before using an insecure connection" -msgstr "" +msgstr "Қ_ауіпсіз емес байланыс орнату алдында ескерту" #: ../data/gui/accounts_window.ui.h:62 msgid "_use HTTP__PROXY environment variable" -msgstr "" +msgstr "қор_шамның HTTP__PROXY айнымалысын қолдану" #: ../data/gui/add_new_contact_window.ui.h:1 msgid "A_ccount:" @@ -462,7 +462,7 @@ #: ../data/gui/add_new_contact_window.ui.h:2 msgid "A_llow this contact to view my status" -msgstr "" +msgstr "Бұ_л контактқа менің күйімді көруге рұқсат ету" #: ../data/gui/add_new_contact_window.ui.h:3 msgid "Add New Contact" @@ -471,7 +471,7 @@ #: ../data/gui/add_new_contact_window.ui.h:4 #: ../src/common/helpers.py:1339 msgid "I would like to add you to my contact list." -msgstr "" +msgstr "Мен сізді өзімнің контакттар тізіміне қосқым келеді." #: ../data/gui/add_new_contact_window.ui.h:5 msgid "" @@ -504,9 +504,8 @@ msgstr "Ті_ркелу" #: ../data/gui/add_new_contact_window.ui.h:15 -#, fuzzy msgid "_Save subscription message" -msgstr "_Жазылу" +msgstr "Жаз_ылуға сұраным хабарламасын сақтау" #: ../data/gui/add_new_contact_window.ui.h:16 msgid "_User ID:" @@ -559,7 +558,7 @@ #: ../data/gui/advanced_configuration_window.ui.h:3 msgid "Advanced Configuration Editor" -msgstr "" +msgstr "Кеңейтілген баптаулар түзетушісі" #: ../data/gui/advanced_configuration_window.ui.h:4 msgid "Filter:" @@ -571,11 +570,11 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:2 msgid "Deletes Message of the Day" -msgstr "" +msgstr "Осы күннің хабарламасын өшіреді" #: ../data/gui/advanced_menuitem_menu.ui.h:3 msgid "Edit _Privacy Lists..." -msgstr "" +msgstr "_Жекелік тізімдерін түзету..." #: ../data/gui/advanced_menuitem_menu.ui.h:4 msgid "Sends a message to users currently connected to this server" @@ -583,11 +582,11 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:5 msgid "Set MOTD..." -msgstr "" +msgstr "MOTD орнату..." #: ../data/gui/advanced_menuitem_menu.ui.h:6 msgid "Sets Message of the Day" -msgstr "" +msgstr "Осы күннің хабарламасын орнатады" #: ../data/gui/advanced_menuitem_menu.ui.h:7 msgid "Show _XML Console" @@ -599,7 +598,7 @@ #: ../data/gui/advanced_menuitem_menu.ui.h:9 msgid "Updates Message of the Day" -msgstr "" +msgstr "Осы күннің хабарламасын жаңартады" #: ../data/gui/advanced_menuitem_menu.ui.h:10 msgid "_Administrator" @@ -663,19 +662,16 @@ msgstr "" #: ../data/gui/advanced_notifications_window.ui.h:13 -#, fuzzy msgid "File Transfer Finished" -msgstr "Файлдармен алмасу" +msgstr "Файлдармен алмасу аяқталды" #: ../data/gui/advanced_notifications_window.ui.h:14 -#, fuzzy msgid "File Transfer Request " -msgstr "Файлдармен алмасу" +msgstr "Файлдармен алмасуға сұраным" #: ../data/gui/advanced_notifications_window.ui.h:15 -#, fuzzy msgid "File Transfer Started " -msgstr "Файлдармен алмасу аяқталды" +msgstr "Файлдармен алмасу басталды" #: ../data/gui/advanced_notifications_window.ui.h:16 msgid "Group Chat Message Highlight " @@ -769,9 +765,8 @@ msgstr "мен де" #: ../data/gui/advanced_notifications_window.ui.h:38 -#, fuzzy msgid "contact(s)" -msgstr "Контакт" +msgstr "контакт(тар)" #: ../data/gui/advanced_notifications_window.ui.h:39 msgid "everybody" @@ -782,9 +777,8 @@ msgstr "" #: ../data/gui/advanced_notifications_window.ui.h:41 -#, fuzzy msgid "group(s)" -msgstr "Топ" +msgstr "топ(тар)" #: ../data/gui/advanced_notifications_window.ui.h:42 msgid "when I'm in" @@ -896,14 +890,12 @@ msgstr "" #: ../data/gui/chat_context_menu.ui.h:5 -#, fuzzy msgid "_Open Email Composer" -msgstr "Gmail е-жәшігін а_шу" +msgstr "Email қ_олданбасын ашу" #: ../data/gui/chat_context_menu.ui.h:6 -#, fuzzy msgid "_Open Link in Browser" -msgstr "_Орналасқан буманы ашу" +msgstr "Сіл_темені браузерде ашу" #: ../data/gui/chat_context_menu.ui.h:7 #: ../data/gui/subscription_request_popup_menu.ui.h:1 @@ -1018,9 +1010,8 @@ msgstr "OpenPGP _кілтін орнату..." #: ../data/gui/contact_context_menu.ui.h:4 -#, fuzzy msgid "E_xecute Command..." -msgstr "Команданы орындау..." +msgstr "Команда_ны орындау..." #: ../data/gui/contact_context_menu.ui.h:5 msgid "Edit _Groups..." @@ -1219,9 +1210,8 @@ msgstr "" #: ../data/gui/gajim_themes_window.ui.h:2 -#, fuzzy msgid "Account row" -msgstr "Тіркелгі" +msgstr "Тіркелгі бағаны" #: ../data/gui/gajim_themes_window.ui.h:3 #: ../src/chat_control.py:883 @@ -1237,9 +1227,8 @@ msgstr "Жазу" #: ../data/gui/gajim_themes_window.ui.h:6 -#, fuzzy msgid "Contact row" -msgstr "Контакт" +msgstr "Контакт бағаны" #: ../data/gui/gajim_themes_window.ui.h:7 msgid "Font style:" @@ -1254,9 +1243,8 @@ msgstr "" #: ../data/gui/gajim_themes_window.ui.h:10 -#, fuzzy msgid "Group row" -msgstr "Топ" +msgstr "Топ бағаны" #: ../data/gui/gajim_themes_window.ui.h:11 #: ../src/common/pep.py:150 @@ -1362,9 +1350,8 @@ msgstr "_Ие" #: ../data/gui/gc_occupants_menu.ui.h:12

1 0

gajim: iability to show captcha when joining a groupchat with ca...
by Yann Leboulanger 27 Jun '10

27 Jun '10

changeset 03ecf0285581 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=03ecf0285581 description: iability to show captcha when joining a groupchat with captcha. (TODO: download image when it's not in the message itself) diffstat: data/gui/groupchat_control.ui | 168 ++++++++++++++++++------------------- src/common/connection.py | 79 ++++++++++------- src/common/connection_handlers.py | 17 +++- src/common/dataforms.py | 92 ++++++++++++++++++++- src/common/xmpp/protocol.py | 3 + src/dataforms_widget.py | 20 ++++ src/groupchat_control.py | 36 +++++++- src/gui_interface.py | 5 +- 8 files changed, 294 insertions(+), 126 deletions(-) diffs (truncated from 619 to 300 lines): diff -r 78e6097b351a -r 03ecf0285581 data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Sun Jun 27 23:04:49 2010 +0200 +++ b/data/gui/groupchat_control.ui Sun Jun 27 23:09:07 2010 +0200 @@ -5,6 +5,7 @@ <object class="GtkVBox" id="groupchat_control_vbox"> <property name="can_focus">True</property> <property name="border_width">3</property> + <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment"> <property name="visible">True</property> @@ -34,6 +35,7 @@ <property name="visible">True</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">5</property> + <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="banner_name_label"> <property name="visible">True</property> @@ -74,6 +76,85 @@ </packing> </child> <child> + <object class="GtkHPaned" id="hpaned"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">3</property> + <property name="position">495</property> + <property name="position_set">True</property> + <child> + <object class="GtkVBox" id="gc_textviews_vbox"> + <property name="width_request">0</property> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="width_request">200</property> + <property name="height_request">60</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">never</property> + <property name="shadow_type">in</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">False</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="list_scrolledwindow"> + <property name="width_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="list_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">1</property> + <property name="headers_visible">False</property> + </object> + </child> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">False</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkHBox" id="actions_hbox"> <property name="visible">True</property> <child> @@ -339,92 +420,5 @@ <property name="position">2</property> </packing> </child> - <child> - <object class="GtkHPaned" id="hpaned"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">3</property> - <property name="position">495</property> - <property name="position_set">True</property> - <child> - <object class="GtkVBox" id="vbox108"> - <property name="width_request">0</property> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkVBox" id="vbox109"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="width_request">200</property> - <property name="height_request">60</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="list_scrolledwindow"> - <property name="width_request">100</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="list_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">1</property> - <property name="headers_visible">False</property> - </object> - </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">False</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> </object> </interface> diff -r 78e6097b351a -r 03ecf0285581 src/common/connection.py --- a/src/common/connection.py Sun Jun 27 23:04:49 2010 +0200 +++ b/src/common/connection.py Sun Jun 27 23:09:07 2010 +0200 @@ -288,33 +288,37 @@ gajim.thread_interface(encrypt_thread, [msg, keyID, True], _on_encrypted, []) else: - self._message_encrypted_cb(output, type_, msg, msgtxt, - original_message, fjid, resource, jid, xhtml, - subject, chatstate, composing_xep, label, forward_from, - delayed, session, form_node, user_nick, keyID, - callback) + self._message_encrypted_cb(output, type_, msg, + msgtxt, original_message, fjid, resource, + jid, xhtml, subject, chatstate, msg_id, + composing_xep, label, forward_from, delayed, + session, form_node, user_nick, keyID, + callback) self.dispatch('GPG_ALWAYS_TRUST', _on_always_trust) else: self._message_encrypted_cb(output, type_, msg, msgtxt, - original_message, fjid, resource, jid, xhtml, subject, - chatstate, composing_xep, label, forward_from, delayed, session, - form_node, user_nick, keyID, callback) + original_message, fjid, resource, jid, xhtml, + subject, chatstate, msg_id, composing_xep, label, + forward_from, delayed, session, form_node, + user_nick, keyID, callback) gajim.thread_interface(encrypt_thread, [msg, keyID, False], _on_encrypted, []) return self._message_encrypted_cb(('', error), type_, msg, msgtxt, - original_message, fjid, resource, jid, xhtml, subject, chatstate, - composing_xep, label, forward_from, delayed, session, form_node, user_nick, - keyID, callback) + original_message, fjid, resource, jid, xhtml, subject, + chatstate, msg_id, composing_xep, label, forward_from, delayed, + session, form_node, user_nick, keyID, callback) self._on_continue_message(type_, msg, msgtxt, original_message, fjid, - resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep, - label, forward_from, delayed, session, form_node, user_nick, callback) + resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, + composing_xep, label, forward_from, delayed, session, form_node, + user_nick, callback) - def _message_encrypted_cb(self, output, type_, msg, msgtxt, original_message, - fjid, resource, jid, xhtml, subject, chatstate, composing_xep, label, forward_from, - delayed, session, form_node, user_nick, keyID, callback): + def _message_encrypted_cb(self, output, type_, msg, msgtxt, + original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, + composing_xep, label, forward_from, delayed, session, form_node, user_nick, + keyID, callback): msgenc, error = output if msgenc and not error: @@ -324,19 +328,19 @@ # one in locale and one en msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \ ' (' + msgtxt + ')' - self._on_continue_message(type_, msg, msgtxt, original_message, fjid, - resource, jid, xhtml, subject, msgenc, keyID, chatstate, - composing_xep, label, forward_from, delayed, session, form_node, user_nick, - callback) + self._on_continue_message(type_, msg, msgtxt, original_message, + fjid, resource, jid, xhtml, subject, msgenc, keyID, + chatstate, msg_id, composing_xep, label, forward_from, delayed, + session, form_node, user_nick, callback) return # Encryption failed, do not send message tim = localtime() self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session)) def _on_continue_message(self, type_, msg, msgtxt, original_message, fjid, - resource, jid, xhtml, subject, msgenc, keyID, chatstate, composing_xep, - label, - forward_from, delayed, session, form_node, user_nick, callback): + resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, + composing_xep, label, forward_from, delayed, session, form_node, user_nick, + callback): if type_ == 'chat': msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ=type_, xhtml=xhtml) @@ -347,6 +351,10 @@ else: msg_iq = common.xmpp.Message(to=fjid, body=msgtxt, typ='normal', xhtml=xhtml) + + if msg_id: + msg_iq.setID(msg_id) + if msgenc: msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc) @@ -1607,11 +1615,11 @@ self.connection.send(msg_iq) - def send_message(self, jid, msg, keyID, type_='chat', subject='', + def send_message(self, jid, msg, keyID=None, type_='chat', subject='', chatstate=None, msg_id=None, composing_xep=None, resource=None,

1 0

gajim: configure max width in tab label to avoid too big tabs
by Yann Leboulanger 27 Jun '10

27 Jun '10

changeset 78e6097b351a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=78e6097b351a description: configure max width in tab label to avoid too big tabs diffstat: data/gui/message_window.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 93460ce0b370 -r 78e6097b351a data/gui/message_window.ui --- a/data/gui/message_window.ui Wed Jun 23 14:54:50 2010 +0200 +++ b/data/gui/message_window.ui Sun Jun 27 23:04:49 2010 +0200 @@ -44,6 +44,7 @@ <property name="xalign">0</property> <property name="use_markup">True</property> <property name="ellipsize">end</property> + <property name="max_width_chars">9</property> </object> <packing> <property name="position">1</property>

1 0

gajim: stop message archiving for encrypted sessions. Fixes #5792
by Yann Leboulanger 27 Jun '10

27 Jun '10

changeset 4ee46c73b380 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4ee46c73b380 description: stop message archiving for encrypted sessions. Fixes #5792 diffstat: src/common/message_archiving.py | 7 +++++++ src/common/stanza_session.py | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diffs (48 lines): diff -r 3bd6009e8e5a -r 4ee46c73b380 src/common/message_archiving.py --- a/src/common/message_archiving.py Sun Jun 27 21:50:00 2010 +0200 +++ b/src/common/message_archiving.py Sun Jun 27 22:31:55 2010 +0200 @@ -76,6 +76,13 @@ item.setAttr('jid', jid) self.connection.send(iq_) + def stop_archiving_session(self, thread_id): + iq_ = common.xmpp.Iq('set') + pref = iq_.setTag('pref', namespace=common.xmpp.NS_ARCHIVE) + session = pref.setTag('session', attrs={'thread': thread_id, + 'save': 'false', 'otr': 'concede'}) + self.connection.send(iq_) + def get_item_pref(self, jid): jid = common.xmpp.JID(jid) if unicode(jid) in self.items: diff -r 3bd6009e8e5a -r 4ee46c73b380 src/common/stanza_session.py --- a/src/common/stanza_session.py Sun Jun 27 21:50:00 2010 +0200 +++ b/src/common/stanza_session.py Sun Jun 27 22:31:55 2010 +0200 @@ -287,6 +287,9 @@ if self.control: self.control.print_archiving_session_details() + def stop_archiving_for_session(self): + self.conn.stop_archiving_session(self.thread_id) + class EncryptedStanzaSession(ArchivingStanzaSession): """ @@ -1035,6 +1038,8 @@ if self.control: self.control.print_esession_details() + self.stop_archiving_for_session() + def final_steps_alice(self, form): srs = '' srses = secrets.secrets().retained_secrets(self.conn.name, @@ -1075,6 +1080,8 @@ if self.control: self.control.print_esession_details() + self.stop_archiving_for_session() + def do_retained_secret(self, k, old_srs): """ Calculate the new retained secret. determine if the user needs to check

1 0

gajim: Fix some mino things about archiving preference window. s...
by Yann Leboulanger 27 Jun '10

27 Jun '10

changeset 3bd6009e8e5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3bd6009e8e5a description: Fix some mino things about archiving preference window. see #5792 diffstat: src/common/connection_handlers.py | 1 + src/common/message_archiving.py | 2 ++ src/common/stanza_session.py | 3 ++- src/dialogs.py | 5 +---- src/message_control.py | 6 +++--- 5 files changed, 9 insertions(+), 8 deletions(-) diffs (81 lines): diff -r 9c17bf82e36a -r 3bd6009e8e5a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue May 25 16:33:40 2010 +0200 +++ b/src/common/connection_handlers.py Sun Jun 27 21:50:00 2010 +0200 @@ -701,6 +701,7 @@ elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTIONS_ARRIVED: # TODO + print 'ARCHIVING_COLLECTIONS_ARRIVED' pass elif self.awaiting_answers[id_][0] == ARCHIVING_COLLECTION_ARRIVED: diff -r 9c17bf82e36a -r 3bd6009e8e5a src/common/message_archiving.py --- a/src/common/message_archiving.py Tue May 25 16:33:40 2010 +0200 +++ b/src/common/message_archiving.py Sun Jun 27 21:50:00 2010 +0200 @@ -184,6 +184,8 @@ self.dispatch('ARCHIVING_CHANGED', ('itemremove', item.getAttr('jid'))) + raise common.xmpp.NodeProcessed + def request_collections_list_page(self, with_='', start=None, end=None, after=None, max=30, exact_match=False): iq_ = common.xmpp.Iq('get') diff -r 9c17bf82e36a -r 3bd6009e8e5a src/common/stanza_session.py --- a/src/common/stanza_session.py Tue May 25 16:33:40 2010 +0200 +++ b/src/common/stanza_session.py Sun Jun 27 21:50:00 2010 +0200 @@ -315,7 +315,8 @@ """ def __init__(self, conn, jid, thread_id, type_='chat'): - StanzaSession.__init__(self, conn, jid, thread_id, type_='chat') + ArchivingStanzaSession.__init__(self, conn, jid, thread_id, + type_='chat') self.xes = {} self.es = {} diff -r 9c17bf82e36a -r 3bd6009e8e5a src/dialogs.py --- a/src/dialogs.py Tue May 25 16:33:40 2010 +0200 +++ b/src/dialogs.py Sun Jun 27 21:50:00 2010 +0200 @@ -3394,7 +3394,6 @@ self.item_config = gajim.connections[self.account].items[self.item] else: self.item_config = gajim.connections[self.account].default - print self.item, self.item_config self.waiting = None # Connect to gtk builder @@ -3620,7 +3619,6 @@ def on_edit_item_button_clicked(self, widget): if not self.current_item: - print 'there is no current item' return key_name = 'edit_item_archiving_preferences_%s' % self.current_item @@ -3726,8 +3724,7 @@ print error def on_close_button_clicked(self, widget): - if not self.waiting: - self.window.destroy() + self.window.destroy() def on_archiving_preferences_window_destroy(self, widget): if 'archiving_preferences' in gajim.interface.instances[self.account]: diff -r 9c17bf82e36a -r 3bd6009e8e5a src/message_control.py --- a/src/message_control.py Tue May 25 16:33:40 2010 +0200 +++ b/src/message_control.py Sun Jun 27 21:50:00 2010 +0200 @@ -207,9 +207,9 @@ EncryptedStanzaSession) and oldsession.enable_encryption) archiving_changed = bool(session and isinstance(session, - ArchivingStanzaSession) and session.archiving) != \ - bool(oldsession and isinstance(oldsession, - ArchivingStanzaSession) and oldsession.archiving) + ArchivingStanzaSession) and session.archiving) != \ + bool(oldsession and isinstance(oldsession, + ArchivingStanzaSession) and oldsession.archiving) if crypto_changed or archiving_changed: self.print_session_details()

1 0

gajim: fix traceback when we get a <stream:error> from server.
by Yann Leboulanger 23 Jun '10

23 Jun '10

changeset 93460ce0b370 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=93460ce0b370 description: fix traceback when we get a <stream:error> from server. diffstat: src/common/xmpp/roster_nb.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 8d5f212ac020 -r 93460ce0b370 src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Mon Jun 21 19:15:46 2010 +0200 +++ b/src/common/xmpp/roster_nb.py Wed Jun 23 14:54:50 2010 +0200 @@ -342,6 +342,9 @@ self._owner.Dispatcher.ProcessNonBlocking(data) if not self.set: return + if not self._owner: + # Connection has been closed by receiving a <stream:error> for ex, + return self._owner.onreceive(None) if self.on_ready: self.on_ready(self)

1 0

gajim: delete bookmarks from pubsub if server doesn't support pu...
by Yann Leboulanger 21 Jun '10

21 Jun '10

changeset 8d5f212ac020 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8d5f212ac020 description: delete bookmarks from pubsub if server doesn't support publish-options. Fixes #5787 diffstat: src/common/connection_handlers.py | 5 +++++ src/common/pubsub.py | 26 +++++++++++++++++++------- src/gui_interface.py | 16 ---------------- 3 files changed, 24 insertions(+), 23 deletions(-) diffs (96 lines): diff -r ec96e9f90375 -r 8d5f212ac020 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jun 21 19:15:08 2010 +0200 +++ b/src/common/connection_handlers.py Mon Jun 21 19:15:46 2010 +0200 @@ -354,6 +354,11 @@ self.pubsub_supported = True if features.__contains__(common.xmpp.NS_PUBSUB_PUBLISH_OPTIONS): self.pubsub_publish_options_supported = True + else: + # Remove stored bookmarks accessible to everyone. + our_jid = gajim.get_jid_from_account(self.name) + self.send_pb_purge(our_jid, 'storage:bookmarks') + self.send_pb_delete(our_jid, 'storage:bookmarks') if features.__contains__(common.xmpp.NS_BYTESTREAM): our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name) +\ '/' + self.server_resource) diff -r ec96e9f90375 -r 8d5f212ac020 src/common/pubsub.py --- a/src/common/pubsub.py Mon Jun 21 19:15:08 2010 +0200 +++ b/src/common/pubsub.py Mon Jun 21 19:15:46 2010 +0200 @@ -109,25 +109,37 @@ self.connection.send(query) - def send_pb_delete(self, jid, node): + def send_pb_purge(self, jid, node): + """ + Purge node: Remove all items + """ + if not self.connection or self.connected < 2: + return + query = xmpp.Iq('set', to=jid) + d = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB_OWNER) + d = d.addChild('purge', {'node': node}) + + self.connection.send(query) + + def send_pb_delete(self, jid, node, on_ok=None, on_fail=None): """ Delete node """ if not self.connection or self.connected < 2: return query = xmpp.Iq('set', to=jid) - d = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB) + d = query.addChild('pubsub', namespace=xmpp.NS_PUBSUB_OWNER) d = d.addChild('delete', {'node': node}) def response(con, resp, jid, node): - if resp.getType() == 'result': - self.dispatch('PUBSUB_NODE_REMOVED', (jid, node)) - else: + if resp.getType() == 'result' and on_ok: + on_ok(jid, node) + elif on_fail: msg = resp.getErrorMsg() - self.dispatch('PUBSUB_NODE_NOT_REMOVED', (jid, node, msg)) + on_fail(jid, node, msg) self.connection.SendAndCallForResponse(query, response, {'jid': jid, - 'node': node}) + 'node': node}) def send_pb_create(self, jid, node, configure = False, configure_form = None): """ diff -r ec96e9f90375 -r 8d5f212ac020 src/gui_interface.py --- a/src/gui_interface.py Mon Jun 21 19:15:08 2010 +0200 +++ b/src/gui_interface.py Mon Jun 21 19:15:46 2010 +0200 @@ -2064,19 +2064,6 @@ checktext2, on_response_ok=on_ok, on_response_cancel=on_cancel, is_modal=False) - def handle_event_pubsub_node_removed(self, account, data): - # ('PUBSUB_NODE_REMOVED', account, (jid, node)) - if 'pep_services' in self.instances[account]: - if data[0] == gajim.get_jid_from_account(account): - self.instances[account]['pep_services'].node_removed(data[1]) - - def handle_event_pubsub_node_not_removed(self, account, data): - # ('PUBSUB_NODE_NOT_REMOVED', account, (jid, node, msg)) - if data[0] == gajim.get_jid_from_account(account): - dialogs.WarningDialog(_('PEP node was not removed'), - _('PEP node %(node)s was not removed: %(message)s') % { - 'node': data[1], 'message': data[2]}) - def handle_event_pep_received(self, account, data): # ('PEP_RECEIVED', account, (jid, pep_type)) jid = data[0] @@ -2188,9 +2175,6 @@ 'INSECURE_SSL_CONNECTION': \ [self.handle_event_insecure_ssl_connection], 'INSECURE_PASSWORD': [self.handle_event_insecure_password], - 'PUBSUB_NODE_REMOVED': [self.handle_event_pubsub_node_removed], - 'PUBSUB_NODE_NOT_REMOVED': \ - [self.handle_event_pubsub_node_not_removed], 'JINGLE_INCOMING': [self.handle_event_jingle_incoming], 'JINGLE_CONNECTED': [self.handle_event_jingle_connected], 'JINGLE_DISCONNECTED': [self.handle_event_jingle_disconnected],

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2010