From 25e68c1a32dc82b0665679f89bd064320e1eabb7 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Tue, 29 May 2007 15:53:36 +0000 Subject: [PATCH] Make it visible again. SVN revision: 30146 --- configure.ac | 1 - data/themes/.cvsignore | 1 - data/themes/Makefile.am | 9 ++++----- data/themes/{module.desktop.in => module.desktop} | 3 ++- src/e_mod_config.c | 2 +- src/e_mod_main.c | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) rename data/themes/{module.desktop.in => module.desktop} (73%) diff --git a/configure.ac b/configure.ac index d84cca5..b753cd1 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,6 @@ AC_CONFIG_FILES([Makefile e_modules-moon.spec data/Makefile data/themes/Makefile - data/themes/module.desktop data/themes/images/Makefile po/Makefile src/Makefile]) diff --git a/data/themes/.cvsignore b/data/themes/.cvsignore index c92ff0e..d96fcf8 100644 --- a/data/themes/.cvsignore +++ b/data/themes/.cvsignore @@ -1,4 +1,3 @@ Makefile Makefile.in *.edj -module.desktop diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index ae7b2b5..7a9911a 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -13,7 +13,7 @@ EDJE_FLAGS = \ filesdir = $(moduledir)/$(PACKAGE) files_DATA = \ module.desktop \ -module.edj \ +e-module-moon.edj \ moon.edj EXTRA_DIST = \ @@ -25,11 +25,10 @@ moon.edj: Makefile $(EXTRA_DIST) $(top_srcdir)/data/themes/moon.edc \ moon.edj -module.edj: Makefile $(EXTRA_DIST) +e-module-moon.edj: Makefile $(EXTRA_DIST) $(EDJE_CC) $(EDJE_FLAGS) \ $(top_srcdir)/data/themes/icon.edc \ - module.edj + e-module-moon.edj clean-local: - rm -rf moon.edj; rm -rf *.desktop - + rm -rf moon.edj diff --git a/data/themes/module.desktop.in b/data/themes/module.desktop similarity index 73% rename from data/themes/module.desktop.in rename to data/themes/module.desktop index 1c2988b..d27cbcf 100644 --- a/data/themes/module.desktop.in +++ b/data/themes/module.desktop @@ -1,5 +1,6 @@ [Desktop Entry] +Type=Link Name=Moon GenericName=gadget Comment=Moon phase module for e17 -Icon=./module.edj +Icon=e-module-moon diff --git a/src/e_mod_config.c b/src/e_mod_config.c index c169569..e50544e 100644 --- a/src/e_mod_config.c +++ b/src/e_mod_config.c @@ -97,7 +97,7 @@ moon_config_dialog_show(Evas_Object *o) v->advanced.create_widgets = NULL; con = e_container_current_get(e_manager_current_get()); - snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(module)); + snprintf(buf, sizeof(buf), "%s/e-module-moon.edj", e_module_dir_get(module)); cfd = e_config_dialog_new(con, D_("Moon Configuration"), "Moon", "_e_modules_moon_config_dialog", buf, 0, v, o); moon_config->config_dialog = cfd; } diff --git a/src/e_mod_main.c b/src/e_mod_main.c index 24f44ae..a9fdb5f 100644 --- a/src/e_mod_main.c +++ b/src/e_mod_main.c @@ -224,7 +224,7 @@ _gc_icon(Evas *evas) char buf[4096]; o = edje_object_add(evas); - snprintf(buf, sizeof(buf), "%s/module.edj", e_module_dir_get(_module)); + snprintf(buf, sizeof(buf), "%s/e-module-moon.edj", e_module_dir_get(_module)); edje_object_file_set(o, buf, "icon"); return o; }