* SoftwareProperties/SoftwareProperties.py:

  - small fixes to make it easy to embedd the software properties
* UpdateManager.py:
  - don't "call" gnome-software-properties but import it and run
    it as part of update-manager
* channels/Ubuntu.info.in:
  - remove certain translations flags

3 files changed, 60 insertions, 24 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 6f053e35..baf42430 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -66,7 +66,7 @@ class SoftwareProperties(SimpleGladeApp):
     self.gconfclient = gconf.client_get_default()
 
     # If externally called, reparent to external application.
-    if options.toplevel != None:
+    if options and options.toplevel != None:
       toplevel = gtk.gdk.window_foreign_new(int(options.toplevel))
       self.window_main.window.set_transient_for(toplevel)
       
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index ba6c5565..99126e79 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -577,27 +577,47 @@ class UpdateManager(SimpleGladeApp):
     """ start gnome-software preferences """
     # args: "-n" means we take care of the reloading of the
     # package list ourself
-    apt_pkg.PkgSystemUnLock()
-    args = ['/usr/bin/gnome-software-properties', '-n']
-    child = subprocess.Popen(args)
-    self.window_main.set_sensitive(False)
-    res = None
-    while res == None:
-      res = child.poll()
-      time.sleep(0.05)
-      while gtk.events_pending():
-        gtk.main_iteration()
+    #apt_pkg.PkgSystemUnLock()
+    #args = ['/usr/bin/gnome-software-properties', '-n']
+    #child = subprocess.Popen(args)
+    #self.window_main.set_sensitive(False)
+    #res = None
+    #while res == None:
+    #  res = child.poll()
+    #  time.sleep(0.05)
+    ##  while gtk.events_pending():
+    #    gtk.main_iteration()
     # repository information changed, call "reload"
-    try:
-        apt_pkg.PkgSystemLock()
-    except SystemError:
-	print "Error geting the cache"
-    apt_pkg.PkgSystemLock()
-    if res > 0:
-      self.on_button_reload_clicked(None)
+    #try:
+    #    apt_pkg.PkgSystemLock()
+    #except SystemError:
+    #	print "Error geting the cache"
+    #    apt_pkg.PkgSystemLock()
+    #    if res > 0:
+    #      self.on_button_reload_clicked(None)
+    #    self.window_main.set_sensitive(True)
+    self.window_main.set_sensitive(False)
+    from SoftwareProperties import SoftwareProperties
+    prop = SoftwareProperties(self.datadir, None)
+    prop.window_main.set_transient_for(self.window_main)
+    prop.run()
+    prop.window_main.hide()
+    if prop.modified:
+        primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
+                  _("Repositories changed")
+        secondary = _("You need to reload the package list from the servers "
+                      "for your changes to take effect. Do you want to do "
+                      "this now?") 
+        dialog = gtk.MessageDialog(self.window_main,gtk.DIALOG_MODAL,
+                               gtk.MESSAGE_INFO,gtk.BUTTONS_YES_NO,"")
+        dialog.set_markup(primary);
+        dialog.format_secondary_text(secondary);
+        res = dialog.run()
+        dialog.destroy()
+        if res == gtk.RESPONSE_YES:
+            self.on_button_reload_clicked(None)
     self.window_main.set_sensitive(True)
 
-
   def fillstore(self):
 
     # clean most objects
diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in
index 344ce243..b347c39a 100644
--- a/channels/Ubuntu.info.in
+++ b/channels/Ubuntu.info.in
@@ -1,9 +1,25 @@
 _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/changelog
 
+Suite: dapper
+RepositoryType: deb
+BaseURI: http://archive.ubuntu.com/ubuntu/
+_Description: Breezy 6.04 "Dapper Drake"
+Component: main
+Enabled: 1
+_CompDescription: Oficially supported
+Component: restricted
+Enabled: 1
+_CompDescription: Restricted copyright
+Component: universe
+Enabled: 0
+_CompDescription: Community maintained (Universe)
+Component: multiverse
+Enabled: 0
+_CompDescription: Non-free (Multiverse)
 
 Suite: breezy
 RepositoryType: deb
-_BaseURI: http://archive.ubuntu.com/ubuntu/
+BaseURI: http://archive.ubuntu.com/ubuntu/
 _Description: Breezy 5.10 "Breezy Badger"
 Component: main
 Enabled: 1
@@ -20,7 +36,7 @@ _CompDescription: Non-free (Multiverse)
 
 Suite: breezy-security
 RepositoryType: deb
-_BaseURI: http://security.ubuntu.com/ubuntu/
+BaseURI: http://security.ubuntu.com/ubuntu/
 _Description: Ubuntu 5.10 Security Updates
 Component: main
 Enabled: 1
@@ -37,7 +53,7 @@ _CompDescription: Non-free (Multiverse)
 
 Suite: breezy-updates
 RepositoryType: deb
-_BaseURI: http://archive.ubuntu.com/ubuntu/
+BaseURI: http://archive.ubuntu.com/ubuntu/
 _Description: Ubuntu 5.10 Updates
 Component: main
 Enabled: 1
@@ -54,7 +70,7 @@ _CompDescription: Non-free (Multiverse)
 
 Suite: hoary
 RepositoryType: deb
-_BaseURI: http://archive.ubuntu.com/ubuntu/
+BaseURI: http://archive.ubuntu.com/ubuntu/
 _Description: Ubuntu 5.04 "Hoary Hedgehog"
 Component: main
 Enabled: 1
@@ -71,7 +87,7 @@ _CompDescription: Non-free (Multiverse)
 
 Suite: hoary-security
 RepositoryType: deb
-_BaseURI: http://security.ubuntu.com/ubuntu/
+BaseURI: http://security.ubuntu.com/ubuntu/
 _Description: Ubuntu 5.04 Security Updates
 Component: main
 Enabled: 1