add system icons dir for e, patches for evas.

SVN revision: 25715

diff --git a/configure.in b/configure.in
index 1d8ca12..aee5f39 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -293,6 +293,7 @@ data/xsession/Makefile
 data/xsession/enlightenment.desktop
 data/backgrounds/Makefile
 data/etc/Makefile
+data/icons/Makefile
 doc/Makefile
 po/Makefile
 intl/Makefile

diff --git a/data/Makefile.am b/data/Makefile.am
index 99cfb88..66393a5 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,3 +1,13 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = fonts images init themes other xsession input_methods backgrounds etc
+SUBDIRS = \
+fonts \
+images \
+init \
+themes \
+other \
+xsession \
+input_methods \
+backgrounds \
+etc \
+icons
 

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644 (file)
index 0000000..1a9c065
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/enlightenment/data/icons
+files_DATA = \
+xterm.png
+
+EXTRA_DIST = $(files_DATA)

diff --git a/data/icons/images/.cvsignore b/data/icons/images/.cvsignore
deleted file mode 100644 (file)
index 70845e0..0000000
--- a/data/icons/images/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.in

diff --git a/data/icons/xterm.png b/data/icons/xterm.png
new file mode 100644 (file)
index 0000000..b0db689
Binary files /dev/null and b/data/icons/xterm.png differ

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index dc5a741..f6954be 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -384,7 +384,7 @@ main(int argc, char **argv)
 
    ecore_desktop_paths_extras_clear();
    ecore_desktop_paths_prepend_user(ECORE_DESKTOP_PATHS_ICONS, "~/.e/e/icons");
-   snprintf(buf, sizeof(buf), "%s/data/images", e_prefix_data_get());
+   snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get());
    ecore_desktop_paths_append_system(ECORE_DESKTOP_PATHS_ICONS, buf);
    ecore_desktop_paths_regen();