Commits

commits@gajim.org

17632 discussions

gajim: [x11term] prevent traceback
by Yann Leboulanger 16 Aug '13

16 Aug '13

changeset 9d80b8b2ee72 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9d80b8b2ee72 description: [x11term] prevent traceback diffstat: src/conversation_textview.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r cf8e173ecf52 -r 9d80b8b2ee72 src/conversation_textview.py --- a/src/conversation_textview.py Fri Aug 16 10:14:37 2013 +0400 +++ b/src/conversation_textview.py Fri Aug 16 09:21:32 2013 +0200 @@ -353,6 +353,7 @@ # use it for hr too self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF self.smooth_id = None + self.just_cleared = False def del_handlers(self): for i in self.handlers.keys():

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 16 Aug '13

16 Aug '13

changeset cf8e173ecf52 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cf8e173ecf52 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 860 ++++++++++++++++++++++++++++++++------------------------------ 1 файлов изменено, 437 вставок(+), 423 удалений(-) различия (урезанные с 2522 до 300 строк): diff -r 5c03774b184e -r cf8e173ecf52 po/he.po --- a/po/he.po Fri Aug 16 10:09:41 2013 +0400 +++ b/po/he.po Fri Aug 16 10:14:37 2013 +0400 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-12 15:40+0300\n" -"PO-Revision-Date: 2013-08-12 16:09+0200\n" +"POT-Creation-Date: 2013-08-16 02:05+0000\n" +"PO-Revision-Date: 2013-08-16 08:26+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -185,9 +185,9 @@ #: ../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: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/config.py:1315 ../src/config.py:1418 ../src/config.py:1737 +#: ../src/config.py:1742 ../src/config.py:2334 ../src/config.py:2415 +#: ../src/config.py:2430 ../src/config.py:3711 ../src/config.py:3786 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 #: ../src/dialogs.py:536 ../src/roster_window.py:3149 #: ../src/roster_window.py:3155 ../src/roster_window.py:3160 @@ -199,14 +199,14 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3509 -#: ../src/dialogs.py:3555 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3524 +#: ../src/dialogs.py:3570 msgid "Add" msgstr "הוסף" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3513 -#: ../src/dialogs.py:3610 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3528 +#: ../src/dialogs.py:3625 msgid "Delete" msgstr "מחק" @@ -444,8 +444,8 @@ msgid "Connection" msgstr "חיבור" -#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1829 -#: ../src/config.py:2407 +#: ../data/gui/accounts_window.ui.h:50 ../src/config.py:1835 +#: ../src/config.py:2431 msgid "No key selected" msgstr "לא נבחר מפתח" @@ -522,7 +522,7 @@ msgstr "דוא״ל:" #: ../data/gui/accounts_window.ui.h:67 -#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1856 +#: ../data/gui/zeroconf_information_window.ui.h:7 ../src/config.py:1862 #: ../src/dialogs.py:841 msgid "Jabber ID:" msgstr "מזהה Jabber:" @@ -614,7 +614,7 @@ msgstr "בדוק פעם נוספת" #: ../data/gui/adhoc_commands_window.ui.h:5 -msgid "Please wait while the command is sending..." +msgid "Please wait while the command is being sent..." msgstr "אנא המתן בזמן שהפקודה נשלחת..." #: ../data/gui/adhoc_commands_window.ui.h:6 @@ -1047,16 +1047,16 @@ msgstr "ה_רשמה" #: ../data/gui/contact_context_menu.ui.h:17 -msgid "_Allow him/her to see my status" -msgstr "_התר לאיש קשר זה לראות את המצב שלי" +msgid "_Allow contact to see my status" +msgstr "הת_ר לאיש קשר לראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:18 -msgid "A_sk to see his/her status" -msgstr "_בקש להציג את המצב של איש קשר זה" +msgid "A_sk to see contact status" +msgstr "_בקש להציג מצב איש קשר" #: ../data/gui/contact_context_menu.ui.h:19 -msgid "_Forbid him/her to see my status" -msgstr "_מנע מאיש קשר זה מלראות את המצב שלי" +msgid "_Forbid contact to see my status" +msgstr "_מנע מאיש קשר מלראות את המצב שלי" #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5817 @@ -1161,7 +1161,7 @@ msgstr "ה_שהה" #: ../data/gui/filetransfers.ui.h:12 -msgid "Cancels the selected file transfer and removes incomplete file" +msgid "Cancels the selected file transfer and removes incomplete files" msgstr "ביטול העברת הקובץ הנבחר והסרת קבצים לא שלמים" #: ../data/gui/filetransfers.ui.h:13 @@ -1180,7 +1180,7 @@ msgid "_Continue" msgstr "ה_משך" -#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3343 +#: ../data/gui/filetransfers.ui.h:17 ../src/chat_control.py:3345 #: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" msgstr "_פתח תיקיה מכילה" @@ -1294,7 +1294,7 @@ msgid "_Request Voice" msgstr "_בקש ביטוי" -#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1839 +#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1843 msgid "_Bookmark" msgstr "_סמן" @@ -1440,7 +1440,7 @@ msgstr "חפש בתוך _תאריך" #: ../data/gui/history_window.ui.h:7 -msgid "searching only in the selected day " +msgid "Searching only in the selected day " msgstr "חיפוש בתוך היום הנבחר בלבד" #: ../data/gui/history_window.ui.h:8 @@ -1512,7 +1512,7 @@ msgid "require" msgstr "דרוש" -#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2401 +#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2416 msgid "Join Group Chat" msgstr "הצטרף אל שיחת קבוצה" @@ -1543,7 +1543,7 @@ msgid "_Bookmark this room" msgstr "_סמן את חדר זה" -#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1846 +#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1852 msgid "Server:" msgstr "שרת:" @@ -1551,8 +1551,8 @@ msgid "Bro_wse Rooms" msgstr "_עיון ברשימת חדרים" -#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3378 -#: ../src/disco.py:1392 ../src/disco.py:1843 +#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:3380 +#: ../src/disco.py:1396 ../src/disco.py:1847 msgid "_Join" msgstr "_כנס" @@ -1968,7 +1968,7 @@ # BUG: a dot at the end #: ../data/gui/preferences_window.ui.h:50 msgid "" -"If checked, Gajim will also include information about the sender of the new " +"If checked, Gajim will also include information about the sender of new " "emails" msgstr "" "במידה ואפשרות זו מסומנת, Gajim יכיל גם מידע אודות הממען של ההודעות " @@ -2150,7 +2150,7 @@ #: ../data/gui/preferences_window.ui.h:88 msgid "" -"If checked, Gajim will use protocol-specific status icons. (eg. A contact " +"If checked, Gajim will use protocol-specific status icons. (e.g. A contact " "from MSN will have the equivalent msn icon for status online, away, busy, " "etc...)" msgstr "" @@ -2380,7 +2380,7 @@ msgid "Advanced" msgstr "מתקדם" -#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4106 +#: ../data/gui/privacy_list_window.ui.h:1 ../src/dialogs.py:4121 msgid "Privacy List" msgstr "רשימת פרטיות" @@ -2673,7 +2673,7 @@ msgid "Add _Contact..." msgstr "הוספת _איש קשר..." -#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1554 +#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1558 msgid "_Edit" msgstr "ע_ריכה" @@ -2760,7 +2760,7 @@ msgid "_Information" msgstr "_מידע" -#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1404 +#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1408 msgid "_Search" msgstr "_חפש" @@ -3004,6 +3004,10 @@ msgid "A GTK+ Jabber client" msgstr "לקוח ג׳אבּר ‭GTK+‬" +#: ../data/gajim.desktop.in.in.h:4 +msgid "chat;messaging;im;jabber;xmpp;bonjour;voip" +msgstr "" + #: ../src/adhoc_commands.py:325 msgid "Cancel confirmation" msgstr "אימות ביטול" @@ -3157,8 +3161,8 @@ #. Add to roster #: ../src/chat_control.py:1729 ../src/common/contacts.py:152 #: ../src/common/contacts.py:273 ../src/common/helpers.py:67 -#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2295 -#: ../src/dialogs.py:2324 ../src/dialogs.py:3536 ../src/gui_interface.py:485 +#: ../src/common/helpers.py:261 ../src/dialogs.py:1105 ../src/dialogs.py:2310 +#: ../src/dialogs.py:2339 ../src/dialogs.py:3551 ../src/gui_interface.py:485 #: ../src/gui_menu_builder.py:266 ../src/gui_menu_builder.py:421 #: ../src/roster_window.py:771 ../src/roster_window.py:1734 #: ../src/roster_window.py:1736 ../src/roster_window.py:2084 @@ -3169,12 +3173,12 @@ #. change tooltip text for audio and video buttons if python-farstream is #. not installed #: ../src/chat_control.py:1754 -#: ../src/command_system/implementation/standard.py:214 +#: ../src/command_system/implementation/standard.py:215 msgid "Toggle audio session" msgstr "הפעלת סשן שמע" #: ../src/chat_control.py:1755 -#: ../src/command_system/implementation/standard.py:224 +#: ../src/command_system/implementation/standard.py:225 msgid "Toggle video session" msgstr "הפעלת סשן וידאו" @@ -3210,7 +3214,7 @@ msgstr "%(nickname)s מתוך שיחת קבוצה %(room_name)s" #. No key assigned nor a key is used by remote contact -#: ../src/chat_control.py:2223 ../src/dialogs.py:5177 +#: ../src/chat_control.py:2223 ../src/dialogs.py:5194 msgid "No OpenPGP key assigned" msgstr "לא הוקצה מפתח OpenPGP" @@ -3322,22 +3326,22 @@ msgid "You just received a new message from \"%s\"" msgstr "זה עתה קיבלת הודעה חדשה מן \"%s\"" -#: ../src/chat_control.py:2792 +#: ../src/chat_control.py:2793 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." msgstr "" "אם כרטיסייה זו תיסגר ובמידה ורשימת היסטוריה מנוטרלת אצלך. הודעה זו תאבד." -#: ../src/chat_control.py:2959 ../src/common/connection.py:523 +#: ../src/chat_control.py:2961 ../src/common/connection.py:523 #: ../src/common/connection_handlers.py:1145 #: ../src/common/connection_handlers.py:1269 #: ../src/common/connection_handlers_events.py:913 -#: ../src/common/logger.py:1160 ../src/gajim.py:216 ../src/session.py:98 +#: ../src/common/logger.py:1161 ../src/gajim.py:216 ../src/session.py:98 msgid "Database Error" msgstr "שגיאת מסד נתונים" -#: ../src/chat_control.py:2960 +#: ../src/chat_control.py:2962 #, python-format msgid "" "The database file (%s) cannot be read. Try to repair it or remove it (all " @@ -3346,7 +3350,7 @@ "קובץ מסד הנתונים (%s) לא ניתן לקריאה. נסה לתקנו או להסירו (כל ההיסטוריה " "תאבד)." -#: ../src/chat_control.py:3197 ../src/gui_interface.py:1161 +#: ../src/chat_control.py:3199 ../src/gui_interface.py:1161 #, python-format msgid "" "Unable to decrypt message from %s\n" @@ -3355,52 +3359,52 @@ "אין אפשרות לפענח הודעה מאת %s\n" "ייתכן כי הודעה זו נפגמה." -#: ../src/chat_control.py:3254 +#: ../src/chat_control.py:3256 #, python-format msgid "%(name)s is now %(status)s" msgstr "%(name)s מצוי/ה כעת במצב %(status)s"

