* Fixed reload information

* glade file cleanup - should fix some annoyances with focus stealing

3 files changed, 13 insertions, 11 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index 5f4b5054..099576d0 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -344,7 +344,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.window_main.get_transient_for() == None:
         d = dialog_cache_outdated.DialogCacheOutdated(self.window_main,
                                                       self.datadir)
         res = d.run()
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 27e6b7bb..1c996a66 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -224,6 +224,8 @@ class UpdateManager(SimpleGladeApp):
                             None, domain="update-manager")
 
     self.window_main.set_sensitive(False)
+    self.window_main.grab_focus()
+    self.button_close.grab_focus()
 
     self.packages = []
     self.dl_size = 0
@@ -237,7 +239,7 @@ class UpdateManager(SimpleGladeApp):
 
     # useful exit stuff
     self.window_main.connect("delete_event", self.close)
-    self.button_cancel.connect("clicked", lambda w: self.exit())
+    self.button_close.connect("clicked", lambda w: self.exit())
 
     # the treeview (move into it's own code!)
     self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, str, str, str,
@@ -425,7 +427,7 @@ class UpdateManager(SimpleGladeApp):
           self.expander_details.set_sensitive(False)
           self.treeview_update.set_sensitive(False)
           self.label_downsize.set_text=""
-          self.button_cancel.grab_default()
+          self.button_close.grab_default()
       else:
           text_header = "<big><b>"+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"</b></big>"
           
diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade
index ac7a0345..cfa5176c 100644
--- a/data/UpdateManager.glade
+++ b/data/UpdateManager.glade
@@ -7,7 +7,7 @@
   <property name="visible">True</property>
   <property name="title" translatable="yes">Software Updates</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="default_height">600</property>
   <property name="resizable">True</property>
@@ -783,7 +783,7 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkButton" id="button_cancel">
+		<widget class="GtkButton" id="button_close">
 		  <property name="visible">True</property>
 		  <property name="can_default">True</property>
 		  <property name="can_focus">True</property>
@@ -818,7 +818,7 @@
   <property name="title" translatable="yes">Release Notes</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="default_width">600</property>
   <property name="default_height">500</property>
   <property name="resizable">True</property>
@@ -906,7 +906,7 @@
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -1124,7 +1124,7 @@
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
+  <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -1342,8 +1342,8 @@ Your system does not check for updates automatically. You can configure this beh
   <property name="border_width">6</property>
   <property name="title" translatable="yes"></property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">True</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -1351,7 +1351,7 @@ Your system does not check for updates automatically. You can configure this beh
   <property name="skip_pager_hint">True</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
+  <property name="focus_on_map">False</property>
   <property name="urgency_hint">False</property>
 
   <child>