From 201f7bd56950d7b3cea7d5e13e274671f0e8b6f8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Sep 2008 10:06:54 -0700
Subject: [PATCH] Fix regression causing entries to remain grayed out in the
 device books list after deletion

---
 src/calibre/gui2/library.py | 10 +++++-----
 src/calibre/gui2/main.py    |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py
index cb296b637b..61bef5c666 100644
--- a/src/calibre/gui2/library.py
+++ b/src/calibre/gui2/library.py
@@ -559,17 +559,17 @@ class DeviceBooksModel(BooksModel):
         self.marked_for_deletion = {}
 
 
-    def mark_for_deletion(self, id, rows):
-        self.marked_for_deletion[id] = self.indices(rows)
+    def mark_for_deletion(self, job, rows):
+        self.marked_for_deletion[job] = self.indices(rows)
         for row in rows:
             indices = self.row_indices(row)
             self.emit(SIGNAL('dataChanged(QModelIndex, QModelIndex)'), indices[0], indices[-1])
 
 
-    def deletion_done(self, id, succeeded=True):
-        if not self.marked_for_deletion.has_key(id):
+    def deletion_done(self, job, succeeded=True):
+        if not self.marked_for_deletion.has_key(job):
             return
-        rows = self.marked_for_deletion.pop(id)
+        rows = self.marked_for_deletion.pop(job)
         for row in rows:
             if not succeeded:
                 indices = self.row_indices(self.index(row, 0))
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index c25ea38131..86ee519788 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -571,9 +571,9 @@ class Main(MainWindow, Ui_MainWindow):
         else:
             view = self.memory_view if self.stack.currentIndex() == 1 else self.card_view
             paths = view.model().paths(rows)
-            id = self.remove_paths(paths)
-            self.delete_memory[id] = (paths, view.model())
-            view.model().mark_for_deletion(id, rows)
+            job = self.remove_paths(paths)
+            self.delete_memory[job] = (paths, view.model())
+            view.model().mark_for_deletion(job, rows)
             self.status_bar.showMessage(_('Deleting books from device.'), 1000)
 
     def remove_paths(self, paths):
@@ -584,7 +584,7 @@ class Main(MainWindow, Ui_MainWindow):
         Called once deletion is done on the device
         '''
         for view in (self.memory_view, self.card_view):
-            view.model().deletion_done(id, bool(job.exception))
+            view.model().deletion_done(job, bool(job.exception))
         if job.exception is not None:
             self.device_job_exception(job)            
             return