enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

remove conf2 the rest of the way...

This commit is contained in:
Mike Blumenkrantz 2014-02-04 09:41:07 -05:00
parent 3067f600ee
commit f3587f67f2
3 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/e_module.c
View File

@ -931,7 +931,6 @@ _e_module_whitelist_check(void)
"xkbswitch",
"echievements",
"music-control",
"conf2",
"appmenu",
"packagekit",
NULL // end marker

32
src/modules/Makefile_conf2.mk
View File

@ -1,32 +0,0 @@
conf2dir = $(MDIR)/conf2
conf2_DATA = src/modules/conf2/e-module-conf2.edj \
src/modules/conf2/module.desktop
CLEANFILES += src/modules/conf2/e-module-conf2.edj
EXTRA_DIST += $(conf2_DATA) \
src/modules/conf2/e-module-conf2.edc \
src/modules/conf2/module.desktop.in \
src/modules/conf2/images/volume_knob_ledsoff.png \
src/modules/conf2/images/volume_knob_move.png \
src/modules/conf2/images/volume_knob.png \
src/modules/conf2/images/volume_led_01.png
conf2pkgdir = $(MDIR)/conf2/$(MODULE_ARCH)
conf2pkg_LTLIBRARIES = src/modules/conf2/module.la
src_modules_conf2_module_la_LDFLAGS = $(MOD_LDFLAGS)
src_modules_conf2_module_la_SOURCES = src/modules/conf2/e_mod_main.c \
src/modules/conf2/e_mod_main.h \
src/modules/conf2/e_conf2.c
src_modules_conf2_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @ELM_CFLAGS@
src_modules_conf2_module_la_LIBADD = $(MOD_LIBS) @ELM_LIBS@
CONF2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/conf2/images -id $(top_srcdir)/data/themes/img
src/modules/conf2/%.edj: $(top_srcdir)/src/modules/conf2/%.edc Makefile
$(EDJE_CC) $(CONF2_EDJE_FLAGS) $< $@
PHONIES += conf2 install-conf2
conf2: $(conf2pkg_LTLIBRARIES) $(conf2_DATA)
install-conf2: install-conf2DATA install-conf2pkgLTLIBRARIES

5
src/modules/conf/e_mod_main.c
View File

@ -265,11 +265,6 @@ e_modapi_init(E_Module *m)
conf_module = m;
if (e_action_find("configuration"))
{
e_util_dialog_show(_("Error"), _("conf module cannot be loaded when conf2 module is already loaded!"));
return NULL;
}
/* add module supplied action */
act = e_action_add("configuration");
if (act)