Commits

commits@gajim.org

17632 discussions

gajim: don't redraw roster line when it's not necessary
by Yann Leboulanger 16 Jul '13

16 Jul '13

changeset 3a8a6f07b98e in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3a8a6f07b98e description: don't redraw roster line when it's not necessary diffstat: src/gui_interface.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (33 lines): diff -r 0b2cacade877 -r 3a8a6f07b98e src/gui_interface.py --- a/src/gui_interface.py Mon Jul 15 16:03:07 2013 +0200 +++ b/src/gui_interface.py Tue Jul 16 18:03:58 2013 +0200 @@ -788,21 +788,24 @@ # another of our instance removed a contact. Remove it here too self.roster.remove_contact(obj.jid, account, backend=True) return + update = False if contacts[0].sub != obj.sub or contacts[0].ask != obj.ask\ or old_groups != obj.groups: # c.get_shown_groups() has changed. Reflect that in # roster_window self.roster.remove_contact(obj.jid, account, force=True) + update = True for contact in contacts: contact.name = obj.nickname or '' contact.sub = obj.sub contact.ask = obj.ask contact.groups = obj.groups or [] - self.roster.add_contact(obj.jid, account) - # Refilter and update old groups - for group in old_groups: - self.roster.draw_group(group, account) - self.roster.draw_contact(obj.jid, account) + if update: + self.roster.add_contact(obj.jid, account) + # Refilter and update old groups + for group in old_groups: + self.roster.draw_group(group, account) + self.roster.draw_contact(obj.jid, account) if obj.jid in self.instances[account]['sub_request'] and obj.sub in ( 'from', 'both'): self.instances[account]['sub_request'][obj.jid].window.destroy()

1 0

gajim: fix using FT proxies. Fixes #7382
by Yann Leboulanger 15 Jul '13

15 Jul '13

changeset 0b2cacade877 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0b2cacade877 description: fix using FT proxies. Fixes #7382 diffstat: src/common/protocol/bytestream.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3462ac20155e -r 0b2cacade877 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Jul 15 15:34:14 2013 +0200 +++ b/src/common/protocol/bytestream.py Mon Jul 15 16:03:07 2013 +0200 @@ -726,7 +726,7 @@ port=int(proxy['port']), fingerprint=None, connected=False, file_props=file_props) sender.streamhost = proxy - gajim.socks5queue.add_sockobj(self.name, sender, 'sender') + gajim.socks5queue.add_sockobj(self.name, sender) proxy['idx'] = sender.queue_idx gajim.socks5queue.on_success[file_props.sid] = self._proxy_auth_ok raise nbxmpp.NodeProcessed

1 0

gajim: add some title to windows. Fixes #7383
by Yann Leboulanger 15 Jul '13

15 Jul '13

changeset 3462ac20155e in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3462ac20155e description: add some title to windows. Fixes #7383 diffstat: data/gui/manage_sounds_window.ui | 1 + src/dialogs.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diffs (22 lines): diff -r 4232a8dbc4eb -r 3462ac20155e data/gui/manage_sounds_window.ui --- a/data/gui/manage_sounds_window.ui Mon Jul 15 15:13:39 2013 +0200 +++ b/data/gui/manage_sounds_window.ui Mon Jul 15 15:34:14 2013 +0200 @@ -6,6 +6,7 @@ <property name="width_request">400</property> <property name="height_request">350</property> <property name="border_width">6</property> + <property name="title" translatable="yes">Manage sounds</property> <property name="type_hint">dialog</property> <signal name="delete_event" handler="on_manage_sounds_window_delete_event"/> <child> diff -r 4232a8dbc4eb -r 3462ac20155e src/dialogs.py --- a/src/dialogs.py Mon Jul 15 15:13:39 2013 +0200 +++ b/src/dialogs.py Mon Jul 15 15:34:14 2013 +0200 @@ -5273,6 +5273,7 @@ class CertificatDialog(InformationDialog): def __init__(self, parent, account, cert): + self.set_title(_('Certificate for account %s') % account) issuer = cert.get_issuer() subject = cert.get_subject() InformationDialog.__init__(self,

