diff options
| author |   Andrew Gaffney <agaffney@gentoo.org> | 2007-01-22 01:47:14 +0000 |
|---|---|---|
| committer | Andrew Gaffney <agaffney@gentoo.org> | 2007-01-22 01:47:14 +0000 |
| commit | 608e17658542142a44abde7546c13f91fe78f006 (patch) | |
| tree | 6569d1a67b3fb425898bc9f90ed7ad8edf17dd58 /src/fe/gtk/LocalMounts.py | |
| parent | pass instantiated IP object to CC's __init__() (diff) | |
| download | gli-608e17658542142a44abde7546c13f91fe78f006.tar.gz gli-608e17658542142a44abde7546c13f91fe78f006.tar.bz2 gli-608e17658542142a44abde7546c13f91fe78f006.zip | |
take extra optional argument for exception data in progress_callback()
use 'devnode' instead of 'device'
git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/branches/overhaul@1634 f8877401-5920-0410-a79b-8e2d7e04ca0d
Diffstat (limited to 'src/fe/gtk/LocalMounts.py')
| -rw-r--r-- | src/fe/gtk/LocalMounts.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fe/gtk/LocalMounts.py b/src/fe/gtk/LocalMounts.py index ecfadd5..ed8cef8 100644 --- a/src/fe/gtk/LocalMounts.py +++ b/src/fe/gtk/LocalMounts.py @@ -147,7 +147,7 @@ only NFS is supported. # self.treedata = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING) self.treedata.clear() for i, mount in enumerate(self.localmounts): - self.treedata.append([i, mount['device'], mount['type'], mount['mountpoint'], mount['mountopts']]) + self.treedata.append([i, mount['devnode'], mount['type'], mount['mountpoint'], mount['mountopts']]) self.treedatasort = gtk.TreeModelSort(self.treedata) self.treeview.set_model(self.treedatasort) self.treeview.show_all() @@ -167,7 +167,7 @@ only NFS is supported. # self.mount_info_type.set_active(i) # else: # i = i + 1 - self.mount_info_device.get_child().set_text(mount['device']) + self.mount_info_device.get_child().set_text(mount['devnode']) self.mount_info_type.set_text(mount['type']) self.mount_info_mountpoint.set_text(mount['mountpoint']) self.mount_info_mountopts.set_text(mount['mountopts']) @@ -199,12 +199,12 @@ only NFS is supported. if self.mount_info_mountopts.get_text().strip() == "": self.mount_info_mountopts.set_text("defaults") if self.active_entry == -1: - self.localmounts.append({ 'device': self.mount_info_device.get_child().get_text(), 'type': self.mount_info_type.get_text(), 'mountpoint': self.mount_info_mountpoint.get_text(), 'mountopts': self.mount_info_mountopts.get_text() }) + self.localmounts.append({ 'devnode': self.mount_info_device.get_child().get_text(), 'type': self.mount_info_type.get_text(), 'mountpoint': self.mount_info_mountpoint.get_text(), 'mountopts': self.mount_info_mountopts.get_text() }) self.active_entry = -1 self.mount_button_update.set_sensitive(False) self.mount_button_delete.set_sensitive(False) else: - self.localmounts[self.active_entry]['device'] = self.mount_info_device.get_child().get_text() + self.localmounts[self.active_entry]['devnode'] = self.mount_info_device.get_child().get_text() self.localmounts[self.active_entry]['type'] = self.mount_info_type.get_text() self.localmounts[self.active_entry]['mountpoint'] = self.mount_info_mountpoint.get_text() self.localmounts[self.active_entry]['mountopts'] = self.mount_info_mountopts.get_text() @@ -234,7 +234,7 @@ only NFS is supported. progress = ProgressDialog(self.controller, ("mount_local_partitions", ), self.progress_callback) progress.run() - def progress_callback(self, result): + def progress_callback(self, result, data=None): if result == PROGRESS_DONE: self.controller.load_screen("Network Mounts") |