* don't show a reload dialog when runing embedded

3 files changed, 12 insertions, 1 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 099576d0..ae2d5ecc 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -73,6 +73,7 @@ class SoftwareProperties(SimpleGladeApp):
       self.window_main.set_transient_for(parent)
 
     # If externally called, reparent to external application.
+    self.options = options
     if options and options.toplevel != None:
       toplevel = gtk.gdk.window_foreign_new(int(options.toplevel))
       self.window_main.window.set_transient_for(toplevel)
@@ -344,7 +345,7 @@ class SoftwareProperties(SimpleGladeApp):
     # show a dialog that a reload of the channel information is required
     # only if there is no parent defined
     if self.modified == True and \
-       self.window_main.get_transient_for() == None:
+       self.options.toplevel == None:
         d = dialog_cache_outdated.DialogCacheOutdated(self.window_main,
                                                       self.datadir)
         res = d.run()
diff --git a/debian/changelog b/debian/changelog
index ba1cbf07..97151480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+update-manager (0.42.2ubuntu8) dapper; urgency=low
+
+  * Better English (tm)  (fixes #35985)
+  * Use the the number of available and not selected updates to determinate
+    if the system is up-to-date (fixes #35300)
+  * fix ui problem with software preferences (fixes #35987)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 22 Mar 2006 21:57:28 +0100
+
 update-manager (0.42.2ubuntu7) dapper; urgency=low
 
   * various spelling fixes and ui-glitches 
diff --git a/setup.py b/setup.py
index a5916dfa..0ed64179 100755
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='update-manager',
                   ),
                   ('share/pixmaps',
                    ["data/update-manager.png"]
+                  ),
                   ] + I18NFILES + HELPFILES,
       )