backport efreet fix.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/efreet-1.7@77134 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index da2b2a5..2ac2f1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,3 +134,8 @@
 2012-08-30  Carsten Haitzler (The Rasterman)
 
         1.7.0 release
+
+2012-09-27  Carsten Haitzler (The Rasterman)
+
+        * Fix long lurking bug where desktop/icon cache updates get
+        delayed by silly long amounts of time.

diff --git a/NEWS b/NEWS
index 12d5666..c8b80b6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,10 @@
-Efreet 1.7.0
+Efreet 1.7.1
+
+Changes since Efreet 1.7.0:
+---------------------------
+
+Fixes:
+    * Fix insane delay added to desktop/icon updates.
 
 Changes since Efreet 1.2.0:
 ---------------------------

diff --git a/src/lib/efreet_cache.c b/src/lib/efreet_cache.c
index a53c8e1..b3b9855 100644 (file)
--- a/src/lib/efreet_cache.c
+++ b/src/lib/efreet_cache.c
@@ -947,9 +947,8 @@ efreet_cache_desktop_update(void)
     if (!efreet_cache_update) return;
 
     if (desktop_cache_timer)
-        ecore_timer_delay(desktop_cache_timer, 0.2);
-    else
-        desktop_cache_timer = ecore_timer_add(0.2, desktop_cache_update_cache_cb, NULL);
+        ecore_timer_del(desktop_cache_timer);
+    desktop_cache_timer = ecore_timer_add(0.2, desktop_cache_update_cache_cb, NULL);
 }
 
 void
@@ -994,9 +993,8 @@ efreet_cache_icon_update(void)
     if (!efreet_cache_update) return;
 
     if (icon_cache_timer)
-        ecore_timer_delay(icon_cache_timer, 0.2);
-    else
-        icon_cache_timer = ecore_timer_add(0.2, icon_cache_update_cache_cb, NULL);
+        ecore_timer_del(icon_cache_timer);
+    icon_cache_timer = ecore_timer_add(0.2, icon_cache_update_cache_cb, NULL);
 }
 
 static Eina_Bool