Commits

commits@gajim.org

17632 discussions

gajim: [Darlan] Update Hebrew translation
by Gajim 11 Sep '13

11 Sep '13

changeset 9b68bba0536d in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=9b68bba0536d description: [Darlan] Update Hebrew translation diffstat: po/he.po | 61 ++++++++++++++++++++++++++++++------------------------------- 1 файлов изменено, 30 вставок(+), 31 удалений(-) различия (267 строк): diff -r 22c7db3676c2 -r 9b68bba0536d po/he.po --- a/po/he.po Sun Sep 08 21:58:54 2013 +0400 +++ b/po/he.po Thu Sep 12 00:17:54 2013 +0400 @@ -9,7 +9,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-30 14:12+0300\n" -"PO-Revision-Date: 2013-08-30 14:13+0200\n" +"PO-Revision-Date: 2013-09-11 07:09+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -2077,7 +2077,7 @@ "הודעת מצב נעדרות אוטומטית. אם שדה זה ריק, Gajim לא ישנה את הודעת המצב " "הנוכחית\n" "התווים $S יוחלפו בהודעת מצב קודמת\n" -"התווים $T יוחלפו על פי זמן תפוגה אשר מצוין עבור auto-away" +"התווים $T יוחלפו על פי זמן תפוגה אשר מצוין עבור autoaway" #: ../data/gui/preferences_window.ui.h:73 msgid "" @@ -2089,7 +2089,7 @@ "הודעת מצב אי הזמינות האוטומטית. במידה ושדה זה ריק, Gajim לא ישנה את הודעת " "המצב הנוכחית\n" "התווים $S יוחלפו בהודעת מצב קודמת\n" -"התווים $T יוחלפו על פי זמן תפוגה של auto-not-available" +"התווים $T יוחלפו על פי זמן תפוגה של autoxa" #: ../data/gui/preferences_window.ui.h:76 msgid "Auto Status" @@ -2173,7 +2173,7 @@ #: ../data/gui/preferences_window.ui.h:93 msgid "Contact's nickname:" -msgstr "שם כינוי של איש קשר:" +msgstr "שם כינוי איש קשר:" #: ../data/gui/preferences_window.ui.h:94 msgid "Your nickname:" @@ -2793,7 +2793,7 @@ #: ../data/gui/single_message_window.ui.h:7 msgid "_Reply" -msgstr "_מענה" +msgstr "_השב" #: ../data/gui/single_message_window.ui.h:8 msgid "Reply to this message" @@ -3351,6 +3351,7 @@ "קובץ מסד הנתונים (%s) לא ניתן לקריאה. נסה לתקנו או להסירו (כל ההיסטוריה " "תאבד)." +# כי משהו שיבש אותה #: ../src/chat_control.py:3205 ../src/gui_interface.py:1161 #, python-format msgid "" @@ -3515,6 +3516,7 @@ msgstr "שליחת רצף טזמ״ת (DTMF) מבעד סשן שמע פתוח" # סשנים של שמע +# הפעלות #: ../src/command_system/implementation/standard.py:205 msgid "No open audio sessions with the contact" msgstr "לא קיימים סשני שמע פתוחים עם איש הקשר" @@ -3570,7 +3572,7 @@ msgid "Display or change a group chat topic" msgstr "הצגה או שינוי נושא של שיחת קבוצה" -# תכלית +# בליווי תכלית #: ../src/command_system/implementation/standard.py:310 msgid "Invite a user to a room for a reason" msgstr "הזמנת משתמש אל חדר עם ציון סיבה" @@ -3652,14 +3654,12 @@ #: ../src/command_system/mapping.py:165 ../src/command_system/mapping.py:175 #: ../src/command_system/mapping.py:195 -#, fuzzy msgid "Missing arguments" -msgstr "cli?" +msgstr "ארגומנטים חסרים" #: ../src/command_system/mapping.py:262 -#, fuzzy msgid "Excessive arguments" -msgstr "cli?" +msgstr "ארגומנטים מופרזים" #: ../src/common/check_paths.py:39 msgid "creating logs database" @@ -4761,7 +4761,7 @@ "file_transfer_proxies option for file transfer." msgstr "" "במידה ואפשרות זו מסומנת, Gajim יעשה שימוש בכתובת פרוטוקול המרשתת (IP; ‏" -"Internet Protocol) ובמתווכים שהוגדרו על ידיך באפשרות file_transfer_proxies " +"Internet Protocol) ובמתווכים שהוגדרו על ידך באפשרות file_transfer_proxies " "עבור העברת קובץ." #: ../src/common/config.py:379 @@ -5013,7 +5013,7 @@ #: ../src/common/connection.py:72 msgid "Unable to decrypt certificate's signature" -msgstr "אין אפשרות לפענח את החתימה של התעודה" +msgstr "אין אפשרות לפענח חתימת תעודה" #: ../src/common/connection.py:73 msgid "Unable to decrypt CRL's signature" @@ -5881,7 +5881,7 @@ #: ../src/common/helpers.py:295 msgid "?Group Chat Contact Role:None" -msgstr "ללא" +msgstr "אין" #: ../src/common/helpers.py:298 msgid "Moderators" @@ -5925,15 +5925,15 @@ #: ../src/common/helpers.py:361 msgid "is paying attention to the conversation" -msgstr "קשוב/ה לשיחה" +msgstr "קשוב/ה כעת לשיחה" #: ../src/common/helpers.py:363 msgid "is doing something else" -msgstr "עושה משהו אחר" +msgstr "עושה כעת משהו אחר" #: ../src/common/helpers.py:365 msgid "is composing a message..." -msgstr "כותב/ת הודעה..." +msgstr "כותב/ת כעת הודעה..." #. paused means he or she was composing but has stopped for a while #: ../src/common/helpers.py:368 @@ -5942,7 +5942,7 @@ #: ../src/common/helpers.py:370 msgid "has closed the chat window or tab" -msgstr "סגר/ה את כרטיסיית או את חלון השיחה" +msgstr "סגר/ה את כרטיסיית או חלון השיחה" # גיבי בתים #. GiB means gibibyte @@ -6039,7 +6039,7 @@ # BUG: File too big #: ../src/common/helpers.py:1497 ../src/common/helpers.py:1539 msgid "Image is too big" -msgstr "התמונה גדולה מדי" +msgstr "התמונה הינה גדולה מדי" #: ../src/common/helpers.py:1507 msgid "PyCURL is not installed" @@ -7030,7 +7030,7 @@ #: ../src/common/zeroconf/connection_zeroconf.py:333 #, python-format msgid "Could not change status of account \"%s\"" -msgstr "לא היתה אפשרות לשנות את המצב של חשבון \"%s\"" +msgstr "לא היתה אפשרות לשנות מצב של חשבון \"%s\"" # הודעתך לא יכולה להישלח. #: ../src/common/zeroconf/connection_zeroconf.py:353 @@ -7162,7 +7162,7 @@ #: ../src/config.py:2138 msgid "Rename Account" -msgstr "שנה שם חשבון" +msgstr "שינוי שם חשבון" #: ../src/config.py:2139 #, python-format @@ -8134,7 +8134,7 @@ #: ../src/dialogs.py:3268 #, python-format msgid "RE: %s" -msgstr "‏RE: %s" +msgstr "" #: ../src/dialogs.py:3269 #, python-format @@ -8287,12 +8287,12 @@ #: ../src/dialogs.py:4583 msgid "$Contact has invited you to join a discussion" -msgstr "‏$Contact הזמינך להצטרף אל דיון" +msgstr "$Contact הזמינך להצטרף אל דיון" #: ../src/dialogs.py:4585 #, python-format msgid "$Contact has invited you to group chat %(room_jid)s" -msgstr "‏$Contact הזמינך אל שיחת קבוצה %(room_jid)s" +msgstr "$Contact הזמינך אל שיחת קבוצה %(room_jid)s" #: ../src/dialogs.py:4593 #, python-format @@ -9087,7 +9087,7 @@ #: ../src/filetransfers_window.py:894 msgid "Pause" -msgstr "הפסקה" +msgstr "השהה" #: ../src/gajim-remote.py:78 #, fuzzy @@ -9615,6 +9615,7 @@ msgstr "cli" #: ../src/gajim.py:147 +#, fuzzy msgid "Set configuration directory" msgstr "cli" @@ -10287,7 +10288,7 @@ #: ../src/gui_interface.py:1163 msgid "Unable to decrypt message" -msgstr "אין אפשרות לפענח את ההודעה" +msgstr "אין אפשרות לפענח הודעה" # התנגשויות, ניגודים, קונפליקט #: ../src/gui_interface.py:1175 @@ -10691,7 +10692,6 @@ msgid "Format of the date must be YYYY-MM-DD" msgstr "הפורמט של התאריך מוכרח להיות YYYY-MM-DD" -# התקבל מידע #: ../src/profile_window.py:294 msgid "Information received" msgstr "מידע התקבל" @@ -10898,9 +10898,7 @@ msgid "Assign OpenPGP Key" msgstr "הקצאת מפתח OpenPGP" -# BUG: the word OpenPGP should be written -# להחלה -# לאיש קשר זה +# BUG: Select a key to apply to contact "JID" #: ../src/roster_window.py:3180 msgid "Select a key to apply to the contact" msgstr "בחר מפתח ליישום עבור איש הקשר" @@ -10944,7 +10942,7 @@ #. several contact to remove at the same time #: ../src/roster_window.py:3659 msgid "Contacts will be removed from your roster" -msgstr "אנשי קשר יוסרו מתןך הרשימה שלך" +msgstr "אנשי קשר יוסרו מתוך הרשימה שלך" #: ../src/roster_window.py:3664 #, python-format @@ -11179,6 +11177,7 @@ msgid "No result" msgstr "אין תנובה" +# נא לאשר #: ../src/session.py:409 ../src/session.py:469 msgid "Confirm these session options" msgstr "אשר את אפשרויות סשן אלו" @@ -11424,7 +11423,7 @@ #: ../src/vcard.py:421 msgid "You are waiting contact's answer about your subscription request" -msgstr "הינך מחכה למענה של איש קשר בנוגע לבקשת רישומך" +msgstr "הינך מחכה למענה איש קשר בנוגע לבקשת רישומך" #: ../src/vcard.py:423 msgid "There is no pending subscription request."