1 0

gajim: distinguish console-printed strings in translation files....
by Yann Leboulanger 15 Jul '13

15 Jul '13

changeset 4232a8dbc4eb in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4232a8dbc4eb description: distinguish console-printed strings in translation files. Fixes #7267 diffstat: src/gajim-remote.py | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diffs (163 lines): diff -r 0b2b1fa5ae4a -r 4232a8dbc4eb src/gajim-remote.py --- a/src/gajim-remote.py Mon Jul 15 15:11:51 2013 +0400 +++ b/src/gajim-remote.py Mon Jul 15 15:13:39 2013 +0200 @@ -93,7 +93,7 @@ _('Prints a list of all contacts in the roster. Each contact ' 'appears on a separate line'), [ - (_('account'), _('show only contacts of the given account'), + (_('?CLI:account'), _('show only contacts of the given account'), False) ] @@ -106,9 +106,9 @@ _('Changes the status of account or accounts'), [ #offline, online, chat, away, xa, dnd, invisible should not be translated - (_('status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account\'s previous status'), False), - (_('message'), _('status message'), False), - (_('account'), _('change status of account "account". ' + (_('?CLI:status'), _('one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account\'s previous status'), False), + (_('?CLI:message'), _('status message'), False), + (_('?CLI:account'), _('change status of account "account". ' 'If not specified, try to change status of all accounts that have ' '"sync with global status" option set'), False) ] @@ -116,9 +116,9 @@ 'set_priority': [ _('Changes the priority of account or accounts'), [ - (_('priority'), _('priority you want to give to the account'), + (_('?CLI:priority'), _('priority you want to give to the account'), True), - (_('account'), _('change the priority of the given account. ' + (_('?CLI:account'), _('change the priority of the given account. ' 'If not specified, change status of all accounts that have' ' "sync with global status" option set'), False) ] @@ -128,9 +128,9 @@ [ ('jid', _('JID of the contact that you want to chat with'), True), - (_('account'), _('if specified, contact is taken from the ' + (_('?CLI:account'), _('if specified, contact is taken from the ' 'contact list of this account'), False), - (_('message'), + (_('?CLI:message'), _('message content. The account must be specified or ""'), False) ] @@ -141,10 +141,10 @@ 'without \'OpenPGP key\', just set \'OpenPGP key\' to \'\'.'), [ ('jid', _('JID of the contact that will receive the message'), True), - (_('message'), _('message contents'), True), + (_('?CLI:message'), _('message contents'), True), (_('pgp key'), _('if specified, the message will be encrypted ' 'using this public key'), False), - (_('account'), _('if specified, the message will be sent ' + (_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -155,10 +155,10 @@ [ ('jid', _('JID of the contact that will receive the message'), True), (_('subject'), _('message subject'), True), - (_('message'), _('message contents'), True), + (_('?CLI:message'), _('message contents'), True), (_('pgp key'), _('if specified, the message will be encrypted ' 'using this public key'), False), - (_('account'), _('if specified, the message will be sent ' + (_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -166,8 +166,8 @@ _('Sends new message to a groupchat you\'ve joined.'), [ ('room_jid', _('JID of the room that will receive the message'), True), - (_('message'), _('message contents'), True), - (_('account'), _('if specified, the message will be sent ' + (_('?CLI:message'), _('message contents'), True), + (_('?CLI:account'), _('if specified, the message will be sent ' 'using this account'), False), ] ], @@ -188,7 +188,7 @@ [ (_('file'), _('File path'), True), ('jid', _('JID of the contact'), True), - (_('account'), _('if specified, file will be sent using this ' + (_('?CLI:account'), _('if specified, file will be sent using this ' 'account'), False) ] ], @@ -218,7 +218,7 @@ _('Removes contact from roster'), [ ('jid', _('JID of the contact'), True), - (_('account'), _('if specified, contact is taken from the ' + (_('?CLI:account'), _('if specified, contact is taken from the ' 'contact list of this account'), False) ] @@ -227,21 +227,21 @@ _('Adds contact to roster'), [ (_('jid'), _('JID of the contact'), True), - (_('account'), _('Adds new contact to this account'), False) + (_('?CLI:account'), _('Adds new contact to this account'), False) ] ], 'get_status': [ _('Returns current status (the global one unless account is specified)'), [ - (_('account'), '', False) + (_('?CLI:account'), '', False) ] ], 'get_status_message': [ _('Returns current status message (the global one unless account is specified)'), [ - (_('account'), '', False) + (_('?CLI:account'), '', False) ] ], @@ -252,7 +252,7 @@ 'start_chat': [ _('Opens \'Start Chat\' dialog'), [ - (_('account'), _('Starts chat, using this account'), True) + (_('?CLI:account'), _('Starts chat, using this account'), True) ] ], 'send_xml': [ @@ -277,18 +277,18 @@ _('Handle a xmpp:/ uri'), [ (_('uri'), _('URI to handle'), True), - (_('account'), _('Account in which you want to handle it'), + (_('?CLI:account'), _('Account in which you want to handle it'), False), - (_('message'), _('Message content'), False) + (_('?CLI:message'), _('Message content'), False) ] ], 'join_room': [ _('Join a MUC room'), [ - (_('room'), _('Room JID'), True), - (_('nick'), _('Nickname to use'), False), - (_('password'), _('Password to enter the room'), False), - (_('account'), _('Account from which you want to enter the ' + (_('?CLI:room'), _('Room JID'), True), + (_('?CLI:nick'), _('Nickname to use'), False), + (_('?CLI:password'), _('Password to enter the room'), False), + (_('?CLI:account'), _('Account from which you want to enter the ' 'room'), False) ] ],

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 15 Jul '13

