* Use the correct signal handler on_opt_...

* Do not try to get the active entry of the combo box if none is selected
* Remove unsupported "immediatley" autoclean
* Fixed checks (CONF_MAP -> apt config)

1 files changed, 12 insertions, 10 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 21f42cf6..5422ba55 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -125,7 +125,6 @@ class SoftwareProperties(SimpleGladeApp):
     self.combobox_delete_interval.append_text("After one week")
     self.combobox_delete_interval.append_text("After two weeks")
     self.combobox_delete_interval.append_text("After one month")
-    self.combobox_delete_interval.append_text("Immediatly")
 
     # If a custom period is defined add an corresponding entry
     if not delete_days in self.combobox_delete_interval_mapping.values():
@@ -139,7 +138,7 @@ class SoftwareProperties(SimpleGladeApp):
         self.combobox_update_interval.set_active(key)
         break
 
-    if delete_days >= 1 and CONF_MAP["autoclean"] != 0:
+    if delete_days >= 1 and apt_pkg.Config.FindI(CONF_MAP["autoclean"]) != 0:
       self.checkbutton_auto_delete.set_active(True)
       self.combobox_delete_interval.set_sensitive(True)
     else:
@@ -147,7 +146,7 @@ class SoftwareProperties(SimpleGladeApp):
       self.combobox_delete_interval.set_sensitive(False)
 
     # Autodownload
-    if CONF_MAP["autodownload"] == 1:
+    if apt_pkg.Config.FindI(CONF_MAP["autodownload"]) == 1:
       self.checkbutton_auto_download.set_active(True)
     else:
       self.checkbutton_auto_download.set_active(False)
@@ -206,13 +205,14 @@ class SoftwareProperties(SimpleGladeApp):
 
   def on_combobox_update_interval_changed(self, widget):
     i = self.combobox_update_interval.get_active()
-    value = self.combobox_interval_mapping[i]
-    # Only write the key if it has changed
-    if not value == apt_pkg.Config.FindI(CONF_MAP["autoupdate"]):
-        apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value))
-        self.write_config()
+    if i != -1:
+        value = self.combobox_interval_mapping[i]
+        # Only write the key if it has changed
+        if not value == apt_pkg.Config.FindI(CONF_MAP["autoupdate"]):
+            apt_pkg.Config.Set(CONF_MAP["autoupdate"], str(value))
+            self.write_config()
       
-  def on_opt_autoupdate_toggled(self, widget):  
+  def on_opt_autoupdate_toggled(self, widget):
     if self.checkbutton_auto_update.get_active():
       self.combobox_update_interval.set_sensitive(True)
       # if no frequency was specified use daily
@@ -230,8 +230,10 @@ class SoftwareProperties(SimpleGladeApp):
 
   def on_opt_autodownload_toggled(self, widget):  
     if self.checkbutton_auto_download.get_active():
+        self.checkbutton_auto_download.set_active(True)
         apt_pkg.Config.Set(CONF_MAP["autodownload"], str(1))
     else:
+        self.checkbutton_auto_download.set_active(False)
         apt_pkg.Config.Set(CONF_MAP["autodownload"], str(0))
     # FIXME: Write config options, apt_pkg should be able to do this.
     self.write_config()
@@ -244,7 +246,7 @@ class SoftwareProperties(SimpleGladeApp):
         apt_pkg.Config.Set(CONF_MAP["max_age"], str(value))
         self.write_config()
       
-  def opt_autodelete_toggled(self, widget):  
+  def on_opt_autodelete_toggled(self, widget):  
     if self.checkbutton_auto_delete.get_active():
       self.combobox_delete_interval.set_sensitive(True)
       # if no frequency was specified use daily