1 0

gajim: Use send_message instead of pushing an event and print at...
by Gajim 10 Sep '13

10 Sep '13

changeset 468378e1f13c in /home/hg/repos/gajim author: noonien <fsmail(a)kondorgulasch.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=468378e1f13c description: Use send_message instead of pushing an event and print at own when sending remotely (when possibe). Fixes #7457 diffstat: src/remote_control.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diffs (18 lines): diff -r aa361fee32cd -r 468378e1f13c src/remote_control.py --- a/src/remote_control.py Mon Sep 09 17:36:21 2013 +0200 +++ b/src/remote_control.py Mon Sep 02 14:35:54 2013 +0200 @@ -442,11 +442,9 @@ ctrl = gajim.interface.msg_win_mgr.search_control(jid, connected_account) if ctrl: - ctrl.print_conversation(message, frm='outgoing') - - gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=connected_account, jid=jid, message=message, - keyID=keyID, type_=type_, control=ctrl)) + ctrl.send_message(message) + else: + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=connected_account, jid=jid, message=message, keyID=keyID, type_=type_, control=ctrl)) return DBUS_BOOLEAN(True) return DBUS_BOOLEAN(False)

1 0

gajim: fix E2E / GPG information dialog and another information ...
by Gajim 09 Sep '13

09 Sep '13

