From da4b2f0a899f00a0e5b9e66d4d6d92ea9637a38a Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood@intel.com>
Date: Wed, 19 Jun 2013 10:14:02 +0100
Subject: shell: ensure a search is in progress before activating a panel

https://bugzilla.gnome.org/show_bug.cgi?id=702469
---
 shell/cc-window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'shell')

diff --git a/shell/cc-window.c b/shell/cc-window.c
index 739443640..d035d3b74 100644
--- a/shell/cc-window.c
+++ b/shell/cc-window.c
@@ -629,7 +629,8 @@ search_entry_key_press_event_cb (GtkEntry        *entry,
 {
   CcWindowPrivate *priv = self->priv;
 
-  if (event->keyval == GDK_KEY_Return)
+  if (event->keyval == GDK_KEY_Return &&
+      g_strcmp0 (priv->filter_string, "") != 0)
     {
       GtkTreePath *path;
       GtkTreeSelection *selection;
-- 
cgit v1.2.1