Author: asterix Date: 2007-11-28 23:17:48 +0100 (Wed, 28 Nov 2007) New Revision: 9069
Modified: branches/gajim_0.11.3-bugfixes/src/common/optparser.py branches/gajim_0.11.3-bugfixes/src/gajim.py Log: Fix autodetection of applications to use (from trunk [9005]). fixes #3583
Modified: branches/gajim_0.11.3-bugfixes/src/common/optparser.py =================================================================== --- branches/gajim_0.11.3-bugfixes/src/common/optparser.py 2007-11-28 21:18:28 UTC (rev 9068) +++ branches/gajim_0.11.3-bugfixes/src/common/optparser.py 2007-11-28 22:17:48 UTC (rev 9069) @@ -57,7 +57,7 @@ if os.path.exists(self.__filename): #we talk about a file print _('error: cannot open %s for reading') % self.__filename - return + return False
new_version = gajim.config.get('version') for line in fd.readlines(): @@ -72,6 +72,7 @@ self.old_values = {} # clean mem
fd.close() + return True
def write_line(self, fd, opt, parents, value): if value == None:
Modified: branches/gajim_0.11.3-bugfixes/src/gajim.py =================================================================== --- branches/gajim_0.11.3-bugfixes/src/gajim.py 2007-11-28 21:18:28 UTC (rev 9068) +++ branches/gajim_0.11.3-bugfixes/src/gajim.py 2007-11-28 22:17:48 UTC (rev 9069) @@ -2060,7 +2060,7 @@ 'urlmsgcolor': gajim.config.get('urlmsgcolor'), }
- parser.read() + cfg_was_read = parser.read() # Do not set gajim.verbose to False if -v option was given if gajim.config.get('verbose'): gajim.verbose = True @@ -2094,8 +2094,7 @@ gajim.config.set_per('themes', theme_name, o, theme[d.index(o)]) - if gajim.config.get('autodetect_browser_mailer') or \ - len(gajim.connections) == 0: + if gajim.config.get('autodetect_browser_mailer') or not cfg_was_read: gtkgui_helpers.autodetect_browser_mailer()
if gajim.verbose: