* make it not check for new distro releases anymore for dapper

2 files changed, 12 insertions, 7 deletions

diff --git a/UpdateManager/MetaRelease.py b/UpdateManager/MetaRelease.py
index 0cfb9f36..b655f36a 100644
--- a/UpdateManager/MetaRelease.py
+++ b/UpdateManager/MetaRelease.py
@@ -57,8 +57,10 @@ class MetaRelease(gobject.GObject):
 
         }
 
-    def __init__(self):
+    def __init__(self, useDevelopmentRelase=False):
         gobject.GObject.__init__(self)
+        if useDevelopmentRelase:
+            self.METARELEASE_URI = self.METARELEASE_URI_UNSTABLE
         self.metarelease_information = None
         self.downloading = True
         # we start the download thread here and we have a timeout
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 42982de4..5773c5a6 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -739,12 +739,15 @@ class UpdateManager(SimpleGladeApp):
 
 
   def main(self, options):
-    self.meta = MetaRelease()
-    # the user wants to see the development release
-    if options.devel_release:
-        self.meta.METARELEASE_URI = self.meta.METARELEASE_URI_UNSTABLE
-    self.meta.connect("new_dist_available",self.new_dist_available)
-    self.meta.connect("dist_no_longer_supported",self.dist_no_longer_supported)
+    # check if we are interessted in dist-upgrade information
+    # (we are not by default on dapper)
+    gconfclient = gconf.client_get_default() 
+    if options.check_dist_upgrades or \
+	   gconfclient.get_bool("/apps/update-manager/check_dist_upgrades"):
+      # the user wants to see the development release
+      self.meta = MetaRelease(options.devel_release)
+      self.meta.connect("new_dist_available",self.new_dist_available)
+      self.meta.connect("dist_no_longer_supported",self.dist_no_longer_supported)
     
     while gtk.events_pending():
       gtk.main_iteration()