changeset aa361fee32cd in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=aa361fee32cd description: fix E2E / GPG information dialog and another information dialog transient_for property. Fixes #7185 diffstat: src/chat_control.py | 4 ++-- src/dialogs.py | 5 +++-- src/message_window.py | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diffs (57 lines): diff -r dbd1e103fe74 -r aa361fee32cd src/chat_control.py --- a/src/chat_control.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/chat_control.py Mon Sep 09 17:36:21 2013 +0200 @@ -2309,9 +2309,9 @@ def _on_authentication_button_clicked(self, widget): if self.gpg_is_active: - dialogs.GPGInfoWindow(self) + dialogs.GPGInfoWindow(self, self.parent_win.window) elif self.session and self.session.enable_encryption: - dialogs.ESessionInfoWindow(self.session) + dialogs.ESessionInfoWindow(self.session, self.parent_win.window) def send_message(self, message, keyID='', chatstate=None, xhtml=None, process_commands=True, attention=False): diff -r dbd1e103fe74 -r aa361fee32cd src/dialogs.py --- a/src/dialogs.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/dialogs.py Mon Sep 09 17:36:21 2013 +0200 @@ -5097,7 +5097,7 @@ """ Class for displaying information about a XEP-0116 encrypted session """ - def __init__(self, session): + def __init__(self, session, transient_for=None): self.session = session self.xml = gtkgui_helpers.get_gtk_builder('esession_info_window.ui') @@ -5108,7 +5108,7 @@ self.button_label = self.xml.get_object('button_label') self.window = self.xml.get_object('esession_info_window') self.update_info() - + self.window.set_transient_for(transient_for) self.window.show_all() @@ -5219,6 +5219,7 @@ path = gtkgui_helpers.get_icon_path(image, 32) security_image.set_from_file(path) + self.window.set_transient_for(transient_for) xml.connect_signals(self) self.window.show_all() diff -r dbd1e103fe74 -r aa361fee32cd src/message_window.py --- a/src/message_window.py Mon Sep 09 17:22:53 2013 +0200 +++ b/src/message_window.py Mon Sep 09 17:36:21 2013 +0200 @@ -219,7 +219,8 @@ dialogs.YesNoDialog( _('You are going to close several tabs'), _('Do you really want to close them all?'), - checktext=_('_Do not ask me again'), on_response_yes=on_yes1) + checktext=_('_Do not ask me again'), on_response_yes=on_yes1, + transient_for=self.window) return True def on_yes(ctrl):

1 0

gajim: show correct menuitem when no metacontact exist.
by Gajim 09 Sep '13

09 Sep '13

changeset dbd1e103fe74 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=dbd1e103fe74 description: show correct menuitem when no metacontact exist. diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1080201e0781 -r dbd1e103fe74 src/roster_window.py --- a/src/roster_window.py Sun Sep 08 18:58:27 2013 +0200 +++ b/src/roster_window.py Mon Sep 09 17:22:53 2013 +0200 @@ -4827,7 +4827,7 @@ c_dest.jid) source_family = gajim.contacts.get_metacontacts_family( account_source, c_source.jid) - if dest_family == source_family: + if dest_family == source_family and dest_family: item = gtk.MenuItem(_('Make %s first contact') % ( c_source.get_shown_name())) else:

1 0

python-nbxmpp: [fedor.brunner] Use only high encryption cipher s...
by Yann Leboulanger 09 Sep '13

09 Sep '13

changeset cabaea232b6e in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=cabaea232b6e description: [fedor.brunner] Use only high encryption cipher suites and RC4 as least choice. Fixes #7 diffstat: nbxmpp/tls_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 05bab188ee16 -r cabaea232b6e nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Fri Jul 26 11:28:15 2013 +0200 +++ b/nbxmpp/tls_nb.py Mon Sep 09 16:56:14 2013 +0200 @@ -396,6 +396,7 @@ tcpsock.ssl_errnum = [] tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) + tcpsock._sslContext.set_cipher_list('HIGH:!aNULL:!eNULL:RC4-SHA') store = tcpsock._sslContext.get_cert_store() self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store)

1 0

gajim: Replacing Tune PEP icon. See #7445
by Gajim 08 Sep '13

08 Sep '13