1 0

gajim: typo
by Denis Fomin 16 Aug '13

16 Aug '13

changeset 5c03774b184e in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5c03774b184e description: typo diffstat: src/common/config.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r 31a75c4b7a91 -r 5c03774b184e src/common/config.py --- a/src/common/config.py Fri Aug 16 01:37:02 2013 +0400 +++ b/src/common/config.py Fri Aug 16 10:09:41 2013 +0400 @@ -412,7 +412,7 @@ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], - 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDsfor which we want to re-open a chat window on next startup.')], + 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which we want to re-open a chat window on next startup.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ],

1 0

gajim: update version number
by Denis Fomin 15 Aug '13

15 Aug '13

changeset 31a75c4b7a91 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=31a75c4b7a91 description: update version number diffstat: src/common/defs.py | 2 +- 1 файлов изменено, 1 вставок(+), 1 удалений(-) различия (12 строк): diff -r bb43630ee1aa -r 31a75c4b7a91 src/common/defs.py --- a/src/common/defs.py Thu Aug 15 23:21:24 2013 +0200 +++ b/src/common/defs.py Fri Aug 16 01:37:02 2013 +0400 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15.4.0' +version = '0.16' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: [Tanguy Ortolo] add _Keywords field to gajim.desktop file
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset bb43630ee1aa in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bb43630ee1aa description: [Tanguy Ortolo] add _Keywords field to gajim.desktop file diffstat: data/gajim.desktop.in.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 8f0b3195b73a -r bb43630ee1aa data/gajim.desktop.in.in --- a/data/gajim.desktop.in.in Thu Aug 15 23:19:23 2013 +0200 +++ b/data/gajim.desktop.in.in Thu Aug 15 23:21:24 2013 +0200 @@ -3,6 +3,7 @@ _Name=Gajim _GenericName=Jabber IM Client _Comment=A GTK+ Jabber client +_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip Version=1.0 Exec=gajim Icon=gajim

