Commits July 2008

commits@gajim.org

7 participants
229 discussions

[commit-gajim] r9979 - trunk/src/common
by js＠gajim.org 21 Jul '08

21 Jul '08

Author: js Date: 2008-07-22 00:55:03 +0200 (Tue, 22 Jul 2008) New Revision: 9979 Modified: trunk/src/common/defs.py Log: Remove rev keyword code again as this doesn't work. It's only updated when the defs.py file is changed. Modified: trunk/src/common/defs.py =================================================================== --- trunk/src/common/defs.py 2008-07-21 21:44:40 UTC (rev 9978) +++ trunk/src/common/defs.py 2008-07-21 22:55:03 UTC (rev 9979) @@ -5,10 +5,6 @@ version = '0.11.4.4-svn' -rev = re.sub('[^0-9]', '', '$Rev$') -if rev is not '': - version += ' r' + rev - import sys, os.path for base in ('.', 'common'): sys.path.append(os.path.join(base, '.libs')) Property changes on: trunk/src/common/defs.py ___________________________________________________________________ Name: svn:keywords - Rev

1 0

[commit-gajim] r9978 - trunk/src
by steve-e＠gajim.org 21 Jul '08

21 Jul '08

Author: steve-e Date: 2008-07-21 23:44:40 +0200 (Mon, 21 Jul 2008) New Revision: 9978 Modified: trunk/src/gajim.py trunk/src/roster_window.py Log: Some cleanups and an attempt to fix the MUC highlight problem. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-21 20:17:35 UTC (rev 9977) +++ trunk/src/gajim.py 2008-07-21 21:44:40 UTC (rev 9978) @@ -710,7 +710,6 @@ if ji in jid_list: # Update existing iter self.roster.draw_contact(ji, account) - self.roster.draw_group(_('Transports'), account) if new_show > 1 and ji in gajim.transport_avatar[account]: # transport just signed in. request avatars for jid_ in gajim.transport_avatar[account][ji]: @@ -2107,7 +2106,8 @@ else: # add contact to roster ("Not In The Roster") if he is not self.roster.add_to_not_in_the_roster(account, jid) - self.roster.draw_contact(jid, account) + else: + self.roster.draw_contact(jid, account) # Select the contact in roster, it's visible because it has events. self.roster.select_contact(jid, account) @@ -2124,8 +2124,8 @@ w = self.msg_win_mgr.get_window(jid, account) if jid in self.minimized_controls[account]: self.roster.on_groupchat_maximized(None, jid, account) - - if not ctrl: + return + else: ctrl = self.msg_win_mgr.get_gc_control(jid, account) elif type_ in ('printed_chat', 'chat', ''): @@ -3134,7 +3134,6 @@ dialogs.AspellDictError(lang) if gajim.config.get('soundplayer') == '': - print 'first' # only on first time Gajim starts commands = ('aplay', 'play', 'esdplay', 'artsplay') for command in commands: Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-07-21 20:17:35 UTC (rev 9977) +++ trunk/src/roster_window.py 2008-07-21 21:44:40 UTC (rev 9978) @@ -759,7 +759,7 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) if contact.is_groupchat(): if jid in gajim.interface.minimized_controls[account]: - gajim.interface.minimized_controls[account][jid] + del gajim.interface.minimized_controls[account][jid] self.remove_contact(jid, account, force=True, backend=True) return True else: @@ -2720,15 +2720,14 @@ if not jid in gajim.interface.minimized_controls[account]: return ctrl = gajim.interface.minimized_controls[account][jid] - mw = gajim.interface.msg_win_mgr.get_window(ctrl.contact.jid, - ctrl.account) + mw = gajim.interface.msg_win_mgr.get_window(jid, account) if not mw: mw = gajim.interface.msg_win_mgr.create_window(ctrl.contact, ctrl.account, ctrl.type_id) ctrl.parent_win = mw mw.new_tab(ctrl) mw.set_active_tab(ctrl) - + mw.window.window.focus() self.remove_groupchat(jid, account) def on_edit_account(self, widget, account):

1 0

[commit-gajim] r9977 - trunk/data/pixmaps
by js＠gajim.org 21 Jul '08

21 Jul '08