changeset 22c7db3676c2 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=22c7db3676c2 description: Replacing Tune PEP icon. See #7445 diffstat: src/gui_interface.py | 7 +++++-- 1 файлов изменено, 5 вставок(+), 2 удалений(-) различия (17 строк): diff -r 5f1bb1daa116 -r 22c7db3676c2 src/gui_interface.py --- a/src/gui_interface.py Sat Sep 07 22:27:45 2013 +0400 +++ b/src/gui_interface.py Sun Sep 08 21:58:54 2013 +0400 @@ -2608,8 +2608,11 @@ mood = received_mood if received_mood in pep.MOODS else 'unknown' return gtkgui_helpers.load_mood_icon(mood).get_pixbuf() elif isinstance(pep_obj, pep.UserTunePEP): - path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png') - return gtk.gdk.pixbuf_new_from_file(path) + icon = gtkgui_helpers.get_icon_pixmap('audio-x-generic', quiet=True) + if not icon: + icon = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png') + return gtk.gdk.pixbuf_new_from_file(icon) + return icon elif isinstance(pep_obj, pep.UserActivityPEP): pep_ = pep_obj._pep_specific_data activity = pep_['activity']

1 0

gajim: some cleanup in icons folder. Fixes #7455
by Gajim 08 Sep '13

08 Sep '13

