gget r6 - trunk/gget

[johans svn gnome org]

Author: johans
Date: Mon Jun 16 11:15:38 2008
New Revision: 6
URL: http://svn.gnome.org/viewvc/gget?rev=6&view=rev

Log:
Fixed infinite loop and some preferences logic.

Modified:
   trunk/gget/PreferencesDialog.py

Modified: trunk/gget/PreferencesDialog.py
==============================================================================
--- trunk/gget/PreferencesDialog.py	(original)
+++ trunk/gget/PreferencesDialog.py	Mon Jun 16 11:15:38 2008
@@ -39,6 +39,7 @@
         self.main_window_checkbutton.set_active(self.config.show_main_window)
         self.autostart_checkbutton.set_active(self.config.autostart)
         self.autoresume_checkbutton.set_active(self.config.autoresume)
+
         if self.config.ask_for_location:
             self.ask_folder_radiobutton.set_active(True)
         else:
@@ -106,6 +107,13 @@
         elif entry.value.type == gconf.VALUE_BOOL:
             value = entry.value.get_bool()
             self.status_icon_checkbutton.set_active(value)
+            # Main window must be showed if no status icon is showed
+            if not value:
+                self.main_window_checkbutton.set_sensitive(False)
+                self.config.show_main_window = True
+            else:
+                if not self.main_window_checkbutton.get_property("sensitive"):
+                    self.main_window_checkbutton.set_sensitive(True)
         else:
             self.status_icon_checkbutton.set_active(True)
 
@@ -142,6 +150,8 @@
         elif entry.value.type == gconf.VALUE_BOOL:
             value = entry.value.get_bool()
             self.ask_folder_radiobutton.set_active(value)
+            if not value:
+                self.specify_folder_radiobutton.set_active(True)
         else:
             self.ask_folder_radiobutton.set_active(True)
 
@@ -169,7 +179,10 @@
 
     def __default_folder_filechooserbutton_current_folder_changed(self,
             filechooserbutton):
-        self.config.default_folder = filechooserbutton.get_current_folder()
+        folder = filechooserbutton.get_current_folder()
+        # Prevent infinite loop
+        if self.config.default_folder != folder:
+            self.config.default_folder = folder
 
     def __close_button_clicked(self, button):
         self.dialog.hide()