From 6de00d1cc5169b815d1b1f014b27483b7de90885 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 2 Sep 2011 07:23:31 +0200 Subject: [PATCH] set default value of autodetect_browser_mailer to True. Force it to True for windows --- src/common/config.py | 2 +- src/common/optparser.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index 1b8579ba1..4bb7f9b4f 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -185,7 +185,7 @@ class Config: 'networkmanager_support': [opt_bool, True, _('If True, listen to D-Bus signals from NetworkManager and change the status of accounts (provided they do not have listen_to_network_manager set to False and they sync with global status) based upon the status of the network connection.'), True], 'outgoing_chat_state_notifications': [opt_str, 'all', _('Sent chat state notifications. Can be one of all, composing_only, disabled.')], 'displayed_chat_state_notifications': [opt_str, 'all', _('Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled.')], - 'autodetect_browser_mailer': [opt_bool, False, '', True], + 'autodetect_browser_mailer': [opt_bool, True, '', True], 'print_ichat_every_foo_minutes': [opt_int, 5, _('When not printing time for every message (print_time==sometimes), print it every x minutes.')], 'confirm_close_muc': [opt_bool, True, _('Ask before closing a group chat tab/window.')], 'confirm_close_muc_rooms': [opt_str, '', _('Always ask before closing group chat tab/window in this space separated list of group chat jids.')], diff --git a/src/common/optparser.py b/src/common/optparser.py index 65a1afba7..a0ed81578 100644 --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -901,7 +901,7 @@ class OptionsParser: def update_config_to_01401(self): if 'autodetect_browser_mailer' not in self.old_values or 'openwith' \ not in self.old_values or \ - (self.old_values['autodetect_browser_mailer'] == 'False' and \ + (self.old_values['autodetect_browser_mailer'] == False and \ self.old_values['openwith'] != 'custom'): gajim.config.set('autodetect_browser_mailer', True) gajim.config.set('openwith', gajim.config.DEFAULT_OPENWITH) @@ -911,3 +911,5 @@ class OptionsParser: if 'use_stun_server' in self.old_values and self.old_values[ 'use_stun_server'] and not self.old_values['stun_server']: gajim.config.set('use_stun_server', False) + if os.name == 'nt': + gajim.config.set('autodetect_browser_mailer', True)