raster pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=4b25721a1d5b1a895ca1cf7831e566c67a44894c

commit 4b25721a1d5b1a895ca1cf7831e566c67a44894c
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Tue Aug 11 13:15:16 2015 +0900

    terminology themes - use theme in home dir over system one always
    
    checking modified time between user and system themes is just not a
    good idea - we never do this anywhere in e. user installed theme
    alwasy overrides system one. modified time is not relevant.
---
 src/bin/utils.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/bin/utils.c b/src/bin/utils.c
index e45a699..e66299d 100644
--- a/src/bin/utils.c
+++ b/src/bin/utils.c
@@ -14,18 +14,15 @@ theme_path_get(const char *name)
    static char path2[PATH_MAX] = "";
 
    /* use the newer file */
-   struct stat s1, s2;
+   struct stat s2;
 
-   snprintf(path1, sizeof(path1) - 1, "%s/themes/%s",
-            elm_app_data_dir_get(), name);
    snprintf(path2, sizeof(path2) - 1, "%s/terminology/themes/%s",
             efreet_config_home_get(), name);
 
-   if (stat(path1, &s1) < 0) return path2;
-   if (stat(path2, &s2) < 0) return path1;
-
-   if (s1.st_mtime > s2.st_mtime) return path1;
-   return path2;
+   if (stat(path2, &s2) == 0) return path2;
+   snprintf(path1, sizeof(path1) - 1, "%s/themes/%s",
+            elm_app_data_dir_get(), name);
+   return path1;
 }
 
 Eina_Bool

-- 


Reply via email to