1 0

gajim: [Yves-Alexis Perez] Fix oid_xmppaddr and oid_dnssrv for X...
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset 8f0b3195b73a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8f0b3195b73a description: [Yves-Alexis Perez] Fix oid_xmppaddr and oid_dnssrv for X509 cert checking diffstat: src/common/check_X509.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 5a35687f9998 -r 8f0b3195b73a src/common/check_X509.py --- a/src/common/check_X509.py Thu Aug 15 23:16:38 2013 +0200 +++ b/src/common/check_X509.py Thu Aug 15 23:19:23 2013 +0200 @@ -12,8 +12,8 @@ from common.helpers import prep, InvalidFormat MAX = 64 - oid_xmppaddr = '(1, 3, 6, 1, 5, 5, 7, 8, 5)' - oid_dnssrv = '(1, 3, 6, 1, 5, 5, 7, 8, 7)' + oid_xmppaddr = '1.3.6.1.5.5.7.8.5' + oid_dnssrv = '1.3.6.1.5.5.7.8.7'

1 0

gajim: fix transient for windows. Fixes #7185
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset a870cb628d9d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a870cb628d9d description: fix transient for windows. Fixes #7185 diffstat: src/chat_control.py | 12 +++++++----- src/dialogs.py | 33 ++++++++++++++++++++++----------- src/disco.py | 8 +++++--- src/groupchat_control.py | 12 ++++++++---- src/session.py | 3 ++- 5 files changed, 44 insertions(+), 24 deletions(-) diffs (205 lines): diff -r 8e3ff14cde5e -r a870cb628d9d src/chat_control.py --- a/src/chat_control.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/chat_control.py Thu Aug 15 23:14:42 2013 +0200 @@ -2787,11 +2787,13 @@ on_no(self) dialogs.ConfirmationDialog( - # %s is being replaced in the code with JID - _('You just received a new message from "%s"') % self.contact.jid, - _('If you close this tab and you have history disabled, '\ - 'this message will be lost.'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + #%s is being replaced in the code with JID + _('You just received a new message from "%s"') % \ + self.contact.jid, + _('If you close this tab and you have history disabled, '\ + 'this message will be lost.'), on_response_ok=on_ok, + on_response_cancel=on_cancel, + transient_for=self.parent_win.window) return on_yes(self) diff -r 8e3ff14cde5e -r a870cb628d9d src/dialogs.py --- a/src/dialogs.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 23:14:42 2013 +0200 @@ -1508,10 +1508,10 @@ """ def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): + on_response_cancel=None, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - HigDialog.__init__(self, None, + HigDialog.__init__(self, transient_for, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, pritext, sectext, self.on_response_ok, self.on_response_cancel) self.popup() @@ -1589,8 +1589,10 @@ HIG compliant info dialog """ - def __init__(self, pritext, sectext=''): - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + def __init__(self, pritext, sectext='', transient_for=None): + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -1712,11 +1714,13 @@ """ def __init__(self, pritext, sectext='', checktext='', on_response_ok=None, - on_response_cancel=None, is_modal=True): + on_response_cancel=None, is_modal=True, transient_for=None): self.user_response_ok = on_response_ok self.user_response_cancel = on_response_cancel - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -1972,13 +1976,16 @@ Common Class for Input dialogs """ - def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler): + def __init__(self, title, label_str, is_modal, ok_handler, cancel_handler, + transient_for=None): self.dialog = self.xml.get_object('input_dialog') label = self.xml.get_object('label') self.dialog.set_title(title) label.set_markup(label_str) self.cancel_handler = cancel_handler self.vbox = self.xml.get_object('vbox') + if transient_for: + self.dialog.set_transient_for(transient_for) self.ok_handler = ok_handler okbutton = self.xml.get_object('okbutton') @@ -2015,10 +2022,10 @@ """ def __init__(self, title, label_str, input_str=None, is_modal=True, - ok_handler=None, cancel_handler=None): + ok_handler=None, cancel_handler=None, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('input_dialog.ui') CommonInputDialog.__init__(self, title, label_str, is_modal, ok_handler, - cancel_handler) + cancel_handler, transient_for=transient_for) self.input_entry = self.xml.get_object('input_entry') if input_str: self.set_entry(input_str) @@ -2198,7 +2205,8 @@ """ def __init__(self, title, label_str1, label_str2, input_str1=None, - input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None): + input_str2=None, is_modal=True, ok_handler=None, cancel_handler=None, + transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('dubbleinput_dialog.ui') self.dialog = self.xml.get_object('dubbleinput_dialog') label1 = self.xml.get_object('label1') @@ -2215,6 +2223,8 @@ if input_str2: self.input_entry2.set_text(input_str2) self.input_entry2.select_region(0, -1) # select all + if transient_for: + self.dialog.set_transient_for(transient_for) self.dialog.set_modal(is_modal) @@ -4531,7 +4541,8 @@ name = self.new_privacy_list_entry.get_text() if not name: ErrorDialog(_('Invalid List Name'), - _('You must enter a name to create a privacy list.')) + _('You must enter a name to create a privacy list.'), + transient_for=self.window) return key_name = 'privacy_list_%s' % name if key_name in gajim.interface.instances[self.account]: diff -r 8e3ff14cde5e -r a870cb628d9d src/disco.py --- a/src/disco.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/disco.py Thu Aug 15 23:14:42 2013 +0200 @@ -759,13 +759,15 @@ # We can't travel anywhere else. self.destroy() dialogs.ErrorDialog(_('The service could not be found'), -_('There is no service at the address you entered, or it is not responding. ' - 'Check the address and try again.')) + _('There is no service at the address you entered, or it is ' + 'not responding. Check the address and try again.'), + transient_for=self.window) return klass = self.cache.get_browser(identities, features) if not klass: dialogs.ErrorDialog(_('The service is not browsable'), -_('This type of service does not contain any items to browse.')) + _('This type of service does not contain any items to browse.'), + transient_for=self.window) return elif klass is None: klass = AgentBrowser diff -r 8e3ff14cde5e -r a870cb628d9d src/groupchat_control.py --- a/src/groupchat_control.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/groupchat_control.py Thu Aug 15 23:14:42 2013 +0200 @@ -2130,7 +2130,8 @@ dialogs.ConfirmationDialogCheck(pritext, sectext, _('_Do not ask me again'), on_response_ok=on_ok, - on_response_cancel=on_cancel) + on_response_cancel=on_cancel, + transient_for=self.parent_win.window) return on_yes(self) @@ -2206,7 +2207,8 @@ dialogs.DoubleInputDialog(_('Destroying %s') % u'\u200E' + \ self.room_jid, _('You are going to definitively destroy this ' 'room.\nYou may specify a reason below:'), - _('You may also enter an alternate venue:'), ok_handler=on_ok) + _('You may also enter an alternate venue:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def _on_bookmark_room_menuitem_activate(self, widget): """ @@ -2406,7 +2408,8 @@ # ask for reason dialogs.InputDialog(_('Kicking %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok) + _('You may specify a reason below:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def mk_menu(self, event, iter_): """ @@ -2738,7 +2741,8 @@ nick = gajim.get_nick_from_jid(jid) # ask for reason dialogs.InputDialog(_('Banning %s') % nick, - _('You may specify a reason below:'), ok_handler=on_ok) + _('You may specify a reason below:'), ok_handler=on_ok, + transient_for=self.parent_win.window) def grant_membership(self, widget, jid): """ diff -r 8e3ff14cde5e -r a870cb628d9d src/session.py --- a/src/session.py Thu Aug 15 22:20:13 2013 +0200 +++ b/src/session.py Thu Aug 15 23:14:42 2013 +0200 @@ -413,7 +413,8 @@ 'acceptable?''') % ( negotiation.describe_features(ask_user)), on_response_yes=accept_nondefault_options, - on_response_no=reject_nondefault_options) + on_response_no=reject_nondefault_options, + transient_for=self.control.parent_win.window) else: self.respond_e2e_bob(form, negotiated, not_acceptable)