changeset 1080201e0781 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1080201e0781 description: some cleanup in icons folder. Fixes #7455 diffstat: icons/hicolor/128x128/apps/gajim-about.png | Bin icons/hicolor/128x128/apps/gajim.png | Bin icons/hicolor/16x16/actions/gajim-earth.png | Bin icons/hicolor/16x16/actions/gajim-message_corrected.png | Bin icons/hicolor/16x16/actions/gajim-muc_separator.png | Bin icons/hicolor/16x16/actions/gajim-receipt_missing.png | Bin icons/hicolor/16x16/actions/gajim-receipt_received.png | Bin icons/hicolor/16x16/actions/gajim-security_high.png | Bin icons/hicolor/16x16/actions/gajim-security_low.png | Bin icons/hicolor/16x16/status/gajim-earth.png | Bin icons/hicolor/16x16/status/gajim-muc_separator.png | Bin icons/hicolor/16x16/status/gajim-plugins.png | Bin icons/hicolor/16x16/status/gajim-security_high.png | Bin icons/hicolor/16x16/status/gajim-security_low.png | Bin icons/hicolor/32x32/categories/gajim-agent-error.png | Bin icons/hicolor/48x48/actions/gajim-chat_msg_recv.png | Bin icons/hicolor/48x48/actions/gajim-connection_lost.png | Bin icons/hicolor/48x48/actions/gajim-ft_done.png | Bin icons/hicolor/48x48/actions/gajim-ft_error.png | Bin icons/hicolor/48x48/actions/gajim-ft_request.png | Bin icons/hicolor/48x48/actions/gajim-ft_stopped.png | Bin icons/hicolor/48x48/actions/gajim-gc_invitation.png | Bin icons/hicolor/48x48/actions/gajim-new_email_recv.png | Bin icons/hicolor/48x48/actions/gajim-priv_msg_recv.png | Bin icons/hicolor/48x48/actions/gajim-single_msg_recv.png | Bin icons/hicolor/48x48/actions/gajim-subscription_request.png | Bin icons/hicolor/48x48/actions/gajim-unsubscribed.png | Bin icons/hicolor/48x48/actions/gajim-warning.png | Bin icons/hicolor/48x48/status/gajim-chat_msg_recv.png | Bin icons/hicolor/48x48/status/gajim-connection_lost.png | Bin icons/hicolor/48x48/status/gajim-ft_done.png | Bin icons/hicolor/48x48/status/gajim-ft_error.png | Bin icons/hicolor/48x48/status/gajim-ft_request.png | Bin icons/hicolor/48x48/status/gajim-ft_stopped.png | Bin icons/hicolor/48x48/status/gajim-gc_invitation.png | Bin icons/hicolor/48x48/status/gajim-new_email_recv.png | Bin icons/hicolor/48x48/status/gajim-priv_msg_recv.png | Bin icons/hicolor/48x48/status/gajim-single_msg_recv.png | Bin icons/hicolor/48x48/status/gajim-subscription_request.png | Bin icons/hicolor/48x48/status/gajim-unsubscribed.png | Bin src/conversation_textview.py | 18 ++---------- src/dialogs.py | 2 +- src/gui_interface.py | 2 +- src/htmltextview.py | 2 +- src/roster_window.py | 5 +++ 45 files changed, 11 insertions(+), 18 deletions(-) diffs (159 lines): diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/128x128/apps/gajim-about.png Binary file icons/hicolor/128x128/apps/gajim-about.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/128x128/apps/gajim.png Binary file icons/hicolor/128x128/apps/gajim.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/actions/gajim-earth.png Binary file icons/hicolor/16x16/actions/gajim-earth.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/actions/gajim-message_corrected.png Binary file icons/hicolor/16x16/actions/gajim-message_corrected.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/actions/gajim-muc_separator.png Binary file icons/hicolor/16x16/actions/gajim-muc_separator.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/actions/gajim-receipt_missing.png Binary file icons/hicolor/16x16/actions/gajim-receipt_missing.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/actions/gajim-receipt_received.png Binary file icons/hicolor/16x16/actions/gajim-receipt_received.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/actions/gajim-security_high.png Binary file icons/hicolor/16x16/actions/gajim-security_high.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/actions/gajim-security_low.png Binary file icons/hicolor/16x16/actions/gajim-security_low.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/status/gajim-earth.png Binary file icons/hicolor/16x16/status/gajim-earth.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/status/gajim-muc_separator.png Binary file icons/hicolor/16x16/status/gajim-muc_separator.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/status/gajim-plugins.png Binary file icons/hicolor/16x16/status/gajim-plugins.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/status/gajim-security_high.png Binary file icons/hicolor/16x16/status/gajim-security_high.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/16x16/status/gajim-security_low.png Binary file icons/hicolor/16x16/status/gajim-security_low.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/32x32/categories/gajim-agent-error.png Binary file icons/hicolor/32x32/categories/gajim-agent-error.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-chat_msg_recv.png Binary file icons/hicolor/48x48/actions/gajim-chat_msg_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-connection_lost.png Binary file icons/hicolor/48x48/actions/gajim-connection_lost.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-ft_done.png Binary file icons/hicolor/48x48/actions/gajim-ft_done.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-ft_error.png Binary file icons/hicolor/48x48/actions/gajim-ft_error.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-ft_request.png Binary file icons/hicolor/48x48/actions/gajim-ft_request.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-ft_stopped.png Binary file icons/hicolor/48x48/actions/gajim-ft_stopped.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-gc_invitation.png Binary file icons/hicolor/48x48/actions/gajim-gc_invitation.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-new_email_recv.png Binary file icons/hicolor/48x48/actions/gajim-new_email_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-priv_msg_recv.png Binary file icons/hicolor/48x48/actions/gajim-priv_msg_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-single_msg_recv.png Binary file icons/hicolor/48x48/actions/gajim-single_msg_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-subscription_request.png Binary file icons/hicolor/48x48/actions/gajim-subscription_request.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-unsubscribed.png Binary file icons/hicolor/48x48/actions/gajim-unsubscribed.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/actions/gajim-warning.png Binary file icons/hicolor/48x48/actions/gajim-warning.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-chat_msg_recv.png Binary file icons/hicolor/48x48/status/gajim-chat_msg_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-connection_lost.png Binary file icons/hicolor/48x48/status/gajim-connection_lost.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-ft_done.png Binary file icons/hicolor/48x48/status/gajim-ft_done.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-ft_error.png Binary file icons/hicolor/48x48/status/gajim-ft_error.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-ft_request.png Binary file icons/hicolor/48x48/status/gajim-ft_request.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-ft_stopped.png Binary file icons/hicolor/48x48/status/gajim-ft_stopped.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-gc_invitation.png Binary file icons/hicolor/48x48/status/gajim-gc_invitation.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-new_email_recv.png Binary file icons/hicolor/48x48/status/gajim-new_email_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-priv_msg_recv.png Binary file icons/hicolor/48x48/status/gajim-priv_msg_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-single_msg_recv.png Binary file icons/hicolor/48x48/status/gajim-single_msg_recv.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-subscription_request.png Binary file icons/hicolor/48x48/status/gajim-subscription_request.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 icons/hicolor/48x48/status/gajim-unsubscribed.png Binary file icons/hicolor/48x48/status/gajim-unsubscribed.png has changed diff -r 0d4fc739c1dc -r 1080201e0781 src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/conversation_textview.py Sun Sep 08 18:58:27 2013 +0200 @@ -171,21 +171,9 @@ FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( 'gajim-muc_separator') - XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no', - quiet=True) - if not XEP0184_WARNING_PIXBUF: - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_missing') - XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes', - quiet=True) - if not XEP0184_RECEIVED_PIXBUF: - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-receipt_received') - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gtk-spell-check', quiet=True) - if not MESSAGE_CORRECTED_PIXBUF: - MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-message_corrected') + XEP0184_WARNING_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-no') + XEP0184_RECEIVED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-yes') + MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') # smooth scroll constants MAX_SCROLL_TIME = 0.4 # seconds diff -r 0d4fc739c1dc -r 1080201e0781 src/dialogs.py --- a/src/dialogs.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/dialogs.py Sun Sep 08 18:58:27 2013 +0200 @@ -1311,7 +1311,7 @@ dlg.props.wrap_license = True - pixbuf = gtkgui_helpers.get_icon_pixmap('gajim-about', 128) + pixbuf = gtkgui_helpers.get_icon_pixmap('gajim', 128) dlg.set_logo(pixbuf) #here you write your name in the form Name FamilyName <someone@somewhere> diff -r 0d4fc739c1dc -r 1080201e0781 src/gui_interface.py --- a/src/gui_interface.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/gui_interface.py Sun Sep 08 18:58:27 2013 +0200 @@ -662,7 +662,7 @@ 'key.') dialogs.WarningDialog(_('Your passphrase is incorrect'), sectext) else: - path = gtkgui_helpers.get_icon_path('gajim-warning', 48) + path = gtkgui_helpers.get_icon_path('gtk-dialog-warning', 48) account = obj.conn.name notify.popup('warning', account, account, 'warning', path, _('OpenPGP Passphrase Incorrect'), diff -r 0d4fc739c1dc -r 1080201e0781 src/htmltextview.py --- a/src/htmltextview.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/htmltextview.py Sun Sep 08 18:58:27 2013 +0200 @@ -521,7 +521,7 @@ if alt: alt += '\n' alt += _('Loading') - pixbuf = get_icon_pixmap('gajim-receipt_missing') + pixbuf = get_icon_pixmap('gtk-no') if mem: # Caveat: GdkPixbuf is known not to be safe to load # images from network... this program is now potentially diff -r 0d4fc739c1dc -r 1080201e0781 src/roster_window.py --- a/src/roster_window.py Sun Sep 08 18:18:23 2013 +0200 +++ b/src/roster_window.py Sun Sep 08 18:58:27 2013 +0200 @@ -6474,6 +6474,11 @@ # Add a Separator (self._iter_is_separator() checks on string SEPARATOR) liststore.append(['SEPARATOR', None, '', True]) + path = gtkgui_helpers.get_icon_path('gajim-plugins') + img = gtk.Image() + img.set_from_file(path) + self.xml.get_object('plugins_menuitem').set_image(img) + path = gtkgui_helpers.get_icon_path('gajim-kbd_input') img = gtk.Image() img.set_from_file(path)

