# HG changeset patch
# User Chris Cannam
# Date 1331043888 0
# Node ID 88ec0ae91dccfdd52a37f62e92f80a2aaa856fc6
# Parent  e0d734fad735ed31e7612da5fb4e8a2e36d35d86
Update search in history only if there are search terms; don't use spacer in toolbar on Mac

diff -r e0d734fad735 -r 88ec0ae91dcc src/historywidget.cpp
--- a/src/historywidget.cpp	Wed Feb 29 15:24:10 2012 +0000
+++ b/src/historywidget.cpp	Tue Mar 06 14:24:48 2012 +0000
@@ -252,7 +252,9 @@
         toFocus->ensureVisible();
     }
 
-    updateSearchStatus();
+    if (m_searchText != "") {
+        updateSearchStatus();
+    }
     connectSceneSignals();
 }
 
diff -r e0d734fad735 -r 88ec0ae91dcc src/mainwindow.cpp
--- a/src/mainwindow.cpp	Wed Feb 29 15:24:10 2012 +0000
+++ b/src/mainwindow.cpp	Tue Mar 06 14:24:48 2012 +0000
@@ -3061,9 +3061,13 @@
 
     m_repoToolBar = addToolBar(tr("Remote"));
     m_repoToolBar->setIconSize(QSize(sz, sz));
-    m_repoToolBar->addWidget(new QLabel(spacer));
+    if (spacingReqd) {
+        m_repoToolBar->addWidget(new QLabel(spacer));
+    }
     m_repoToolBar->addAction(m_openAct);
-    m_repoToolBar->addWidget(new QLabel(spacer));
+    if (spacingReqd) {
+        m_repoToolBar->addWidget(new QLabel(spacer));
+    }
     m_repoToolBar->addSeparator();
     m_repoToolBar->addAction(m_hgIncomingAct);
     m_repoToolBar->addAction(m_hgPullAct);