Changeset 9005

Timestamp:

11/17/07 16:03:02 (13 months ago)

Author:

baron

Message:

Fixed a bug with forcing autodetection of browser/mail during startup when the
config file already existed and had a different option choosen. Added in an
'Always use OS/X default applications' option for when running on OS/X. Changed
the custom defaults to use OS/X native applications.

Location:

trunk/src

Files:

• common/config.py (modified) (1 diff)
• common/helpers.py (modified) (2 diffs)
• common/optparser.py (modified) (2 diffs)
• config.py (modified) (3 diffs)
• gajim.py (modified) (2 diffs)
• gtkgui_helpers.py (modified) (2 diffs)

trunk/src/common/config.py

@@ -54 +54 @@
         if sys.platform == 'darwin':
                 DEFAULT_OPENWITH = 'open'
-                DEFAULT_BROWSER = 'open -a firefox'
-                DEFAULT_MAILAPP = 'open -a thunderbird'
-                DEFAULT_FILE_MANAGER = 'open'
+                DEFAULT_BROWSER = 'open -a Safari'
+                DEFAULT_MAILAPP = 'open -a Mail'
+                DEFAULT_FILE_MANAGER = 'open -a Finder'
         else:
                 DEFAULT_OPENWITH = 'gnome-open'

trunk/src/common/helpers.py

@@ -430 +430 @@
                 elif gajim.config.get('openwith') == 'exo-open':
                         command = 'exo-open'
+                elif ((sys.platform == 'darwin') and
+                          (gajim.config.get('openwith') == 'open')):
+                        command = 'open'
                 elif gajim.config.get('openwith') == 'custom':
                         if kind == 'url':
@@ -457 +460 @@
                 elif gajim.config.get('openwith') == 'exo-open':
                         command = 'exo-open'
+                elif ((sys.platform == 'darwin') and
+                          (gajim.config.get('openwith') == 'open')):
+                        command = 'open'
                 elif gajim.config.get('openwith') == 'custom':
                         command = gajim.config.get('custom_file_manager')

trunk/src/common/optparser.py

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

trunk/src/config.py

@@ -400 +400 @@
 
                         if sys.platform == 'darwin':
+                                self.applications_combobox.remove_text(4)
                                 self.applications_combobox.remove_text(3)
                                 self.applications_combobox.remove_text(2)
                                 self.applications_combobox.remove_text(1)
+                                self.applications_combobox.append_text("Always use OS/X default applications")
+                                self.applications_combobox.append_text("Custom")
 
                         if gajim.config.get('autodetect_browser_mailer'):
@@ -413 +416 @@
                                 self.applications_combobox.set_active(2)
                         elif gajim.config.get('openwith') == 'exo-open':
-                                self.applications_combobox.set_active(3)                                
+                                self.applications_combobox.set_active(3)
+                        elif ((sys.platform == 'darwin') and
+                                  (gajim.config.get('openwith') == 'open')):
+                                self.applications_combobox.set_active(1)
                         elif gajim.config.get('openwith') == 'custom':
                                 if sys.platform == 'darwin':
-                                        self.applications_combobox.set_active(1)
+                                        self.applications_combobox.set_active(2)
                                 else:
                                         self.applications_combobox.set_active(4)
@@ -913 +919 @@
                                 self.xml.get_widget('custom_apps_frame').hide()
                         elif widget.get_active() == 1:
+                                self.xml.get_widget('custom_apps_frame').hide()
+                                gajim.config.set('openwith', 'open')
+                        elif widget.get_active() == 2:
                                 self.xml.get_widget('custom_apps_frame').show()
                                 gajim.config.set('openwith', 'custom')

trunk/src/gajim.py

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

trunk/src/gtkgui_helpers.py

@@ -187 +187 @@
         elif user_runs_xfce():
                 gajim.config.set('openwith', 'exo-open')
+        elif user_runs_osx():
+                gajim.config.set('openwith', 'open')
         else:
                 gajim.config.set('openwith', 'custom')
@@ -201 +203 @@
                 return True
         return False
+
+def user_runs_osx():
+        return sys.platform == 'darwin'
 
 def get_running_processes():