Convert cpu module to new desktop stuff.

SVN revision: 29264

Makefile.am

@@ -7,15 +7,13 @@ EDJE_FLAGS = -v \
 
 files_DATA = \
 module.desktop \
-module.edj \
+e-module-cpu.edj \
 cpu.edj
 
 EXTRA_DIST = $(files_DATA) \
 cpu.edc \
 VeraMono.ttf \
 cpu.png \
-module.desktop \
-module.edj \
 e_modules-cpu.spec
 
 # data files for the module

configure.in

@@ -142,7 +142,6 @@ AC_SUBST(e_modules)
 
 AC_OUTPUT([
 Makefile
-module.desktop
 e_modules-cpu.spec
 ],[
 ])

e_mod_main.c

@@ -141,7 +141,7 @@ _gc_icon(Evas *evas)
 
    if (!cpu_conf->module) return NULL;
    
-   snprintf(buf, sizeof(buf), "%s/module.edj", 
+   snprintf(buf, sizeof(buf), "%s/e-module-cpu.edj", 
 	    e_module_dir_get(cpu_conf->module));
    
    o = edje_object_add(evas);

module.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Link
+Name=Cpu
+Icon=e-module-cpu
+

module.desktop.in

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Cpu
-Exec=enlightenment
-StartupNotify=false
-X-Enlightenment-WaitExit=false
-X-Enlightenment-IconClass=cpu,gadget
-Icon=./module.edj