From 96967e37a839eddbf19ebb6103fbc9cb9b5e9247 Mon Sep 17 00:00:00 2001
From: Hannes Janetzek <hannes.janetzek@gmail.com>
Date: Thu, 13 May 2010 03:49:23 +0000
Subject: [PATCH] fix file cache search cleanups

SVN revision: 48798
---
 src/modules/everything-files/e_mod_main.c | 27 ++++++++++-------------
 src/modules/everything/e_mod_main.c       |  2 +-
 src/modules/everything/evry.c             |  6 +----
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/src/modules/everything-files/e_mod_main.c b/src/modules/everything-files/e_mod_main.c
index 1aeb29559..ae876fc20 100644
--- a/src/modules/everything-files/e_mod_main.c
+++ b/src/modules/everything-files/e_mod_main.c
@@ -25,7 +25,7 @@
 
 #define ONE_DAY  86400.0
 #define SIX_DAYS_AGO (ecore_time_get() - ONE_DAY * 6)
-#define MIN_USAGE 0.000000000000000000001
+#define MIN_USAGE 0.0
 
 /* #undef DBG
  * #define DBG(...) ERR(__VA_ARGS__) */
@@ -385,15 +385,15 @@ _scan_end_func(void *data)
 	       {
 		  EINA_LIST_FOREACH(he->items, lll, hi)
 		    {
-		       if (hi->data)
-			 {
-			    if (!file->mime)
-			      file->mime = eina_stringshare_ref(hi->data);
+		       if (!hi->data)
+			 continue;
+		       
+		       if (!file->mime)
+			 file->mime = eina_stringshare_ref(hi->data);
 
-			    /* DBG("cached: %s %s", file->mime, file->path); */
-			    hi->transient = 0;
-			    break;
-			 }
+		       hi->transient = 0;
+		       item->hi = hi;
+		       break;
 		    }
 	       }
 
@@ -468,8 +468,7 @@ _scan_end_func(void *data)
 	       {
 		  GET_FILE(file, item);
 
-		  if (!item->usage &&
-		      (hi = evry->history_item_add(item, NULL, NULL)))
+		  if ((!(item->hi) && (hi = evry->history_item_add(item, NULL, NULL))))
 		    {
 		       hi->last_used = SIX_DAYS_AGO;
 		       hi->usage = MIN_USAGE * (double) cnt++;
@@ -971,9 +970,10 @@ _recentf_items_add_cb(const Eina_Hash *hash, const void *key, void *data, void *
 	DBG("clear %s", (char *)key);
 
 	/* transient marks them for deletion */
-	if ((hi->count == 1) && (hi->last_used < SIX_DAYS_AGO))
+	if (hi->count == 1)
 	  {
 	     hi->usage = 0;
+	     hi->count = 0;
 	     hi->transient = 1;
 	  }
 
@@ -1512,9 +1512,6 @@ _conf_new(void)
    IFMODCFGEND;
 
    _conf->version = MOD_CONFIG_FILE_VERSION;
-
-   e_config_domain_save("module.everything-files", conf_edd, _conf);
-   e_config_save_queue();
 }
 
 static void
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 1b370e74f..67bfa989f 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -342,7 +342,7 @@ _config_init()
    evry_conf = e_config_domain_load("module.everything", conf_edd);
 
    if (evry_conf && !e_util_module_config_check
-       (_("Everything Files"), evry_conf->version,
+       (_("Everything Module"), evry_conf->version,
 	MOD_CONFIG_FILE_EPOCH, MOD_CONFIG_FILE_VERSION))
      _config_free();
 
diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index 056b8b93e..25a40dac5 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -232,11 +232,7 @@ evry_show(E_Zone *zone, const char *params)
    _evry_selector_activate(selectors[0]);
 
    if (!evry_conf->hide_input)
-     {
-	edje_object_part_text_set(win->o_main, "e.text.label", "Search:");
-	edje_object_part_text_set(list->o_main, "e.text.label", "Search:");
-	edje_object_signal_emit(list->o_main, "e,state,entry_show", "e");
-     }
+     edje_object_signal_emit(list->o_main, "e,state,entry_show", "e");
 
    if (!evry_conf->hide_list)
      _show_timer = ecore_timer_add(0.01, _cb_show_timer, NULL);