15 Jul '13

changeset 0b2b1fa5ae4a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0b2b1fa5ae4a description: [Darlan] Update Hebrew translation diffstat: po/he.po | 3675 +++++++++++++++++++++++++++++++------------------------------ 1 файлов изменено, 1861 вставок(+), 1814 удалений(-) различия (урезанные с 8625 до 300 строк): diff -r 1fd4cf83a7df -r 0b2b1fa5ae4a po/he.po --- a/po/he.po Mon Jul 08 15:46:01 2013 +0200 +++ b/po/he.po Mon Jul 15 15:11:51 2013 +0400 @@ -1,15 +1,16 @@ # Hebrew translations for gajim -# Copyright (C) Copyright © 2003-2012 Gajim Team +# Copyright (C) Copyright © 2003-2013 Gajim Team # This file is distributed under the same license as the gajim package. -# Darlan <xmpp:israeli@failar.nu>, 2012. +# Darlan <xmpp:israeli@failar.nu>, 2012 - 2013. +# Isratine Citizen <genghiskhan(a)gmx.ca>, 2012 - 2013. # msgid "" msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-15 14:27+0400\n" -"PO-Revision-Date: 2013-06-26 23:08+0200\n" -"Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" +"POT-Creation-Date: 2013-07-15 12:02+0400\n" +"PO-Revision-Date: 2013-07-15 13:47+0200\n" +"Last-Translator: Darlan <xmpp:israeli@failar.nu>\n" "Language-Team: Rahut\n" "Language: he\n" "MIME-Version: 1.0\n" @@ -76,7 +77,7 @@ # בו אני רוצה לעשות #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "I already have an account I want to _use" -msgstr "כבר קיים ברשותי _חשבון שברצוני לעשות שימוש בו" +msgstr "כבר קיים ברשותי _חשבון אשר ברצוני לעשות שימוש בו" # I want to _register a new account # אני רוצה _לרשום חשבון חדש @@ -88,7 +89,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "אנא בחר באחת מן האפשרויות מטה:" +msgstr "אנא בחר באחת מתוך האפשרויות מטה:" # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 @@ -120,7 +121,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:11 #: ../data/gui/accounts_window.ui.h:23 msgid "_Jabber ID:" -msgstr "מזהה ‫_Jabber:" +msgstr "מזהה _Jabber:" #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Anon_ymous authentication" @@ -185,7 +186,7 @@ # מיידית לאחר ש #: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" -msgstr "התחבר מיידית כאשר אני אלחץ על סיום" +msgstr "התחבר מידית כאשר אני אלחץ על סיום" #: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Set my profile when I connect" @@ -197,13 +198,13 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1254 ../src/config.py:1268 ../src/config.py:1273 -#: ../src/config.py:1321 ../src/config.py:1424 ../src/config.py:1739 -#: ../src/config.py:1744 ../src/config.py:2320 ../src/config.py:2399 -#: ../src/config.py:2412 ../src/config.py:3698 ../src/config.py:3773 +#: ../src/config.py:1248 ../src/config.py:1262 ../src/config.py:1267 +#: ../src/config.py:1315 ../src/config.py:1418 ../src/config.py:1733 +#: ../src/config.py:1738 ../src/config.py:2314 ../src/config.py:2393 +#: ../src/config.py:2406 ../src/config.py:3682 ../src/config.py:3757 #: ../src/dialogs.py:313 ../src/dialogs.py:315 ../src/dialogs.py:521 -#: ../src/dialogs.py:534 ../src/roster_window.py:3214 -#: ../src/roster_window.py:3220 ../src/roster_window.py:3225 +#: ../src/dialogs.py:534 ../src/roster_window.py:3141 +#: ../src/roster_window.py:3147 ../src/roster_window.py:3152 msgid "None" msgstr "ללא" @@ -212,19 +213,19 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3426 -#: ../src/dialogs.py:3472 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3440 +#: ../src/dialogs.py:3486 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3430 -#: ../src/dialogs.py:3527 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3444 +#: ../src/dialogs.py:3541 msgid "Delete" msgstr "מחיקה" #. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5844 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5786 msgid "Re_name" msgstr "_שנה שם" @@ -292,7 +293,7 @@ "server when two or more clients are connected using the same account; The " "client with the highest priority gets the events" msgstr "" -"עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים מן שרת jabber כאשר שני " +"עדיפת משמשת את Jabber כדי לקבוע מי מקבל את האירועים מתוך שרת jabber כאשר שני " "לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר " "יקבל את האירועים" @@ -340,7 +341,7 @@ msgstr "התחבר בעת ה_פעלת Gajim" # BUG: a dot at the end -# כאשר ישוגר +# כאשר משוגר #: ../data/gui/accounts_window.ui.h:30 msgid "" "If checked, Gajim, when launched, will automatically connect to jabber using " @@ -391,18 +392,19 @@ "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" -"במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP) שלך, " -"מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." - -# אכן, זוהי קבוצה כללית. אנא לא להפוך זאת באופן שרירותי ל"רישום" כללי או לכל מילה אחר שלא קשורה אל התוכנית +"במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP; ‏" +"Internet Protocol) שלך, מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים " +"גדולים יותר לעבוד." + +# אכן, זוהי קבוצה כללית. אנא לא להפוך זאת באופן שרירותי ל"רישום" כללי או לכל מילה אחר אשר לא קשורה אל התוכנית #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:46 +#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:113 ../src/dialogs.py:125 -#: ../src/roster_window.py:3156 ../src/roster_window.py:4284 -#: ../src/roster_window.py:5894 +#: ../src/roster_window.py:3083 ../src/roster_window.py:4213 +#: ../src/roster_window.py:5836 msgid "General" msgstr "כללית" @@ -410,7 +412,7 @@ msgid "_use HTTP__PROXY environment variable" msgstr "השתמש במשת_ני סביבת HTTP__PROXY" -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:137 +#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:133 msgid "_Manage..." msgstr " ניה_ל... " @@ -420,7 +422,7 @@ #: ../data/gui/accounts_window.ui.h:41 msgid "_Warn before using an insecure connection" -msgstr "ה_זהר אותי לפני שימוש בחיבור לא מאובטח" +msgstr "ה_זהר אותי טרם שימוש בחיבור לא מאובטח" #: ../data/gui/accounts_window.ui.h:42 msgid "" @@ -458,7 +460,7 @@ msgid "_Port: " msgstr "_פורט: " -#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:141 +#: ../data/gui/accounts_window.ui.h:48 ../data/gui/preferences_window.ui.h:137 msgid "Miscellaneous" msgstr "שונות" @@ -466,8 +468,8 @@ msgid "Connection" msgstr "חיבור" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1835 -#: ../src/config.py:2413 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1829 +#: ../src/config.py:2407 msgid "No key selected" msgstr "לא נבחר מפתח" @@ -483,12 +485,11 @@ #: ../data/gui/accounts_window.ui.h:53 msgid "If checked, Gajim will get the password from a GPG agent like seahorse" msgstr "" -"במידה ואפשרות זו מסומנת, Gajim יאחזר את הסיסמה מן סוכן GPG כגון seahorse" - -# OpenPGP +"במידה ואפשרות זו מסומנת, Gajim יאחזר את הסיסמה מתוך סוכן GPG כגון seahorse" + #: ../data/gui/accounts_window.ui.h:54 msgid "OpenPGP" -msgstr "‫OpenPGP" +msgstr "‏OpenPGP" #: ../data/gui/accounts_window.ui.h:55 msgid "_Edit Personal Information..." @@ -527,7 +528,7 @@ msgstr "" "במידה והפורט המשתמט שמצוי בשימוש עבור הודעות נכנסות איננו מתאים עבור התקנתך " "באפשרותך לבחור פורט אחר כאן.\n" -"ייתכן שיהיה ברצונך לשקול לשנות הגדרות חומת־אש אפשריות." +"ייתכן כי יהיה ברצונך לשקול לשנות הגדרות חומת אש אפשריות." #: ../data/gui/accounts_window.ui.h:64 #: ../data/gui/zeroconf_information_window.ui.h:10 @@ -549,14 +550,14 @@ msgstr "דוא״ל:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1862 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1856 #: ../src/dialogs.py:839 msgid "Jabber ID:" -msgstr "‫מזהה Jabber:" +msgstr "מזהה Jabber:" #: ../data/gui/accounts_window.ui.h:68 msgid "Mer_ge accounts" -msgstr "מיזוג _חשבונות" +msgstr "מזג _חשבונות" #: ../data/gui/add_new_contact_window.ui.h:1 msgid "Add New Contact" @@ -617,14 +618,14 @@ "to add a contact from this protocol." msgstr "" "עליך להתחבר אל מוביל בכדי שתעמוד לרשותך\n" -"היכולת להוסיף איש קשר מן פרוטוקול זה." - -#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1363 +"האפשרות להוסיף איש קשר מתוך פרוטוקול זה." + +#: ../data/gui/add_new_contact_window.ui.h:16 ../src/common/helpers.py:1366 msgid "I would like to add you to my contact list." msgstr "ברצוני להוסיפך אל רשימת הקשר שלי." #. displaying the window -#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:102 +#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104 msgid "Ad-hoc Commands - Gajim" msgstr "פקודות ייעודיות (‫Ad-hoc) - ‫Gajim" @@ -656,7 +657,7 @@ #: ../data/gui/adhoc_commands_window.ui.h:8 msgid "An error has occurred:" -msgstr "ארעה שגיאה:" +msgstr "אירעה שגיאה:" #: ../data/gui/adhoc_commands_window.ui.h:9 msgid "Error description..." @@ -808,8 +809,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5863 -#: ../src/roster_window.py:5990 ../src/roster_window.py:6123 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5805 +#: ../src/roster_window.py:5932 ../src/roster_window.py:6065 msgid "_Unblock" msgstr "_ביטול חסימה" @@ -867,10 +868,10 @@ msgid "Type your new status message" msgstr "הקלד הודעת מצב חדשה" -# Changed: Location to Destination +# אתר #: ../data/gui/chat_context_menu.ui.h:1 msgid "_Copy Link Location" -msgstr "ה_עתק כתובת יעד" +msgstr "ה_עתק כתובת מיקום" #: ../data/gui/chat_context_menu.ui.h:2 msgid "_Open Link in Browser" @@ -899,106 +900,65 @@ msgid "_Add to Roster..." msgstr "הו_ספה אל רשימה..." -#: ../data/gui/chat_control.ui.h:1 ../data/gui/groupchat_control.ui.h:1 -msgid "Show a list of emoticons (Alt+M)" -msgstr "הצגת רשימת רגשונים (Alt+M)" - -#: ../data/gui/chat_control.ui.h:2 ../data/gui/groupchat_control.ui.h:2 -msgid "Show a list of formattings" -msgstr "הצגת רשימת עיצובים" - -#: ../data/gui/chat_control.ui.h:3 -msgid "Add this contact to roster (Ctrl+D)" -msgstr "הוספת איש קשר זה אל רשימה (Ctrl+D)" -