1 0

gajim: render the whole line when we use XEP-309 Last Message Co...
by Gajim 08 Sep '13

08 Sep '13

changeset 0d4fc739c1dc in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0d4fc739c1dc description: render the whole line when we use XEP-309 Last Message Correction. Fixes #7400, #7453 diffstat: icons/hicolor/32x32/categories/gajim-agent-twitter.png | Bin src/conversation_textview.py | 99 ++++++++++------ src/htmltextview.py | 13 +- 3 files changed, 69 insertions(+), 43 deletions(-) diffs (248 lines): diff -r 98573ca2b9e7 -r 0d4fc739c1dc icons/hicolor/32x32/categories/gajim-agent-twitter.png Binary file icons/hicolor/32x32/categories/gajim-agent-twitter.png has changed diff -r 98573ca2b9e7 -r 0d4fc739c1dc src/conversation_textview.py --- a/src/conversation_textview.py Sun Sep 08 18:11:53 2013 +0200 +++ b/src/conversation_textview.py Sun Sep 08 18:18:23 2013 +0200 @@ -477,8 +477,8 @@ buffer_.delete(i1, i2) tag = 'outgoingtxt' if message.startswith('/me'): - tag = 'outgoing' - i2 = self.print_real_text(message, text_tags=[tag], name=name, + tag = 'outgoing' + i2 = self.print_conversation_line(message, '', 'outgoing', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -496,7 +496,7 @@ i2 = buffer_.get_iter_at_mark(m2) txt = buffer_.get_text(i1, i2) buffer_.delete(i1, i2) - i2 = self.print_real_text(message, text_tags=['incomingtxt'], name=name, + i2 = self.print_conversation_line(message, '', 'incoming', name, None, xhtml=xhtml, iter_=i1) tt_txt = _('Message was corrected. Last message was:\n %s') % \ old_txt @@ -1243,12 +1243,14 @@ def print_conversation_line(self, text, jid, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], subject=None, old_kind=None, xhtml=None, simple=False, graphics=True, - displaymarking=None): + displaymarking=None, iter_=None): """ Print 'chat' type messages """ buffer_ = self.tv.get_buffer() buffer_.begin_user_action() + if iter_: + temp_mark = buffer_.create_mark(None, iter_, left_gravity=True) if self.marks_queue.full(): # remove oldest line m1 = self.marks_queue.get() @@ -1257,7 +1259,11 @@ i2 = buffer_.get_iter_at_mark(m2) buffer_.delete(i1, i2) buffer_.delete_mark(m1) - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = buffer_.get_iter_at_mark(temp_mark) + buffer_.delete_mark(temp_mark) + else: + end_iter = buffer_.get_end_iter() end_offset = end_iter.get_offset() at_the_end = self.at_the_end() move_selection = False @@ -1265,21 +1271,22 @@ get_offset() == end_offset: move_selection = True - # Create one mark and add it to queue once if it's the first line - # else twice (one for end bound, one for start bound) - mark = None - if buffer_.get_char_count() > 0: - if not simple: - buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') - if move_selection: - sel_start, sel_end = buffer_.get_selection_bounds() - sel_end.backward_char() - buffer_.select_range(sel_start, sel_end) - mark = buffer_.create_mark(None, end_iter, left_gravity=True) + if not iter_: + # Create one mark and add it to queue once if it's the first line + # else twice (one for end bound, one for start bound) + mark = None + if buffer_.get_char_count() > 0: + if not simple and not iter_: + buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') + if move_selection: + sel_start, sel_end = buffer_.get_selection_bounds() + sel_end.backward_char() + buffer_.select_range(sel_start, sel_end) + mark = buffer_.create_mark(None, end_iter, left_gravity=True) + self.marks_queue.put(mark) + if not mark: + mark = buffer_.create_mark(None, end_iter, left_gravity=True) self.marks_queue.put(mark) - if not mark: - mark = buffer_.create_mark(None, end_iter, left_gravity=True) - self.marks_queue.put(mark) if kind == 'incoming_queue': kind = 'incoming' if old_kind == 'incoming_queue': @@ -1318,7 +1325,7 @@ 'time_sometimes') # If there's a displaymarking, print it here. if displaymarking: - self.print_displaymarking(displaymarking) + self.print_displaymarking(displaymarking, iter_=end_iter) # kind = info, we print things as if it was a status: same color, ... if kind in ('error', 'info'): kind = 'status' @@ -1328,36 +1335,43 @@ if other_text_tag: # note that color of /me may be overwritten in gc_control text_tags.append(other_text_tag) - if text.startswith('/me'): - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) + if text.startswith('/me') and not iter_: + mark1 = mark else: # not status nor /me if gajim.config.get('chat_merge_consecutive_nickname'): if kind != old_kind or self.just_cleared: self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark) + direction_mark=direction_mark, iter_=end_iter) else: self.print_real_text(gajim.config.get( - 'chat_merge_consecutive_nickname_indent')) + 'chat_merge_consecutive_nickname_indent'), + iter_=end_iter) else: self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark) + direction_mark=direction_mark, iter_=end_iter) if kind == 'incoming': text_tags.append('incomingtxt') - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) + if not iter_: + mark1 = mark elif kind == 'outgoing': text_tags.append('outgoingtxt') - mark1 = buffer_.create_mark(None, buffer_.get_end_iter(), - left_gravity=True) - self.print_subject(subject) - self.print_real_text(text, text_tags, name, xhtml, graphics=graphics) - if mark1: + if not iter_: + mark1 = mark + self.print_subject(subject, iter_=end_iter) + self.print_real_text(text, text_tags, name, xhtml, graphics=graphics, + iter_=end_iter) + if not iter_ and mark1: mark2 = buffer_.create_mark(None, buffer_.get_end_iter(), left_gravity=True) if kind == 'incoming': + if name in self.last_received_message_marks: + m = self.last_received_message_marks[name][1] + buffer_.delete_mark(m) self.last_received_message_marks[name] = [mark1, mark2] elif kind == 'outgoing': + m = self.last_sent_message_marks[1] + if m: + buffer_.delete_mark(m) self.last_sent_message_marks = [mark1, mark2] # scroll to the end of the textview if at_the_end or kind == 'outgoing': @@ -1370,6 +1384,7 @@ self.just_cleared = False buffer_.end_user_action() + return end_iter def get_time_to_show(self, tim, direction_mark=''): """ @@ -1407,23 +1422,30 @@ elif text.startswith('/me ') or text.startswith('/me\n'): return kind - def print_displaymarking(self, displaymarking): + def print_displaymarking(self, displaymarking, iter_=None): bgcolor = displaymarking.getAttr('bgcolor') or '#FFF' fgcolor = displaymarking.getAttr('fgcolor') or '#000' text = displaymarking.getData() if text: buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() tag = self.displaymarking_tags.setdefault(bgcolor + '/' + fgcolor, buffer_.create_tag(None, background=bgcolor, foreground=fgcolor)) buffer_.insert_with_tags(end_iter, '[' + text + ']', tag) end_iter = buffer_.get_end_iter() buffer_.insert_with_tags(end_iter, ' ') - def print_name(self, name, kind, other_tags_for_name, direction_mark=''): + def print_name(self, name, kind, other_tags_for_name, direction_mark='', + iter_=None): if name: buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() name_tags = other_tags_for_name[:] # create a new list name_tags.append(kind) before_str = gajim.config.get('before_nickname') @@ -1453,7 +1475,8 @@ try: if name and (text.startswith('/me ') or text.startswith('/me\n')): xhtml = xhtml.replace('/me', '* %s' % (name,), 1) - self.tv.display_html(xhtml.encode('utf-8'), self.tv, self) + self.tv.display_html(xhtml.encode('utf-8'), self.tv, self, + iter_=iter_) return except Exception, e: gajim.log.debug('Error processing xhtml' + str(e)) diff -r 98573ca2b9e7 -r 0d4fc739c1dc src/htmltextview.py --- a/src/htmltextview.py Sun Sep 08 18:11:53 2013 +0200 +++ b/src/htmltextview.py Sun Sep 08 18:18:23 2013 +0200 @@ -656,7 +656,7 @@ def handle_specials(self, text): if self.conv_textview: self.iter = self.conv_textview.detect_and_print_special_text(text, - self._get_style_tags()) + self._get_style_tags(), iter_=self.iter) else: self._insert_text(text) @@ -815,8 +815,8 @@ self.id_ = self.connect('button-release-event', self.on_left_mouse_button_release) buffer_ = self.get_buffer() - buffer_.create_tag('eol', scale = pango.SCALE_XX_SMALL) - + buffer_.create_tag('eol') + self.tooltip = tooltips.BaseTooltip() self.config = gajim.config self.interface = gajim.interface @@ -1018,9 +1018,12 @@ # self.hyperlink_handler can be overwritten, so call it when needed self.hyperlink_handler(texttag, widget, event, iter_, kind) - def display_html(self, html, textview, conv_textview): + def display_html(self, html, textview, conv_textview, iter_=None): buffer_ = self.get_buffer() - eob = buffer_.get_end_iter() + if iter_: + eob = iter_ + else: + eob = buffer_.get_end_iter() ## this works too if libxml2 is not available # parser = xml.sax.make_parser(['drv_libxml2']) # parser.setFeature(xml.sax.handler.feature_validation, True)

