From 7b0e062800442ac6742e496650cdb36a743de0c9 Mon Sep 17 00:00:00 2001
From: Jaehwan Kim <jae.hwan.kim@samsung.com>
Date: Tue, 19 Apr 2011 18:14:42 +0900
Subject: [PATCH] Rollback to fe0e7cfa9de5469bf256fad7814de8d1efcac70c

---
 debian/control                   |  2 +-
 src/lib/cache/evas_cache_image.c | 25 +++++++++----------------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 19eed40..61dc3d3 100755
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: evas
 Section: libs
 Priority: optional
-Maintainer: Jaehwan Kim <jae.hwan.kim@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Doyoun Kang <doyoun.kang@samsung.com>, YoungHoon Jung <yhoon.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Gwanglim Lee <gl77.lee@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Seokjae Jeong <seok.j.jeong@samsung.com>, MyoungWoon Kim <myoungwoon.kim@samsung.com>, ChunEon Park <chuneon.park@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>, WooHyun Jung <wh0705.jung@samsung.com>, Gwangyeong Mun <kk.moon@samsung.com>, Jiyoun Park <jy0703.park@samsung.com>
+Maintainer: Jaehwan Kim <jae.hwan.kim@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Doyoun Kang <doyoun.kang@samsung.com>, YoungHoon Jung <yhoon.jung@samsung.com>, Myungjae Lee <mjae.lee@samsung.com>, Juyung Seo <juyung.seo@samsung.com>, Gwanglim Lee <gl77.lee@samsung.com>, Jeonghyun Yun <jh0506.yun@samsung.com>, Seokjae Jeong <seok.j.jeong@samsung.com>, MyoungWoon Kim <myoungwoon.kim@samsung.com>, ChunEon Park <chuneon.park@samsung.com>, Hyoyoung Chang <hyoyoung.chang@samsung.com>, WooHyun Jung <wh0705.jung@samsung.com>, Gwangyeong Mun <kk.moon@samsung.com>
 Original-Maintainer:  Debian Pkg-e Team <pkg-e-devel@lists.alioth.debian.org>
 Uploaders: Albin Tonnerre <albin.tonnerre@gmail.com>,
  Niv Sardi <xaiki@debian.org>, Xavier Oswald <x.oswald@free.fr>,
diff --git a/src/lib/cache/evas_cache_image.c b/src/lib/cache/evas_cache_image.c
index 7104d2f..5dcbd9b 100644
--- a/src/lib/cache/evas_cache_image.c
+++ b/src/lib/cache/evas_cache_image.c
@@ -777,7 +777,7 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
    Image_Entry          *im;
    Evas_Image_Load_Opts  prevent = { 0, 0, 0, 0, { 0, 0, 0, 0 } };
    size_t                size;
-   int                   stat_done = 0, stat_failed = 0;
+   int                   stat_done = 0;
    size_t                file_length;
    size_t                key_length;
    struct stat           st;
@@ -878,17 +878,14 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
         int ok = 1;
         
         stat_done = 1;
-        if (stat(file, &st) < 0)
+        if (stat(file, &st) < 0) goto on_stat_error;
           {
-              stat_failed = 1;
-              ok = 0;
+             if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
           }
-        else if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
         if (ok) goto on_ok;
 
         _evas_cache_image_remove_activ(cache, im);
 	_evas_cache_image_make_dirty(cache, im);
-        im = NULL;
      }
 
 #ifdef EVAS_FRAME_QUEUING
@@ -905,14 +902,11 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
         if (!stat_done)
           {
              stat_done = 1;
-             if (stat(file, &st) < 0)
-               {
-                  stat_failed = 1;
-                  ok = 0;
+             if (stat(file, &st) < 0) goto on_stat_error;
+             if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
           }
-             else if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
-          }
-        else if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
+        else
+           if (!_timestamp_compare(&(im->tstamp), &st)) ok = 0;
 
         if (ok)
           {
@@ -920,10 +914,9 @@ evas_cache_image_request(Evas_Cache_Image *cache, const char *file, const char *
              _evas_cache_image_make_activ(cache, im, im->cache_key);
              goto on_ok;
           }
-        _evas_cache_image_make_dirty(cache, im);
-        im = NULL;
+
+        _evas_cache_image_entry_delete(cache, im);
      }
-   if (stat_failed) goto on_stat_error;
 
    if (!stat_done)
      {
-- 
2.7.4