1 0

gajim: remove debug print
by Yann Leboulanger 08 Jul '13

08 Jul '13

changeset 1fd4cf83a7df in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1fd4cf83a7df description: remove debug print diffstat: src/disco.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 618626c99460 -r 1fd4cf83a7df src/disco.py --- a/src/disco.py Mon Jul 08 14:51:50 2013 +0200 +++ b/src/disco.py Mon Jul 08 15:46:01 2013 +0200 @@ -1118,7 +1118,6 @@ if self._find_item(jid_, node_): continue self._total_items += 1 - print 'adding item #', self._total_items self._add_item(jid_, node_, node, item, force) if (self._total_items % 10) == 0: self.window.services_treeview.thaw_child_notify()

1 0

gajim: load disco items slowly to now freeze with long list.
by Yann Leboulanger 08 Jul '13

08 Jul '13

changeset 618626c99460 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=618626c99460 description: load disco items slowly to now freeze with long list. diffstat: src/disco.py | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-) diffs (43 lines): diff -r d24235f5c3e6 -r 618626c99460 src/disco.py --- a/src/disco.py Sun Jul 07 14:22:37 2013 +0200 +++ b/src/disco.py Mon Jul 08 14:51:50 2013 +0200 @@ -1106,16 +1106,29 @@ _('This service does not contain any items to browse.')) return # We got a list of items - self.window.services_treeview.set_model(None) - for item in items: - jid_ = item['jid'] - node_ = item.get('node', '') - # If such an item is already here: don't add it - if self._find_item(jid_, node_): - continue - self._total_items += 1 - self._add_item(jid_, node_, node, item, force) - self.window.services_treeview.set_model(self.model) + def fill_partial_rows(items): + '''Generator to fill the listmodel of a treeview progressively.''' + self.window.services_treeview.freeze_child_notify() + for item in items: + if self.window.dying: + yield False + jid_ = item['jid'] + node_ = item.get('node', '') + # If such an item is already here: don't add it + if self._find_item(jid_, node_): + continue + self._total_items += 1 + print 'adding item #', self._total_items + self._add_item(jid_, node_, node, item, force) + if (self._total_items % 10) == 0: + self.window.services_treeview.thaw_child_notify() + yield True + self.window.services_treeview.freeze_child_notify() + self.window.services_treeview.thaw_child_notify() + #stop idle_add() + yield False + loader = fill_partial_rows(items) + gobject.idle_add(loader.next) def _agent_info(self, jid, node, identities, features, data): """

