# HG changeset patch
# User Chris Cannam
# Date 1331043909 0
# Node ID da2dd0e290acaa334888a0c14f5ebcfea9e28faf
# Parent  88ec0ae91dccfdd52a37f62e92f80a2aaa856fc6# Parent  012ba1b83328fc7795e31cd9644a76471c619f8b
Merge

diff -r 012ba1b83328 -r da2dd0e290ac src/historywidget.cpp
--- a/src/historywidget.cpp	Thu Mar 01 22:53:54 2012 +0000
+++ b/src/historywidget.cpp	Tue Mar 06 14:25:09 2012 +0000
@@ -252,7 +252,9 @@
         toFocus->ensureVisible();
     }
 
-    updateSearchStatus();
+    if (m_searchText != "") {
+        updateSearchStatus();
+    }
     connectSceneSignals();
 }
 
diff -r 012ba1b83328 -r da2dd0e290ac src/mainwindow.cpp
--- a/src/mainwindow.cpp	Thu Mar 01 22:53:54 2012 +0000
+++ b/src/mainwindow.cpp	Tue Mar 06 14:25:09 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);