Changeset 9619

Show
Ignore:
Timestamp:
05/11/08 19:18:44 (2 months ago)
Author:
js
Message:

* Disable OTRv1 by default.
* Don't send our JID on OTR request! It might reveal our JID in MUC!

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/common/config.py

    r9602 r9619  
    320320                        'zeroconf_email': [ opt_str, '', '', True ], 
    321321                        'use_env_http_proxy' : [opt_bool, False], 
    322                         'otr_flags': [opt_int, 59 ], 
     322                        'otr_flags': [opt_int, 58 ], 
    323323                }, {}), 
    324324                'statusmsg': ({ 

  • trunk/src/gajim.py

    r9618 r9619  
    370370                        # split away XHTML-contaminated explanatory message 
    371371                        message = unicode(message.splitlines()[0]) 
    372                         message += u"\n%s has requested an Off-the-Record private " \ 
     372                        message += u"\nThis user has requested an Off-the-Record private " \ 
    373373                                "conversation.  However, you do not have a plugin to " \ 
    374374                                "support that.\nSee http://otr.cypherpunks.ca/ for more "\ 
    375                                 "information."%gajim.get_jid_from_account(opdata['account']) 
     375                                "information.") 
    376376 
    377377                gajim.connections[opdata['account']].send_message(recipient, message,