Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu/src/bin
Modified Files:
icons.c global.c
Log Message:
Make supplied theme have priority. Some comments
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/icons.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- icons.c 7 Feb 2006 16:34:55 -0000 1.17
+++ icons.c 16 Feb 2006 09:19:25 -0000 1.18
@@ -83,20 +83,24 @@
if (strrchr(icon, '.') == NULL)
snprintf(icn, sizeof(icn), "%s.png", icon);
- /* Check If Dir Supplied In Desktop File */
- dir = ecore_file_get_dir(icn);
- if (!strcmp(dir, icn) == 0)
- {
- snprintf(path, MAX_PATH, "%s", icn);
- /* Check Supplied Dir For Icon */
- if (ecore_file_exists(path))
- return strdup(icn);
- }
-
/* Get Icon Options */
icon_size = get_icon_size();
icon_theme = get_icon_theme();
+ if (!icon_theme)
+ {
+
+ /* Check If Dir Supplied In Desktop File */
+ dir = ecore_file_get_dir(icn);
+ if (!strcmp(dir, icn) == 0)
+ {
+ snprintf(path, MAX_PATH, "%s", icn);
+ /* Check Supplied Dir For Icon */
+ if (ecore_file_exists(path))
+ return strdup(icn);
+ }
+ }
+
return strdup(find_fdo_icon(icon, icon_size, icon_theme));
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_utils/src/bin/e17genmenu/src/bin/global.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- global.c 9 Feb 2006 09:34:11 -0000 1.7
+++ global.c 16 Feb 2006 09:19:25 -0000 1.8
@@ -154,6 +154,7 @@
return strdup(c);
}
}
+ /* Doesn't this tie us specifically to KDE ? */
return "crystalsvg";
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
