Remove X specific elements from the .desktop files.

Rename the icons so that the get a unique name. This will make it possible to create a standard (FDO) icon theme for e which supplies these icons without using custom X- keys. SVN revision: 28990
17 years ago · b8afe0e904
parent 4307a0544e
commit b8afe0e904
27 changed files with 27 additions and 36 deletions
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@ -4,7 +4,7 @@ MODULE = battery
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/battery/e-module-battery.edj
+++ b/src/modules/battery/e-module-battery.edj
--- a/src/modules/battery/module.desktop.in
+++ b/src/modules/battery/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Battery
-Exec=enlightenment
-X-Enlightenment-IconClass=battery,gadget
-Icon=./module.edj
+Icon=e-module-battery
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@ -4,7 +4,7 @@ MODULE = clock
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/clock/e-module-clock.edj
+++ b/src/modules/clock/e-module-clock.edj
--- a/src/modules/clock/module.desktop.in
+++ b/src/modules/clock/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Clock
-Exec=enlightenment
-X-Enlightenment-IconClass=clock,gadget
-Icon=./module.edj
+Icon=e-module-clock
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@ -4,7 +4,7 @@ MODULE = cpufreq
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/cpufreq/e-module-cpufreq.edj
+++ b/src/modules/cpufreq/e-module-cpufreq.edj
--- a/src/modules/cpufreq/module.desktop.in
+++ b/src/modules/cpufreq/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Cpufreq
-Exec=enlightenment
-X-Enlightenment-IconClass=cpufreq,gadget
-Icon=./module.edj
+Icon=e-module-cpufreq
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@ -4,7 +4,7 @@ MODULE = dropshadow
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/dropshadow/e-module-dropshadow.edj
+++ b/src/modules/dropshadow/e-module-dropshadow.edj
--- a/src/modules/dropshadow/module.desktop.in
+++ b/src/modules/dropshadow/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Dropshadow
-Exec=enlightenment
-X-Enlightenment-IconClass=dropshadow,gadget
-Icon=./module.edj
+Icon=e-module-dropshadow
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@ -4,7 +4,7 @@ MODULE = ibar
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/ibar/e-module-ibar.edj
+++ b/src/modules/ibar/e-module-ibar.edj
--- a/src/modules/ibar/module.desktop.in
+++ b/src/modules/ibar/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=IBar
-Exec=enlightenment
-X-Enlightenment-IconClass=ibar,gadget
-Icon=./module.edj
+Icon=e-module-ibar
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@ -4,7 +4,7 @@ MODULE = ibox
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/ibox/e-module-ibox.edj
+++ b/src/modules/ibox/e-module-ibox.edj
--- a/src/modules/ibox/module.desktop.in
+++ b/src/modules/ibox/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=IBox
-Exec=enlightenment
-X-Enlightenment-IconClass=ibox,gadget
-Icon=./module.edj
+Icon=e-module-ibox
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@ -4,7 +4,7 @@ MODULE = pager
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/pager/e-module-pager.edj
+++ b/src/modules/pager/e-module-pager.edj
--- a/src/modules/pager/module.desktop.in
+++ b/src/modules/pager/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Pager
-Exec=enlightenment
-X-Enlightenment-IconClass=pager,gadget
-Icon=./module.edj
+Icon=e-module-pager
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@ -4,7 +4,7 @@ MODULE = start
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/start/e-module-start.edj
+++ b/src/modules/start/e-module-start.edj
--- a/src/modules/start/module.desktop.in
+++ b/src/modules/start/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Start
-Exec=enlightenment
-X-Enlightenment-IconClass=start,gadget
-Icon=./module.edj
+Icon=e-module-start
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@ -4,7 +4,7 @@ MODULE = temperature
 # data files for the module
 filesdir = $(libdir)/enlightenment/modules/$(MODULE)
 files_DATA = \
-module.edj module.desktop
+e-module-$(MODULE).edj module.desktop

 EXTRA_DIST = $(files_DATA)

--- a/src/modules/temperature/e-module-temperature.edj
+++ b/src/modules/temperature/e-module-temperature.edj
--- a/src/modules/temperature/module.desktop.in
+++ b/src/modules/temperature/module.desktop.in
@ -1,5 +1,4 @@
 [Desktop Entry]
+Type=Link
 Name=Temperature
-Exec=enlightenment
-X-Enlightenment-IconClass=temperature,gadget
-Icon=./module.edj
+Icon=e-module-temperature