1 0

gajim: fix connection to FT proxies. Fixes #7349
by Yann Leboulanger 07 Jul '13

07 Jul '13

changeset d24235f5c3e6 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d24235f5c3e6 description: fix connection to FT proxies. Fixes #7349 diffstat: src/common/socks5.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 05980f31fed8 -r d24235f5c3e6 src/common/socks5.py --- a/src/common/socks5.py Sat Jul 06 21:27:30 2013 +0200 +++ b/src/common/socks5.py Sun Jul 07 14:22:37 2013 +0200 @@ -871,6 +871,10 @@ """ Get sha of sid + Initiator jid + Target jid """ + if self.file_props.is_a_proxy: + return hashlib.sha1('%s%s%s' % (self.sid, + self.file_props.proxy_sender, self.file_props.proxy_receiver) + ).hexdigest() return hashlib.sha1('%s%s%s' % (self.sid, self.initiator, self.target)).hexdigest()

1 0

gajim: move incoming and outgoing video stream in chat window wh...
by Yann Leboulanger 06 Jul '13

06 Jul '13

changeset 05980f31fed8 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=05980f31fed8 description: move incoming and outgoing video stream in chat window when we receive the video call. diffstat: src/dialogs.py | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diffs (27 lines): diff -r 63b70694f7a6 -r 05980f31fed8 src/dialogs.py --- a/src/dialogs.py Fri Jul 05 21:10:16 2013 +0200 +++ b/src/dialogs.py Sat Jul 06 21:27:30 2013 +0200 @@ -5238,6 +5238,23 @@ if audio and not audio.negotiated: ctrl.set_audio_state('connecting', self.sid) if video and not video.negotiated: + video_hbox = ctrl.xml.get_object('video_hbox') + video_hbox.set_no_show_all(False) + if gajim.config.get('video_see_self'): + fixed = ctrl.xml.get_object('outgoing_fixed') + fixed.set_no_show_all(False) + video_hbox.show_all() + in_xid = ctrl.xml.get_object('incoming_drawingarea').window.xid + out_xid = ctrl.xml.get_object('outgoing_drawingarea').window.xid + content = session.get_content('video') + # move outgoing stream to chat window + if gajim.config.get('video_see_self'): + b = content.pipeline.get_by_name('bin2') + c = b.get_by_name('autovideosink0') + d = c.get_by_name('autovideosink0-actual-sink-xvimage') + d.set_xwindow_id(out_xid) + content.out_xid = out_xid + content.in_xid = in_xid ctrl.set_video_state('connecting', self.sid) # Now, accept the content/sessions. # This should be done after the chat control is running

