Merge branch 'master' of https://git.maemo.org/projects/feedingit

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 817e28b..6ae786d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ feedingit (0.9.1-6) stable; urgency=low
 
  -- Yves <yves@marcoz.org>  Thu, 29 Dec 2011 21:51:19 -0800
 
+feedingit (0.9.1-5) stable; urgency=low
+
+  * Fixed bugs for automatic update and settings
+
+ -- Yves <yves@marcoz.org>  Wed, 28 Dec 2011 21:51:19 -0800
 
 feedingit (0.9.1-4) stable; urgency=low
 

diff --git a/psa_harmattan/feedingit/pysrc/config.py b/psa_harmattan/feedingit/pysrc/config.py
index d6a9e8d..7911299 100644 (file)
--- a/psa_harmattan/feedingit/pysrc/config.py
+++ b/psa_harmattan/feedingit/pysrc/config.py
@@ -236,7 +236,7 @@ class Config():
                   (configParser.getboolean, "autoupdate", False),
                   (configParser.getboolean, "woodchuck", True),
                   (configParser.getboolean, "askedAboutWoodchuck", False),
-                  (configParser.getint, "updateInterval", 4),
+                  (configParser.getfloat, "updateInterval", 4),
                   (configParser.get, "orientation", "Automatic"),
                   (configParser.getboolean, "imageCache", False),
                   (configParser.getboolean, "proxy", True),

diff --git a/psa_harmattan/feedingit/pysrc/rss_sqlite.py b/psa_harmattan/feedingit/pysrc/rss_sqlite.py
index 3d9b32d..867e1af 100644 (file)
--- a/psa_harmattan/feedingit/pysrc/rss_sqlite.py
+++ b/psa_harmattan/feedingit/pysrc/rss_sqlite.py
@@ -1055,7 +1055,7 @@ class Listing(BaseObject):
                 # Unregister any streams that are no longer subscribed to.
                 for id in stream_ids:
                     logger.debug("Unregistering %s" % (id,))
-                    w.stream_unregister (id)
+                    wc().stream_unregister (id)
         except Exception:
             logger.exception("Registering streams with Woodchuck")