1 0

gajim: fix transient for. See #7185
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset 5a35687f9998 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5a35687f9998 description: fix transient for. See #7185 diffstat: src/session.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a870cb628d9d -r 5a35687f9998 src/session.py --- a/src/session.py Thu Aug 15 23:14:42 2013 +0200 +++ b/src/session.py Thu Aug 15 23:16:38 2013 +0200 @@ -473,7 +473,8 @@ negotiation.describe_features(ask_user)), _('Always accept for this contact'), on_response_yes = accept_nondefault_options, - on_response_no = reject_nondefault_options) + on_response_no = reject_nondefault_options, + transient_for=self.control.parent_win.window) else: try: self.accept_e2e_alice(form, negotiated)

1 0

gajim: coding standards
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset 67648fa63e59 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=67648fa63e59 description: coding standards diffstat: src/config.py | 272 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 146 insertions(+), 126 deletions(-) diffs (truncated from 774 to 300 lines): diff -r bec93a94a81b -r 67648fa63e59 src/config.py --- a/src/config.py Fri Aug 16 00:55:01 2013 +0400 +++ b/src/config.py Thu Aug 15 14:57:39 2013 +0200 @@ -1614,7 +1614,8 @@ gajim.connections[account].change_status(show, status) def check_resend_relog(self): - if self.need_relogin and self.current_account == gajim.ZEROCONF_ACC_NAME: + if self.need_relogin and self.current_account == \ + gajim.ZEROCONF_ACC_NAME: if gajim.ZEROCONF_ACC_NAME in gajim.connections: gajim.connections[gajim.ZEROCONF_ACC_NAME].update_details() return @@ -1633,11 +1634,13 @@ def relog(account): self.dialog.destroy() - show_before = gajim.SHOW_LIST[gajim.connections[account].connected] + show_before = gajim.SHOW_LIST[gajim.connections[account].\ + connected] status_before = gajim.connections[account].status gajim.interface.roster.send_status(account, 'offline', - _('Be right back.')) - gobject.timeout_add(500, login, account, show_before, status_before) + _('Be right back.')) + gobject.timeout_add(500, login, account, show_before, + status_before) def on_yes(checked, account): relog(account) @@ -1646,10 +1649,10 @@ self.resend(account) if self.current_account in gajim.connections: self.dialog = dialogs.YesNoDialog(_('Relogin now?'), - _('If you want all the changes to apply instantly, ' - 'you must relogin.'), on_response_yes=(on_yes, - self.current_account), on_response_no=(on_no, - self.current_account)) + _('If you want all the changes to apply instantly, ' + 'you must relogin.'), on_response_yes=(on_yes, + self.current_account), on_response_no=(on_no, + self.current_account)) elif self.resend_presence: self.resend(self.current_account) @@ -1667,7 +1670,8 @@ else: account = None if self.current_account and self.current_account == account: - # We're comming back to our current account, no need to update widgets + # We're comming back to our current account, no need to update + # widgets return # Save config for previous account if needed cause focus_out event is # called after the changed event @@ -1685,8 +1689,8 @@ elif focused_widget_name == 'cert_entry1': func = self.on_cert_entry1_focus_out_event if func(focused_widget, None): - # Error detected in entry, don't change account, re-put cursor on - # previous row + # Error detected in entry, don't change account, + # re-put cursor on previous row self.select_account(self.current_account) return True self.window.set_focus(widget) @@ -1725,7 +1729,7 @@ def update_proxy_list(self): if self.current_account: our_proxy = gajim.config.get_per('accounts', self.current_account, - 'proxy') + 'proxy') else: our_proxy = '' @@ -1745,7 +1749,8 @@ if not self.current_account: self.notebook.set_current_page(0) return - if gajim.config.get_per('accounts', self.current_account, 'is_zeroconf'): + if gajim.config.get_per('accounts', self.current_account, + 'is_zeroconf'): self.ignore_events = True self.init_zeroconf_account() self.ignore_events = False @@ -1758,38 +1763,39 @@ def init_zeroconf_account(self): active = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'active') + 'active') self.xml.get_object('enable_zeroconf_checkbutton2').set_active(active) if not gajim.HAVE_ZEROCONF: self.xml.get_object('enable_zeroconf_checkbutton2').set_sensitive( - False) + False) self.xml.get_object('zeroconf_notebook').set_sensitive(active) # General tab st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'autoconnect') + 'autoconnect') self.xml.get_object('autoconnect_checkbutton2').set_active(st) list_no_log_for = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() + gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() if gajim.ZEROCONF_ACC_NAME in list_no_log_for: self.xml.get_object('log_history_checkbutton2').set_active(0) else: self.xml.get_object('log_history_checkbutton2').set_active(1) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'sync_with_global_status') - self.xml.get_object('sync_with_global_status_checkbutton2').set_active(st) + 'sync_with_global_status') + self.xml.get_object('sync_with_global_status_checkbutton2').set_active( + st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'use_custom_host') + 'use_custom_host') self.xml.get_object('custom_port_checkbutton2').set_active(st) self.xml.get_object('custom_port_entry2').set_sensitive(st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port') + 'custom_port') if not st: gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port', '5298') + 'custom_port', '5298') st = '5298' self.xml.get_object('custom_port_entry2').set_text(str(st)) @@ -1805,7 +1811,7 @@ for opt in ('first_name', 'last_name', 'jabber_id', 'email'): st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'zeroconf_' + opt) + 'zeroconf_' + opt) self.xml.get_object(opt + '_entry2').set_text(st) def init_account_gpg(self): @@ -1822,7 +1828,7 @@ gpg_key_label = self.xml.get_object('gpg_key_label' + widget_name_add) gpg_name_label = self.xml.get_object('gpg_name_label' + widget_name_add) use_gpg_agent_checkbutton = self.xml.get_object( - 'use_gpg_agent_checkbutton' + widget_name_add) + 'use_gpg_agent_checkbutton' + widget_name_add) if not keyid: use_gpg_agent_checkbutton.set_sensitive(False) @@ -1868,7 +1874,7 @@ password_entry.set_text(passstr) jid = gajim.config.get_per('accounts', account, 'name') \ - + '@' + gajim.config.get_per('accounts', account, 'hostname') + + '@' + gajim.config.get_per('accounts', account, 'hostname') self.xml.get_object('jid_entry1').set_text(jid) self.ignore_events = False @@ -1895,36 +1901,38 @@ else: spinbutton.set_range(0, 127) spinbutton.set_value(gajim.config.get_per('accounts', account, - 'priority')) + 'priority')) # Connection tab use_env_http_proxy = gajim.config.get_per('accounts', account, - 'use_env_http_proxy') + 'use_env_http_proxy') self.xml.get_object('use_env_http_proxy_checkbutton1').set_active( - use_env_http_proxy) + use_env_http_proxy) self.xml.get_object('proxy_hbox1').set_sensitive(not use_env_http_proxy) warn_when_insecure_ssl = gajim.config.get_per('accounts', account, - 'warn_when_insecure_ssl_connection') + 'warn_when_insecure_ssl_connection') self.xml.get_object('warn_when_insecure_connection_checkbutton1').\ - set_active(warn_when_insecure_ssl) + set_active(warn_when_insecure_ssl) self.xml.get_object('send_keepalive_checkbutton1').set_active( - gajim.config.get_per('accounts', account, 'keep_alives_enabled')) + gajim.config.get_per('accounts', account, 'keep_alives_enabled')) use_custom_host = gajim.config.get_per('accounts', account, - 'use_custom_host') + 'use_custom_host') self.xml.get_object('custom_host_port_checkbutton1').set_active( - use_custom_host) + use_custom_host) custom_host = gajim.config.get_per('accounts', account, 'custom_host') if not custom_host: custom_host = gajim.config.get_per('accounts', account, 'hostname') - gajim.config.set_per('accounts', account, 'custom_host', custom_host) + gajim.config.set_per('accounts', account, 'custom_host', + custom_host) self.xml.get_object('custom_host_entry1').set_text(custom_host) custom_port = gajim.config.get_per('accounts', account, 'custom_port') if not custom_port: custom_port = 5222 - gajim.config.set_per('accounts', account, 'custom_port', custom_port) + gajim.config.set_per('accounts', account, 'custom_port', + custom_port) self.xml.get_object('custom_port_entry1').set_text(unicode(custom_port)) # Personal tab @@ -1937,22 +1945,23 @@ self.xml.get_object('gpg_choose_button1').set_sensitive(False) # General tab - self.xml.get_object('autoconnect_checkbutton1').set_active(gajim.config.\ - get_per('accounts', account, 'autoconnect')) + self.xml.get_object('autoconnect_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'autoconnect')) self.xml.get_object('autoreconnect_checkbutton1').set_active(gajim. - config.get_per('accounts', account, 'autoreconnect')) + config.get_per('accounts', account, 'autoreconnect')) list_no_log_for = gajim.config.get_per('accounts', account, - 'no_log_for').split() + 'no_log_for').split() if account in list_no_log_for: self.xml.get_object('log_history_checkbutton1').set_active(False) else: self.xml.get_object('log_history_checkbutton1').set_active(True) self.xml.get_object('sync_with_global_status_checkbutton1').set_active( - gajim.config.get_per('accounts', account, 'sync_with_global_status')) + gajim.config.get_per('accounts', account, + 'sync_with_global_status')) self.xml.get_object('use_ft_proxies_checkbutton1').set_active( - gajim.config.get_per('accounts', account, 'use_ft_proxies')) + gajim.config.get_per('accounts', account, 'use_ft_proxies')) def on_add_button_clicked(self, widget): """ @@ -1962,7 +1971,7 @@ gajim.interface.instances['account_creation_wizard'].window.present() else: gajim.interface.instances['account_creation_wizard'] = \ - AccountCreationWizardWindow() + AccountCreationWizardWindow() def on_remove_button_clicked(self, widget): """ @@ -1974,7 +1983,7 @@ account = self.current_account if len(gajim.events.get_events(account)): dialogs.ErrorDialog(_('Unread events'), - _('Read all pending events before removing this account.')) + _('Read all pending events before removing this account.')) return if gajim.config.get_per('accounts', account, 'is_zeroconf'): @@ -2000,13 +2009,13 @@ if not account in gajim.interface.instances: gajim.interface.instances[account] = {} gajim.interface.instances[account]['remove_account'] = \ - RemoveAccountWindow(account) + RemoveAccountWindow(account) if win_opened: dialogs.ConfirmationDialog( - _('You have opened chat in account %s') % account, - _('All chat and groupchat windows will be closed. Do you want to ' - 'continue?'), - on_response_ok = (remove, account)) + _('You have opened chat in account %s') % account, + _('All chat and groupchat windows will be closed. Do you want to ' + 'continue?'), + on_response_ok = (remove, account)) else: remove(account) @@ -2016,52 +2025,54 @@ active = gajim.config.get_per('accounts', self.current_account, 'active') if active and gajim.connections[self.current_account].connected != 0: dialogs.ErrorDialog( - _('You are currently connected to the server'), - _('To change the account name, you must be disconnected.')) + _('You are currently connected to the server'), + _('To change the account name, you must be disconnected.')) return if len(gajim.events.get_events(self.current_account)): dialogs.ErrorDialog(_('Unread events'), - _('To change the account name, you must read all pending ' - 'events.')) + _('To change the account name, you must read all pending ' + 'events.')) return # Get the new name def on_renamed(new_name, old_name): if new_name in gajim.connections: dialogs.ErrorDialog(_('Account Name Already Used'), - _('This name is already used by another of your accounts. ' - 'Please choose another name.')) + _('This name is already used by another of your accounts. '