1 0

gajim: fix IPv6 issues under window 7 for file transfer. Fixes #...
by Yann Leboulanger 05 Jul '13

05 Jul '13

changeset 63b70694f7a6 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=63b70694f7a6 description: fix IPv6 issues under window 7 for file transfer. Fixes #4452, #7240 diffstat: src/common/proxy65_manager.py | 1 + src/common/socks5.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diffs (27 lines): diff -r ef68967a6cd8 -r 63b70694f7a6 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Fri Jul 05 17:02:07 2013 +0200 +++ b/src/common/proxy65_manager.py Fri Jul 05 21:10:16 2013 +0200 @@ -166,6 +166,7 @@ self.state = S_FINISHED def _on_connect_failure(self): + print 'connection failed: ' + self.host self.state = S_FINISHED self.host = None self.port = 0 diff -r ef68967a6cd8 -r 63b70694f7a6 src/common/socks5.py --- a/src/common/socks5.py Fri Jul 05 17:02:07 2013 +0200 +++ b/src/common/socks5.py Fri Jul 05 21:10:16 2013 +0200 @@ -1365,9 +1365,10 @@ # Doesn't work under windows XP if os.name == 'nt': ver = os.sys.getwindowsversion() - if (ver[3], ver[0], ver[1]) == (2, 6, 0): + if (ver[3], ver[0]) == (2, 6): # Win Vista + + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... - self._serv.setsockopt(socket.IPPROTO_IPV6, 27, 1) + self._serv.setsockopt(41, 27, 0) # will fail when port as busy, or we don't have rights to bind try: self._serv.bind(ai[4])

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