From f94a724613cdb35bb8a6bf805fa9c014eca08d7d Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 30 Mar 2007 21:14:54 +0000
Subject: [PATCH] Convert cpu module to new desktop stuff.

SVN revision: 29264
---
 Makefile.am                    |   4 +---
 configure.in                   |   1 -
 module.edj => e-module-cpu.edj | Bin
 e_mod_main.c                   |   2 +-
 module.desktop                 |   5 +++++
 module.desktop.in              |   7 -------
 6 files changed, 7 insertions(+), 12 deletions(-)
 rename module.edj => e-module-cpu.edj (100%)
 create mode 100644 module.desktop
 delete mode 100644 module.desktop.in

diff --git a/Makefile.am b/Makefile.am
index 2b19af1..72f10de 100644
--- a/Makefile.am
+++ b/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
diff --git a/configure.in b/configure.in
index f66950f..7384b39 100644
--- a/configure.in
+++ b/configure.in
@@ -142,7 +142,6 @@ AC_SUBST(e_modules)
 
 AC_OUTPUT([
 Makefile
-module.desktop
 e_modules-cpu.spec
 ],[
 ])
diff --git a/module.edj b/e-module-cpu.edj
similarity index 100%
rename from module.edj
rename to e-module-cpu.edj
diff --git a/e_mod_main.c b/e_mod_main.c
index f74923e..5858f88 100644
--- a/e_mod_main.c
+++ b/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);
diff --git a/module.desktop b/module.desktop
new file mode 100644
index 0000000..23e3e08
--- /dev/null
+++ b/module.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Link
+Name=Cpu
+Icon=e-module-cpu
+
diff --git a/module.desktop.in b/module.desktop.in
deleted file mode 100644
index 197c9c5..0000000
--- a/module.desktop.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Cpu
-Exec=enlightenment
-StartupNotify=false
-X-Enlightenment-WaitExit=false
-X-Enlightenment-IconClass=cpu,gadget
-Icon=./module.edj