Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_icon.c
Log Message:
${XDG_DATA_HOME}/icons should be scanned, not ${XDG_DATA_HOME}
===================================================================
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- efreet_icon.c 4 Apr 2007 19:12:42 -0000 1.14
+++ efreet_icon.c 15 Apr 2007 04:51:37 -0000 1.15
@@ -4,6 +4,7 @@
#define NO_MATCH_KEY ((char *)0xdeadbeef)
+static char *efreet_icon_deprecated_user_dir = NULL;
static char *efreet_icon_user_dir = NULL;
static Ecore_Hash *efreet_icon_dirs_cached = NULL;
static Ecore_Hash *efreet_icon_themes = NULL;
@@ -118,17 +119,33 @@
* @brief Returns the user icon directory
*/
const char *
-efreet_icon_dir_get(void)
+efreet_icon_deprecated_user_dir_get(void)
{
const char *user;
int len;
- if (efreet_icon_user_dir) return efreet_icon_user_dir;
+ if (efreet_icon_deprecated_user_dir) return
efreet_icon_deprecated_user_dir;
user = efreet_home_dir_get();
len = strlen(user) + strlen("/.icons") + 1;
+ efreet_icon_deprecated_user_dir = malloc(sizeof(char) * len);
+ snprintf(efreet_icon_deprecated_user_dir, len, "%s/.icons", user);
+
+ return efreet_icon_deprecated_user_dir;
+}
+
+const char *
+efreet_icon_user_dir_get(void)
+{
+ const char *user;
+ int len;
+
+ if (efreet_icon_user_dir) return efreet_icon_user_dir;
+
+ user = efreet_data_home_get();
+ len = strlen(user) + strlen("/icons") + 1;
efreet_icon_user_dir = malloc(sizeof(char) * len);
- snprintf(efreet_icon_user_dir, len, "%s/.icons", user);
+ snprintf(efreet_icon_user_dir, len, "%s/icons", user);
return efreet_icon_user_dir;
}
@@ -545,7 +562,9 @@
if (!icon_name) return NULL;
- icon = efreet_icon_fallback_dir_scan(efreet_icon_dir_get(), icon_name);
+ icon =
efreet_icon_fallback_dir_scan(efreet_icon_deprecated_user_dir_get(), icon_name);
+ if (!icon)
+ icon = efreet_icon_fallback_dir_scan(efreet_icon_user_dir_get(),
icon_name);
if (!icon)
{
Ecore_List *xdg_dirs;
@@ -1122,8 +1141,8 @@
Ecore_List *xdg_dirs;
char path[PATH_MAX], *dir;
- efreet_icon_theme_dir_scan(efreet_icon_dir_get(), theme_name);
- efreet_icon_theme_dir_scan(efreet_data_home_get(), theme_name);
+ efreet_icon_theme_dir_scan(efreet_icon_deprecated_user_dir_get(),
theme_name);
+ efreet_icon_theme_dir_scan(efreet_icon_user_dir_get(), theme_name);
xdg_dirs = efreet_data_dirs_get();
ecore_list_goto_first(xdg_dirs);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
