Changeset 9069

Timestamp:

11/28/07 23:17:48 (10 months ago)

Author:

asterix

Message:

Fix autodetection of applications to use (from trunk [9005]). fixes #3583

Location:

branches/gajim_0.11.3-bugfixes/src

Files:

• common/optparser.py (modified) (2 diffs)
• gajim.py (modified) (2 diffs)

branches/gajim_0.11.3-bugfixes/src/common/optparser.py

@@ -58 +58 @@
                                 #we talk about a file
                                 print _('error: cannot open %s for reading') % self.__filename
-                        return
+                        return False
 
                 new_version = gajim.config.get('version')
@@ -73 +73 @@
 
                 fd.close()
+                return True
 
         def write_line(self, fd, opt, parents, value):

branches/gajim_0.11.3-bugfixes/src/gajim.py

@@ -2061 +2061 @@
                 }
 
-                parser.read()
+                cfg_was_read = parser.read()
                 # Do not set gajim.verbose to False if -v option was given
                 if gajim.config.get('verbose'):
@@ -2095 +2095 @@
                                                 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()