diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-22 23:37:02 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-03-22 23:37:02 +0100 |
| commit | c6211083b2442ef7f3294335c1ef1f2522bca3ca (patch) | |
| tree | 4e75fe6abc343e50882c0bc4d39595ba0781d5f1 /UpdateManager | |
| parent | f82bab3cff10463e934a8f52892b312cdca2f225 (diff) | |
| parent | 82583acbe28b9bbfc581df8081d22191af342801 (diff) | |
| download | python-apt-c6211083b2442ef7f3294335c1ef1f2522bca3ca.tar.gz | |
* merged from the laptop branch
Diffstat (limited to 'UpdateManager')
| -rw-r--r-- | UpdateManager/DistUpgradeFetcher.py | 4 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/UpdateManager/DistUpgradeFetcher.py b/UpdateManager/DistUpgradeFetcher.py index 42ad19fe..c6b83994 100644 --- a/UpdateManager/DistUpgradeFetcher.py +++ b/UpdateManager/DistUpgradeFetcher.py @@ -27,7 +27,7 @@ import apt_pkg import tarfile import urllib2 import tempfile -import shutils +import shutil import GnuPGInterface from gettext import gettext as _ @@ -185,7 +185,7 @@ class DistUpgradeFetcher(object): # cleanup os.chdir("..") # del tmpdir - shutils.rmtree(self.tmpdir) + shutil.rmtree(self.tmpdir) def run(self): # see if we have release notes 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>" |