1 0

gajim: add twiter icon to disco, better irc detection, use addre...
by Gajim 08 Sep '13

08 Sep '13

changeset 98573ca2b9e7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=98573ca2b9e7 description: add twiter icon to disco, better irc detection, use address when identidy doesn't help enough. Fixes #7396 diffstat: src/disco.py | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diffs (99 lines): diff -r 5dfc7eae3e90 -r 98573ca2b9e7 src/disco.py --- a/src/disco.py Wed Sep 04 17:31:12 2013 +0200 +++ b/src/disco.py Sun Sep 08 18:11:53 2013 +0200 @@ -94,6 +94,7 @@ # Transports ('conference', 'irc'): (ToplevelAgentBrowser, 'irc'), ('_jid', 'irc'): (False, 'irc'), + ('gateway', 'irc'): (False, 'irc'), ('gateway', 'aim'): (False, 'aim'), ('_jid', 'aim'): (False, 'aim'), ('gateway', 'gadu-gadu'): (False, 'gadu-gadu'), @@ -113,6 +114,7 @@ ('gateway', 'facebook'): (False, 'facebook'), ('_jid', 'facebook'): (False, 'facebook'), ('gateway', 'tv'): (False, 'tv'), + ('gateway', 'twitter'): (False, 'twitter'), } # Category type to "human-readable" description string, and sort priority @@ -292,11 +294,12 @@ if not self._cbs[cbkey]: del self._cbs[cbkey] - def get_icon(self, identities = []): + def get_icon(self, identities = [], addr=''): """ Return the icon for an agent """ # Grab the first identity with an icon + quiet = False for identity in identities: try: cat, type_ = identity['category'], identity['type'] @@ -308,17 +311,22 @@ break else: # Loop fell through, default to unknown - info = _agent_type_info[(0, 0)] - filename = info[1] - if not filename: # we don't have an image to show for this type - filename = 'jabber' + filename = addr.split('.')[0] + quiet = True # Use the cache if possible if filename in _icon_cache: return _icon_cache[filename] # Or load it - pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-' + filename, size=32) - # Store in cache - _icon_cache[filename] = pix + pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-' + filename, size=32, + quiet=quiet) + if pix: + # Store in cache + _icon_cache[filename] = pix + return pix + if 'jabber' in _icon_cache: + return _icon_cache['jabber'] + pix = gtkgui_helpers.get_icon_pixmap('gajim-agent-jabber', size=32) + _icon_cache['jabber'] = pix return pix def get_browser(self, identities=[], features=[]): @@ -942,7 +950,7 @@ self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=self._get_agent_address()) self.window.banner_icon.set_from_pixbuf(pix) self.window.banner_icon.show() @@ -1211,7 +1219,7 @@ identity = {'category': '_jid', 'type': type_} identities.append(identity) # Set the pixmap for the row - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=addr) self.model.append(None, (self.jid, self.node, pix, descr, 1)) # Grab info on the service self.cache.get_info(self.jid, self.node, self._agent_info, force=False) @@ -1699,7 +1707,7 @@ # Put it in the 'other' category for now cat_args = ('other',) # Set the pixmap for the row - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=addr) # Put it in the right category cat = self._find_category(*cat_args) if not cat: @@ -1731,7 +1739,7 @@ self._update_progressbar() # Search for an icon and category we can display - pix = self.cache.get_icon(identities) + pix = self.cache.get_icon(identities, addr=addr) cat, type_ = None, None for identity in identities: try:

