Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/bin
Modified Files:
ef_icon_theme.c
Log Message:
Pass icon size as unsigned int.
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/bin/ef_icon_theme.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ef_icon_theme.c 7 May 2008 02:48:06 -0000 1.9
+++ ef_icon_theme.c 14 Aug 2008 20:48:40 -0000 1.10
@@ -8,8 +8,8 @@
#define PATH_MAX 4096
#endif
-#define SIZE "128x128"
-#define THEME "Tango"
+#define SIZE 128
+#define THEME "Human"
#define FREE(x) do { free(x); x = NULL; } while (0);
static void ef_icon_theme_themes_find(const char *search_dir,
@@ -262,6 +262,7 @@
"accessories-text-editor",
"help-browser",
"multimedia-volume-control",
+#if 0
"preferences-desktop-accessibility",
"preferences-desktop-font",
"preferences-desktop-keyboard",
@@ -416,6 +417,7 @@
"weather-showers-scattered",
"weather-snow",
"weather-storm",
+#endif
NULL
};
@@ -449,6 +451,7 @@
ef_icons_find(theme, themes, icon_hash);
ecore_list_destroy(themes);
+ double start = ecore_time_get();
for (i = 0; icons[i] != NULL; i++)
{
char *path, *s;
@@ -457,11 +460,13 @@
if (!path)
{
+#if 0
if (ecore_hash_get(icon_hash, icons[i]))
{
printf("NOT FOUND %s\n", icons[i]);
ret = 0;
}
+#endif
continue;
}
@@ -477,7 +482,31 @@
}
free(path);
}
+ printf("Time: %f\n", (ecore_time_get() - start));
ecore_hash_destroy(icon_hash);
+
+ start = ecore_time_get();
+ for (i = 0; icons[i] != NULL; i++)
+ {
+ char *path, *s;
+
+ path = efreet_icon_path_find(THEME, icons[i], SIZE);
+
+ if (!path) continue;
+
+ s = strrchr(path, '.');
+ if (s) *s = '\0';
+ s = strrchr(path, '/');
+ if (s) s++;
+
+ if (s && strcmp(s, icons[i]))
+ {
+ printf("Name mismatch name (%s) vs ef (%s)\n", icons[i], s);
+ ret = 0;
+ }
+ free(path);
+ }
+ printf("Time: %f\n", (ecore_time_get() - start));
return ret;
}
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
