Disable app-based auto-update (application left running)

[feedingit] / src / config.py

diff --git a/src/config.py b/src/config.py
index 5b28e2d..33b8957 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -117,10 +117,10 @@ class Config():
 
         heading('Updating')
         button = hildon.CheckButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label("Time-Based Automatic Update\n"
-                         + "(requires use of FeedingIt widget)")
-        button.set_active(self.config["autoupdate"])
-        button.connect("toggled", self.button_toggled, "autoupdate")
+        button.set_label("Widget Based Automatic Update\n"
+                         + "(See FeedingIt widget for options)")
+        #button.set_active(self.config["autoupdate"])
+        #button.connect("toggled", self.button_toggled, "autoupdate")
         vbox.pack_start(button, expand=False)
         button = hildon.CheckButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
         button.set_label("Woodchuck-Based Automatic Update")
@@ -144,9 +144,9 @@ class Config():
             button.connect("clicked", install_woodchuck_clicked)
             button.set_alignment(0,0,1,1)
             vbox.pack_start(button, expand=False)
-
-        add_setting('updateInterval')
-        add_setting('expiry')
+        else:
+            add_setting('updateInterval')
+            add_setting('expiry')
 
         heading('Network')
         button = hildon.CheckButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
@@ -237,6 +237,7 @@ class Config():
                   (configParser.getint, "expiry", 24),
                   (configParser.getboolean, "autoupdate", False),
                   (configParser.getboolean, "woodchuck", True),
+                  (configParser.getboolean, "askedAboutWoodchuck", False),
                   (configParser.getint, "updateInterval", 4),
                   (configParser.get, "orientation", "Automatic"),
                   (configParser.getboolean, "imageCache", False),
@@ -263,6 +264,7 @@ class Config():
         configParser.set(section, 'autoupdate', str(self.config["autoupdate"]))
         configParser.set(section, 'updateInterval', str(self.config["updateInterval"]))
         configParser.set(section, 'woodchuck', str(self.config["woodchuck"]))
+        configParser.set(section, 'askedAboutWoodchuck', str(self.config["askedAboutWoodchuck"]))
         configParser.set(section, 'orientation', str(self.config["orientation"]))
         configParser.set(section, 'imageCache', str(self.config["imageCache"]))
         configParser.set(section, 'proxy', str(self.config["proxy"]))
@@ -303,6 +305,11 @@ class Config():
         return self.config["autoupdate"]
     def getWoodchuckEnabled(self):
         return self.config["woodchuck"]
+    def getAskedAboutWoodchuck(self):
+        return self.config["askedAboutWoodchuck"]
+    def setAskedAboutWoodchuck(self, value):
+        self.config["askedAboutWoodchuck"] = value
+        self.saveConfig()
     def getUpdateInterval(self):
         return float(self.config["updateInterval"])
     def getReadFont(self):