From 3fa7b24995a11c4ed76126b072fcd34c0236ee83 Mon Sep 17 00:00:00 2001 From: e-taro Date: Sat, 3 Jun 2006 08:35:27 +0000 Subject: [PATCH] Moon module unbreak SVN revision: 23115 --- configure.ac | 2 +- data/themes/.cvsignore | 3 ++- data/themes/Makefile.am | 12 +++++++++--- src/e_mod_main.c | 13 +------------ src/e_mod_main.h | 1 - 5 files changed, 13 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index f82e801..496ec3a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ rm -f config.cache AC_PREREQ(2.59) -AC_INIT(moon, 0.2.0) +AC_INIT(moon, 0.2.1) AC_CONFIG_SRCDIR([src/e_mod_main.c]) AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST diff --git a/data/themes/.cvsignore b/data/themes/.cvsignore index e548998..d43fcb0 100644 --- a/data/themes/.cvsignore +++ b/data/themes/.cvsignore @@ -1,4 +1,5 @@ Makefile Makefile.in *.edj -moon.eap +module.eap + diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index 4ba3f5d..08b57cf 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -12,7 +12,7 @@ EDJE_FLAGS = \ # data files for the module filesdir = $(moduledir)/$(PACKAGE) files_DATA = \ -moon.eap \ +module.eap \ moon.edj EXTRA_DIST = \ @@ -24,10 +24,16 @@ moon.edj: Makefile $(EXTRA_DIST) $(top_srcdir)/data/themes/moon.edc \ moon.edj -moon.eap: Makefile $(EXTRA_DIST) +module.eap: Makefile $(EXTRA_DIST) $(EDJE_CC) $(EDJE_FLAGS) \ $(top_srcdir)/data/themes/icon.edc \ - moon.eap + module.eap + enlightenment_eapp module.eap \ + -set-name "Moon" \ + -set-generic "gadget" \ + -set-comment "Moon phase module for e17" \ + -set-exe "null" \ + -set-icon-class "null" clean-local: rm -rf *.edj; rm -rf *.eap diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 6132de8..bc52187 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -117,17 +117,6 @@ e_modapi_shutdown(E_Module *module) return 1; } -EAPI int -e_modapi_info(E_Module *module) -{ - // seems deprecated now, but what the hell... - char buf[4096]; - snprintf(buf, sizeof(buf), "%s/moon.eap", e_module_dir_get(module)); - module->edje_icon_file = strdup(buf); - - return 1; -} - EAPI int e_modapi_about(E_Module *module) { @@ -234,7 +223,7 @@ _gc_icon(Evas *evas) char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), "%s/moon.eap", e_module_dir_get(_module)); + snprintf(buf, sizeof(buf), "%s/module.eap", e_module_dir_get(_module)); edje_object_file_set(o, buf, "icon"); return o; } diff --git a/src/e_mod_main.h b/src/e_mod_main.h index 7cb6955..b347113 100644 --- a/src/e_mod_main.h +++ b/src/e_mod_main.h @@ -32,7 +32,6 @@ EAPI extern E_Module_Api e_modapi; EAPI void *e_modapi_init (E_Module *m); EAPI int e_modapi_shutdown (E_Module *m); -EAPI int e_modapi_info (E_Module *m); EAPI int e_modapi_about (E_Module *m); EAPI int e_modapi_save (E_Module *m);