Author: js Date: 2008-07-21 22:17:35 +0200 (Mon, 21 Jul 2008) New Revision: 9977 Modified: trunk/data/pixmaps/security-low.png Log: Add a "?" on the insecure shield. Modified: trunk/data/pixmaps/security-low.png =================================================================== --- trunk/data/pixmaps/security-low.png 2008-07-21 19:55:27 UTC (rev 9976) +++ trunk/data/pixmaps/security-low.png 2008-07-21 20:17:35 UTC (rev 9977) @@ -1,9 +1,11 @@ �PNG -IHDR��abKGD��tIME� - �AL��IDAT8�m�Mh�U��/��4��3��ÀTq@Ga�� A�BܸU��,�ƍ�t]�Pq'��A]T��a�6Nkb'��|��&e��9��{��:��#��R%��ŉ,�ag�;��k��2��D��~�y��LC�w�!g��I�#-��%��Y�w͟��9�p2[�춻EZ[?r[�D�r+�r�a��㏦MO�G�ᱧ;��\��˗�Ǆ�t��W~��y��==x�SB<h�R�h��{��C|2'D�!��|@��' -`��D��|`석��[��p��k/�y�ye<V]�A4��z]D�3�T��R��;�p^qA��=��b�S��ݫ��| �� !��H��(��I�N�@0�Ϯlo/Ԫ�|=QJń��5p�V�yED ��4[{M�_� -��r�^�`� Ib�p�RcE�g��ϫ�_Mo��!�4B�uЈ8g��~�Qr� -i��2�c��e��%b��qlO�6W Nj��߽ ��`'��y�~|67S.#nHs�1[��m�o��F��a5�0�M,��CX�zm�Lr�gn��|qq�A^_^ힻ>c9��,��f -6�lپ��}��]L��Gb��.��+o��o��Z} r��2IEND�B`� \ No newline at end of file +IHDR��asRGB��bKGD�� pHYs��IDAT8�u�h�u�_��mӦ$Ѭ�L�XhF��E��"��#:)"鏌J��F?��6��J��m�6��{��~>O��x�ڗKF�VU��B%��iJ��=�>fU[��%;v=N2�ӒI!�{� � #c��9A��S�֛o��q�߶�%j�� +d�_��D��Q��%>��F�NO=g�ز-�3E�kv��y��8KW ��@��Wh_�(��1֯��PS'��t<�ע�F�3g ��)��V��}Y +d��8��p��zV��p�gߤk��J%��݁��N,��V*�2� +ad�߷�+CG�ܒ��d��^�}��zss5b+e`>��M�dQTE�ұ� ��B� +CC_��ρ/�R-��d��`>�lM>�}d�>6-�c�)�#"��]]�1p��ft�<�l��'�/��F��G�]��ɗV�7��d5��5o��uc~1��vP�� "ܿwc�D��R +*�j�� y2�S3��D +�o�scc��|��əQ�8��@�� +}{��-�7|�^��U�-��âr|۽��:��ͷp��"��ʯ-Jv5��᰸au��V�ژI��YF.M�T)�S(��/��~�u��r02z�+��B��Z��EL�O��IEND�B`� \ No newline at end of file

1 0

[commit-gajim] r9976 - trunk/src/common
by bct＠gajim.org 21 Jul '08

21 Jul '08

Author: bct Date: 2008-07-21 21:55:27 +0200 (Mon, 21 Jul 2008) New Revision: 9976 Modified: trunk/src/common/dh.py Log: correct dh prime (for real this time) Modified: trunk/src/common/dh.py =================================================================== --- trunk/src/common/dh.py 2008-07-21 19:55:16 UTC (rev 9975) +++ trunk/src/common/dh.py 2008-07-21 19:55:27 UTC (rev 9976) @@ -118,7 +118,6 @@ 287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED 1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9 93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199 -93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199 FFFFFFFF FFFFFFFF''', # group 17

1 0

[commit-gajim] r9975 - trunk/src/common
by bct＠gajim.org 21 Jul '08

21 Jul '08

Author: bct Date: 2008-07-21 21:55:16 +0200 (Mon, 21 Jul 2008) New Revision: 9975 Modified: trunk/src/common/helpers.py Log: fix esession caps condition Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-21 17:29:49 UTC (rev 9974) +++ trunk/src/common/helpers.py 2008-07-21 19:55:16 UTC (rev 9975) @@ -1340,8 +1340,7 @@ gajim.gajim_optional_features[a].append(xmpp.NS_CHATSTATES) if not gajim.config.get('ignore_incoming_xhtml'): gajim.gajim_optional_features[a].append(xmpp.NS_XHTML_IM) - if gajim.HAVE_PYCRYPTO and \ - gajim.config.get_per('accounts', a, 'autonegotiate_esessions'): + if gajim.HAVE_PYCRYPTO: gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) if gajim.config.get_per('accounts', a, 'answer_receipts'): gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS)

1 0

[commit-gajim] r9974 - trunk/src/common
by js＠gajim.org 21 Jul '08

21 Jul '08

Author: js Date: 2008-07-21 19:29:49 +0200 (Mon, 21 Jul 2008) New Revision: 9974 Modified: trunk/src/common/helpers.py Log: Remove \n from distribution name. Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-21 15:14:16 UTC (rev 9973) +++ trunk/src/common/helpers.py 2008-07-21 17:29:49 UTC (rev 9974) @@ -879,7 +879,7 @@ text = distro_name elif path_to_file.endswith('lfs-release'): # file just has version text = distro_name + ' ' + text - return text + return text.replace('\n', '') # our last chance, ask uname and strip it uname_output = get_output_of_command('uname -sr')

1 0

[commit-gajim] r9973 - trunk/src/common
by bct＠gajim.org 21 Jul '08

21 Jul '08

Author: bct Date: 2008-07-21 17:14:16 +0200 (Mon, 21 Jul 2008) New Revision: 9973 Modified: trunk/src/common/dh.py Log: corrected one of the dh primes Modified: trunk/src/common/dh.py =================================================================== --- trunk/src/common/dh.py 2008-07-21 14:36:45 UTC (rev 9972) +++ trunk/src/common/dh.py 2008-07-21 15:14:16 UTC (rev 9973) @@ -117,7 +117,8 @@ 2583E9CA 2AD44CE8 DBBBC2DB 04DE8EF9 2E8EFC14 1FBECAA6 287C5947 4E6BC05D 99B2964F A090C3A2 233BA186 515BE7ED 1F612970 CEE2D7AF B81BDD76 2170481C D0069127 D5B05AA9 -93B4EA98 8D8FDDC1 86FFFB7DC 90A6C08F 4DF435C9 34063199 +93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199 +93B4EA98 8D8FDDC1 86FFB7DC 90A6C08F 4DF435C9 34063199 FFFFFFFF FFFFFFFF''', # group 17

1 0

[commit-gajim] r9972 - trunk/src
by js＠gajim.org 21 Jul '08

21 Jul '08

Author: js Date: 2008-07-21 16:36:45 +0200 (Mon, 21 Jul 2008) New Revision: 9972 Modified: trunk/src/gajim.py Log: bct, could you please test what you commit? I was just flooded by TBs, had to kill Gajim. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-07-20 15:54:05 UTC (rev 9971) +++ trunk/src/gajim.py 2008-07-21 14:36:45 UTC (rev 9972) @@ -1737,7 +1737,7 @@ session.conn.delete_session(jid, session.thread_id) # restart the session - session.negotiate_e2e() + session.negotiate_e2e(False) def handle_event_privacy_lists_received(self, account, data): # ('PRIVACY_LISTS_RECEIVED', account, list)

1 0

[commit-gajim] r9971 - trunk/src/common
by bct＠gajim.org 20 Jul '08

20 Jul '08

Author: bct Date: 2008-07-20 17:54:05 +0200 (Sun, 20 Jul 2008) New Revision: 9971 Modified: trunk/src/common/gajim.py trunk/src/common/helpers.py Log: make esessions an optional caps feature Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2008-07-20 15:06:21 UTC (rev 9970) +++ trunk/src/common/gajim.py 2008-07-20 15:54:05 UTC (rev 9971) @@ -176,9 +176,6 @@ 'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_GAMING] -if HAVE_PYCRYPTO: - gajim_common_features.append(xmpp.NS_ESESSION) - # Optional features gajim supports per account gajim_optional_features = {} Modified: trunk/src/common/helpers.py =================================================================== --- trunk/src/common/helpers.py 2008-07-20 15:06:21 UTC (rev 9970) +++ trunk/src/common/helpers.py 2008-07-20 15:54:05 UTC (rev 9971) @@ -1340,8 +1340,9 @@ gajim.gajim_optional_features[a].append(xmpp.NS_CHATSTATES) if not gajim.config.get('ignore_incoming_xhtml'): gajim.gajim_optional_features[a].append(xmpp.NS_XHTML_IM) - if gajim.HAVE_PYCRYPTO: - gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION_INIT) + if gajim.HAVE_PYCRYPTO and \ + gajim.config.get_per('accounts', a, 'autonegotiate_esessions'): + gajim.gajim_optional_features[a].append(xmpp.NS_ESESSION) if gajim.config.get_per('accounts', a, 'answer_receipts'): gajim.gajim_optional_features[a].append(xmpp.NS_RECEIPTS) gajim.caps_hash[a] = compute_caps_hash([gajim.gajim_identity],

1 0

[commit-gajim] r9970 - in trunk/src: . common
by bct＠gajim.org 20 Jul '08

20 Jul '08

Author: bct Date: 2008-07-20 17:06:21 +0200 (Sun, 20 Jul 2008) New Revision: 9970 Modified: trunk/src/chat_control.py trunk/src/common/config.py Log: make esession autonegotiation option per-account and per-jid Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-07-20 15:06:15 UTC (rev 9969) +++ trunk/src/chat_control.py 2008-07-20 15:06:21 UTC (rev 9970) @@ -1135,6 +1135,9 @@ self.gpg_is_active = False gpg_pref = gajim.config.get_per('contacts', contact.jid, 'gpg_enabled') + e2e_pref = gajim.config.get_per('accounts', self.account, + 'autonegotiate_esessions') and gajim.config.get_per('contacts', + contact.jid, 'autonegotiate_esessions') # try GPG first if not e2e_is_active and gpg_pref and \ @@ -1155,8 +1158,7 @@ self.session and self.session.is_loggable(), True) # then try E2E # XXX: Once we have fallback to disco, remove notexistant check - elif not e2e_is_active and gajim.HAVE_PYCRYPTO \ - and gajim.config.get('autonegotiate_esessions') \ + elif not e2e_is_active and gajim.HAVE_PYCRYPTO and e2e_pref \ and gajim.capscache.is_supported(contact, NS_ESESSION) \ and not gajim.capscache.is_supported(contact, 'notexistant'): self.begin_e2e_negotiation() Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2008-07-20 15:06:15 UTC (rev 9969) +++ trunk/src/common/config.py 2008-07-20 15:06:21 UTC (rev 9970) @@ -191,7 +191,6 @@ 'tabs_border': [opt_bool, False, _('Show tabbed notebook border in chat windows?')], 'tabs_close_button': [opt_bool, True, _('Show close button in tab?')], 'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')], - 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'esession_modp': [opt_str, '5,14', _('A list of modp groups to use in a Diffie-Hellman, highest preference first, separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher numbers are more secure, but take longer to calculate when you start a session.')], 'chat_avatar_width': [opt_int, 52], 'chat_avatar_height': [opt_int, 52], @@ -277,6 +276,7 @@ 'keyid': [ opt_str, '', '', True ], 'gpg_sign_presence': [ opt_bool, True, _('If disabled, don\'t sign presences with GPG key, even if GPG is configured.') ], 'keyname': [ opt_str, '', '', True ], + 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], 'warn_when_plaintext_connection': [ opt_bool, True, _('Show a warning dialog before sending password on an plaintext connection.') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], @@ -299,7 +299,7 @@ 'http_auth': [opt_str, 'ask'], # yes, no, ask 'dont_ack_subscription': [opt_bool, False, _('Jabberd2 workaround')], # proxy65 for FT - 'file_transfer_proxies': [opt_str, + 'file_transfer_proxies': [opt_str, 'proxy.jabber.org, proxy.netlab.cz, transfer.jabber.freenet.de, proxy.jabber.cd.chalmers.se'], 'use_ft_proxies': [opt_bool, True, _('If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer.'), True], 'msgwin-x-position': [opt_int, -1], # Default is to let the wm decide @@ -361,7 +361,7 @@ 'bannerbgcolor': [ opt_color, '', '', True ], 'bannerfont': [ opt_str, '', '', True ], 'bannerfontattrs': [ opt_str, 'B', '', True ], - + # http://www.pitt.edu/~nisg/cis/web/cgi/rgb.html 'state_inactive_color': [ opt_color, 'grey62' ], 'state_composing_color': [ opt_color, 'green4' ], @@ -374,6 +374,7 @@ }, {}), 'contacts': ({ 'gpg_enabled': [ opt_bool, False, _('Is OpenPGP enabled for this contact?')], + 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session with this contact when possible?')], 'speller_language': [ opt_str, '', _('Language for which we want to check misspelled words')], }, {}), 'rooms': ({

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

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 July 2008