From 251f5ca7fd2996ac44b906221c151579d578eb4c Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Tue, 28 Jun 2011 19:50:43 +0100
Subject: [PATCH] Ready to push

---
 src/calibre/gui2/preferences/look_feel.ui | 7 +------
 src/calibre/gui2/tag_browser/view.py      | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/preferences/look_feel.ui b/src/calibre/gui2/preferences/look_feel.ui
index 8dadfe3424..f8dc9dc782 100644
--- a/src/calibre/gui2/preferences/look_feel.ui
+++ b/src/calibre/gui2/preferences/look_feel.ui
@@ -250,11 +250,6 @@
            <property name="text">
             <string>Default author link template:</string>
            </property>
-           <property name="toolTip">
-            <string><p>Enter a template that will be used to create a link for
-an author in the books information dialog. Used when no link has been
-provided for the author in Manage Authors.</p></string>
-           </property>
            <property name="buddy">
             <cstring>opt_default_author_link</cstring>
            </property>
@@ -275,7 +270,7 @@ provided for the author in Manage Authors.</p></string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
+       <item row="1" column="1">
         <widget class="QLabel" name="label_3">
          <property name="text">
           <string>Note that &lt;b&gt;comments&lt;/b&gt; will always be displayed at the end, regardless of the position you assign here.</string>
diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py
index e9059d78aa..586d01ff87 100644
--- a/src/calibre/gui2/tag_browser/view.py
+++ b/src/calibre/gui2/tag_browser/view.py
@@ -136,7 +136,7 @@ class TagsView(QTreeView): # {{{
         return expanded_categories, state_map
 
     def reread_collapse_parameters(self):
-        self._model.reread_collapse_model(self.get_state())
+        self._model.reread_collapse_model(self.get_state()[1])
 
     def set_database(self, db, tag_match, sort_by):
         self._model.set_database(db)