1 0

gajim: SynchroniseSelectAccountDialog, ClientCertChooserDialog s...
by Gajim 07 Sep '13

07 Sep '13

changeset 5f1bb1daa116 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=5f1bb1daa116 description: SynchroniseSelectAccountDialog, ClientCertChooserDialog set transient_for. See #7185 diffstat: src/dialogs.py | 10 ++++++---- 1 файлов изменено, 6 вставок(+), 4 удалений(-) различия (34 строк): diff -r 4599fa734cf9 -r 5f1bb1daa116 src/dialogs.py --- a/src/dialogs.py Sat Sep 07 22:06:48 2013 +0400 +++ b/src/dialogs.py Sat Sep 07 22:27:45 2013 +0400 @@ -1454,10 +1454,10 @@ """ def __init__(self, title_text, action, buttons, default_response, select_multiple=False, current_folder=None, on_response_ok=None, - on_response_cancel=None): - - gtk.FileChooserDialog.__init__(self, title=title_text, action=action, - buttons=buttons) + on_response_cancel=None, transient_for=None): + + gtk.FileChooserDialog.__init__(self, title=title_text, + parent=transient_for, action=action, buttons=buttons) self.set_default_response(default_response) self.set_select_multiple(select_multiple) @@ -2665,6 +2665,7 @@ self.account = account self.xml = gtkgui_helpers.get_gtk_builder('synchronise_select_account_dialog.ui') self.dialog = self.xml.get_object('synchronise_select_account_dialog') + self.dialog.set_transient_for(gajim.interface.instances['accounts'].window) self.accounts_treeview = self.xml.get_object('accounts_treeview') model = gtk.ListStore(str, str, bool) self.accounts_treeview.set_model(model) @@ -4663,6 +4664,7 @@ FileChooserDialog.__init__(self, title_text=_('Choose Client Cert #PCKS12'), + transient_for=gajim.interface.instances['accounts'].window, action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK),

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