1 0

gajim: make error diaogs in accounts window transient for ccount...
by Yann Leboulanger 15 Aug '13

15 Aug '13

changeset e14a278fc625 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e14a278fc625 description: make error diaogs in accounts window transient for ccounts window. See #7185 diffstat: src/config.py | 43 ++++++++++++++++++++++++++----------------- src/dialogs.py | 6 ++++-- 2 files changed, 30 insertions(+), 19 deletions(-) diffs (166 lines): diff -r 67648fa63e59 -r e14a278fc625 src/config.py --- a/src/config.py Thu Aug 15 14:57:39 2013 +0200 +++ b/src/config.py Thu Aug 15 15:11:51 2013 +0200 @@ -1983,7 +1983,8 @@ account = self.current_account if len(gajim.events.get_events(account)): dialogs.ErrorDialog(_('Unread events'), - _('Read all pending events before removing this account.')) + _('Read all pending events before removing this account.'), + transient_for=self.window) return if gajim.config.get_per('accounts', account, 'is_zeroconf'): @@ -2026,27 +2027,30 @@ if active and gajim.connections[self.current_account].connected != 0: dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To change the account name, you must be disconnected.')) + _('To change the account name, you must be disconnected.'), + transient_for=self.window) return if len(gajim.events.get_events(self.current_account)): dialogs.ErrorDialog(_('Unread events'), _('To change the account name, you must read all pending ' - 'events.')) + 'events.'), transient_for=self.window) return # Get the new name def on_renamed(new_name, old_name): if new_name in gajim.connections: dialogs.ErrorDialog(_('Account Name Already Used'), _('This name is already used by another of your accounts. ' - 'Please choose another name.')) + 'Please choose another name.'), transient_for=self.window) return if (new_name == ''): dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot be empty.')) + _('Account name cannot be empty.'), + transient_for=self.window) return if new_name.find(' ') != -1: dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot contain spaces.')) + _('Account name cannot contain spaces.'), + transient_for=self.window) return if active: # update variables @@ -2146,7 +2150,7 @@ except helpers.InvalidFormat, s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) gobject.idle_add(lambda: widget.grab_focus()) return True @@ -2157,7 +2161,7 @@ pritext = _('Invalid Jabber ID') sectext = \ _('A Jabber ID must be in the form "user@servername".') - dialogs.ErrorDialog(pritext, sectext) + dialogs.ErrorDialog(pritext, sectext, transient_for=self.window) gobject.idle_add(lambda: widget.grab_focus()) return True @@ -2225,7 +2229,7 @@ except helpers.InvalidFormat, s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) gobject.idle_add(lambda: widget.grab_focus()) return True @@ -2383,7 +2387,8 @@ except Exception: if not widget.is_focus(): dialogs.ErrorDialog(_('Invalid entry'), - _('Custom port must be a port number.')) + _('Custom port must be a port number.'), + transient_for=self.window) gobject.idle_add(lambda: widget.grab_focus()) return True if self.option_changed('custom_port', custom_port): @@ -2405,7 +2410,8 @@ secret_keys = [] if not secret_keys: dialogs.ErrorDialog(_('Failed to get secret keys'), - _('There is no OpenPGP secret key available.')) + _('There is no OpenPGP secret key available.'), + transient_for=self.window) secret_keys[_('None')] = _('None') def on_key_selected(keyID): @@ -2420,7 +2426,7 @@ gpg_name_label = self.xml.get_object('gpg_name_label' + \ wiget_name_ext) use_gpg_agent_checkbutton = self.xml.get_object( - 'use_gpg_agent_checkbutton' + wiget_name_ext) + 'use_gpg_agent_checkbutton' + wiget_name_ext) if keyID[0] == _('None'): gpg_key_label.set_text(_('No key selected')) gpg_name_label.set_text('') @@ -2453,7 +2459,7 @@ if self.current_account not in gajim.interface.instances: dlg = dialogs.ErrorDialog(_('No such account available'), _('You must create your account before editing your personal ' - 'information.')) + 'information.'), transient_for=self.window) return # show error dialog if account is newly created (not in gajim.connections) @@ -2461,12 +2467,13 @@ gajim.connections[self.current_account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), _('Without a connection, you can not edit your personal ' - 'information.')) + 'information.'), transient_for=self.window) return if not gajim.connections[self.current_account].vcard_supported: dialogs.ErrorDialog(_("Your server doesn't support vCard"), - _("Your server can't save your personal information.")) + _("Your server can't save your personal information."), + transient_for=self.window) return jid = gajim.get_jid_from_account(self.current_account) @@ -2582,7 +2589,8 @@ self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To disable the account, you must be disconnected.')) + _('To disable the account, you must be disconnected.'), + transient_for=self.window) return if gajim.ZEROCONF_ACC_NAME in gajim.connections and not \ gajim.connections[gajim.ZEROCONF_ACC_NAME].is_zeroconf: @@ -2619,7 +2627,8 @@ self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To disable the account, you must be disconnected.')) + _('To disable the account, you must be disconnected.'), + transient_for=self.window) return # add/remove account in roster and all variables if widget.get_active(): diff -r 67648fa63e59 -r e14a278fc625 src/dialogs.py --- a/src/dialogs.py Thu Aug 15 14:57:39 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 15:11:51 2013 +0200 @@ -1605,8 +1605,10 @@ """ def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + on_response_cancel=None, transient_for=None): + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None

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