From bc2abb333b0cd053729f226cd8ec5adf1054d52f Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Wed, 29 Sep 2010 18:59:07 +0100
Subject: [PATCH] Merge from trunk

---
 src/calibre/gui2/actions/choose_library.py | 1 -
 src/calibre/gui2/dialogs/metadata_bulk.py  | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/src/calibre/gui2/actions/choose_library.py b/src/calibre/gui2/actions/choose_library.py
index d3045fecf4..2f8beab976 100644
--- a/src/calibre/gui2/actions/choose_library.py
+++ b/src/calibre/gui2/actions/choose_library.py
@@ -217,7 +217,6 @@ class ChooseLibraryAction(InterfaceAction):
     def backup_status(self, location):
         dirty_text = 'no'
         try:
-            print 'here'
             dirty_text = \
                   unicode(self.gui.library_view.model().db.dirty_queue_length())
         except:
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index 4fc85f2b30..09a196ca58 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -658,12 +658,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
                 do_remove_conv, do_auto_author, series, do_series_restart,
                 series_start_value, do_title_case, clear_series)
 
-#        bb = BlockingBusy(_('Applying changes to %d books. This may take a while.')
-#                %len(self.ids), parent=self)
-#        self.worker = Worker(args, self.db, self.ids,
-#                getattr(self, 'custom_column_widgets', []),
-#                Dispatcher(bb.accept, parent=bb))
-
         bb = MyBlockingBusy(_('Applying changes to %d books.\nPhase {0} {1}%%.')
                 %len(self.ids), args, self.db, self.ids,
                 getattr(self, 'custom_column_widgets', []),
@@ -673,7 +667,6 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
         # which can slow down bulk editing of large numbers of books
         self.model.stop_metadata_backup()
         try:
-#            self.worker.start()
             bb.exec_()
         finally:
             self.model.start_metadata_backup()