From 9e10b0b71c074595cccae905cd08cc186c043cd9 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 13 Aug 2010 00:03:29 -0600
Subject: [PATCH] ...

---
 src/calibre/gui2/layout.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index c47e50faab..ffd8bfe4ea 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
 from operator import attrgetter
 from functools import partial
 
-from PyQt4.Qt import QIcon, Qt, QWidget, QAction, QToolBar, QSize, \
+from PyQt4.Qt import QIcon, Qt, QWidget, QToolBar, QSize, \
     pyqtSignal, QToolButton, \
     QObject, QVBoxLayout, QSizePolicy, QLabel, QHBoxLayout, QActionGroup, \
     QMenu
@@ -201,7 +201,7 @@ class SearchBar(QWidget): # {{{
 
 class ToolBar(QToolBar): # {{{
 
-    def __init__(self, actions, donate, location_manager, parent=None):
+    def __init__(self, donate, location_manager, parent):
         QToolBar.__init__(self, parent)
         self.setContextMenuPolicy(Qt.PreventContextMenu)
         self.setMovable(False)
@@ -212,7 +212,6 @@ class ToolBar(QToolBar): # {{{
         self.donate = donate
         self.apply_settings()
 
-        self.all_actions = actions
         self.location_manager = location_manager
         self.location_manager.locations_changed.connect(self.build_bar)
         self.d_widget = QWidget()
@@ -296,9 +295,6 @@ class ToolBar(QToolBar): # {{{
 
 # }}}
 
-class Action(QAction):
-    pass
-
 class MainWindowMixin(object):
 
     def __init__(self, db):
@@ -319,7 +315,7 @@ class MainWindowMixin(object):
         self.iactions['Fetch News'].init_scheduler(db)
 
         self.search_bar = SearchBar(self)
-        self.tool_bar = ToolBar(all_actions, self.donate_button,
+        self.tool_bar = ToolBar(self.donate_button,
                 self.location_manager, self)
         self.addToolBar(Qt.TopToolBarArea, self.tool_bar)