From aa78af7f12ae959936679e127108dd8b2faf805b Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 3 Mar 2006 10:18:14 +0000 Subject: [PATCH] remove module cruft we dont use. SVN revision: 20953 --- configure.in | 3 - data/themes/Makefile.am | 1 - data/themes/default.edc | 1 - data/themes/default_itray.edc | 172 --------------------------- src/modules/Makefile.am | 5 +- src/modules/gadget_test/.cvsignore | 6 - src/modules/gadget_test/Makefile.am | 24 ---- src/modules/gadget_test/e_mod_main.c | 108 ----------------- src/modules/gadget_test/e_mod_main.h | 19 --- src/modules/test/.cvsignore | 6 - src/modules/test/Makefile.am | 24 ---- src/modules/test/e_mod_main.c | 67 ----------- src/modules/test/e_mod_main.h | 12 -- 13 files changed, 1 insertion(+), 447 deletions(-) delete mode 100644 data/themes/default_itray.edc delete mode 100644 src/modules/gadget_test/.cvsignore delete mode 100644 src/modules/gadget_test/Makefile.am delete mode 100644 src/modules/gadget_test/e_mod_main.c delete mode 100644 src/modules/gadget_test/e_mod_main.h delete mode 100644 src/modules/test/.cvsignore delete mode 100644 src/modules/test/Makefile.am delete mode 100644 src/modules/test/e_mod_main.c delete mode 100644 src/modules/test/e_mod_main.h diff --git a/configure.in b/configure.in index 90c6e98b0..6d175912c 100644 --- a/configure.in +++ b/configure.in @@ -286,8 +286,6 @@ src/Makefile src/lib/Makefile src/bin/Makefile src/modules/Makefile -src/modules/test/Makefile -src/modules/gadget_test/Makefile src/modules/ibar/Makefile src/modules/dropshadow/Makefile src/modules/clock/Makefile @@ -296,7 +294,6 @@ src/modules/battery/Makefile src/modules/temperature/Makefile src/modules/cpufreq/Makefile src/modules/ibox/Makefile -src/modules/itray/Makefile src/modules/start/Makefile src/preload/Makefile data/Makefile diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am index bcc91c952..635499836 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.am @@ -28,7 +28,6 @@ default_temperature.edc \ default_error.edc \ default_cpufreq.edc \ default_ibox.edc \ -default_itray.edc \ default_start.edc \ default_winlist.edc \ default_transitions.edc \ diff --git a/data/themes/default.edc b/data/themes/default.edc index a365e2632..00d81a15b 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -36,7 +36,6 @@ collections { #include "default_error.edc" #include "default_cpufreq.edc" #include "default_ibox.edc" -#include "default_itray.edc" #include "default_start.edc" #include "default_winlist.edc" #include "default_transitions.edc" diff --git a/data/themes/default_itray.edc b/data/themes/default_itray.edc deleted file mode 100644 index 6e85132ed..000000000 --- a/data/themes/default_itray.edc +++ /dev/null @@ -1,172 +0,0 @@ -images { - image: "e17_ibar_bg_h.png" COMP; - image: "e17_ibar_bg_v.png" COMP; - image: "e17_ibar_over_h.png" COMP; - image: "e17_ibar_over_v.png" COMP; -} -group { - name: "modules/itray/main"; - data { - // item: "item_list", "item item2 item3"; - } - script { - public orient; - } - parts { - part { - name: "background"; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { - to: "overlay"; - } - rel2 { - to: "overlay"; - } - image { - normal: "e17_ibar_bg_h.png"; - border: 6 6 6 6; - } - fill { - smooth: 0; - } - } - description { - state: "vert" 0.0; - inherit: "default" 0.0; - image { - normal: "e17_ibar_bg_v.png"; - } - } - } - part { - name: "items_clip"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { - to: "background"; - offset: 4 4; - } - rel2 { - to: "background"; - offset: -5 -5; - } - color: 255 255 255 255; - } - } - part { - name: "items"; - type: SWALLOW; - mouse_events: 0; - clip_to: "items_clip"; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { - offset: 4 4; - } - rel2 { - offset: -5 -5; - } - color: 0 0 0 0; - } - description { - state: "top" 0.0; - inherit: "default" 0.0; - } - description { - state: "left" 0.0; - inherit: "default" 0.0; - } - description { - state: "right" 0.0; - inherit: "default" 0.0; - } - } - part { - name: "tray"; - type: SWALLOW; - mouse_events: 0; - description { - state: "default" 0.0; - align: 0.5 0.5; - rel1 { offset: 7 6; } - rel2 { offset: -7 -6; } - color: 0 0 255 64; - } - } - part { - name: "overlay"; - mouse_events: 0; - description { - state: "default" 0.0; - image { - normal: "e17_ibar_over_h.png"; - border: 13 13 13 13; - middle: 0; - } - fill { - smooth: 0; - } - } - description { - state: "top" 0.0; - inherit: "default" 0.0; - } - description { - state: "left" 0.0; - inherit: "default" 0.0; - } - description { - state: "right" 0.0; - inherit: "default" 0.0; - } - } - part { - name: "inn"; - type: RECT; - repeat_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - } - programs { - program { - name: "orient"; - signal: "set_orientation"; - source: "*"; - script { - // sig, src - if (!strcmp(src, "left")) { - set_int(orient, 0); - set_state(PART:"background", "vert", 0.0); - set_state(PART:"overlay", "left", 0.0); - set_state(PART:"items", "left", 0.0); - } - else if (!strcmp(src, "right")) { - set_int(orient, 1); - set_state(PART:"background", "vert", 0.0); - set_state(PART:"overlay", "right", 0.0); - set_state(PART:"items", "right", 0.0); - } - else if (!strcmp(src, "top")) { - set_int(orient, 2); - set_state(PART:"background", "default", 0.0); - set_state(PART:"overlay", "top", 0.0); - set_state(PART:"items", "top", 0.0); - } - else if (!strcmp(src, "bottom")) { - set_int(orient, 3); - set_state(PART:"background", "default", 0.0); - set_state(PART:"overlay", "default", 0.0); - set_state(PART:"items", "default", 0.0); - } - } - } - } -} diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index d5cbd4fd4..f8fcc8292 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -1,6 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = \ -test \ ibar \ dropshadow \ clock \ @@ -9,6 +8,4 @@ battery \ temperature \ cpufreq \ ibox \ -itray \ -start \ -gadget_test +start diff --git a/src/modules/gadget_test/.cvsignore b/src/modules/gadget_test/.cvsignore deleted file mode 100644 index b969c5b1e..000000000 --- a/src/modules/gadget_test/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -e_mod_main.lo -module.la diff --git a/src/modules/gadget_test/Makefile.am b/src/modules/gadget_test/Makefile.am deleted file mode 100644 index 73f43b652..000000000 --- a/src/modules/gadget_test/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = gadget_test - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = -EXTRA_DIST = $(files_DATA) - -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/$(MODULE) \ - -I$(top_srcdir)/src/bin \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/modules \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.c \ - e_mod_main.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - diff --git a/src/modules/gadget_test/e_mod_main.c b/src/modules/gadget_test/e_mod_main.c deleted file mode 100644 index 8614a4494..000000000 --- a/src/modules/gadget_test/e_mod_main.c +++ /dev/null @@ -1,108 +0,0 @@ -/* - * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 - */ -#include "e.h" -#include "e_mod_main.h" - -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "Gadget Test" -}; - -static void _test_face_init(void *data, E_Gadget_Face *face); -static void _test_face_free(void *data, E_Gadget_Face *face); -static void _test_face_change(void *data, E_Gadget_Face *face, E_Gadman_Client *gmc, E_Gadman_Change change); -static void _test_face_menu_init(void *data, E_Gadget_Face *face); - - -EAPI void * -e_modapi_init(E_Module *m) -{ - E_Gadget_Api *api = NULL; - E_Gadget *gad = NULL; - - Test *t = E_NEW(Test, 1); - if (!t) return NULL; - api = E_NEW(E_Gadget_Api, 1); - if (!api) return NULL; - - /* - * set up gadget -- only module and name are required, but the gadget would - * be pretty useless without func_face_* - */ - - api->module = m; - api->name = "test_gadget"; - api->per_zone = 1; - api->func_face_init = _test_face_init; - api->func_face_free = _test_face_free; - api->func_change = _test_face_change; - api->func_face_menu_init = _test_face_menu_init; - api->data = t; - - gad = e_gadget_new(api); - E_FREE(api); - - return gad; -} - -EAPI int -e_modapi_shutdown(E_Module *m) -{ - E_Gadget *gad; - - gad = m->data; - if (gad) e_object_del(E_OBJECT(gad)); - return 1; -} - -EAPI int -e_modapi_save(E_Module *m) -{ - return 1; -} - -EAPI int -e_modapi_info(E_Module *m) -{ - return 1; -} - -EAPI int -e_modapi_about(E_Module *m) -{ - e_module_dialog_show(_("Enlightenment Test Module"), _("Gadget test")); - return 1; -} - -static void -_test_face_init(void *data, E_Gadget_Face *face) -{ - e_gadget_face_theme_set(face, "base/theme/modules/clock", "modules/clock/main"); -} - -static void -_test_face_free(void *data, E_Gadget_Face *face) -{ - /* really, this should be done in a gadget_free callback, but that doesn't exist yet... */ - Test *t; - t = data; - if (t) free(t); - face->gad->data = NULL; -} - -static void -_test_face_change(void *data, E_Gadget_Face *face, E_Gadman_Client *gmc, E_Gadman_Change change) -{ - printf("change face!\n"); -} - -static void -_test_face_menu_init(void *data, E_Gadget_Face *face) -{ - E_Menu_Item *mi; - - mi = e_menu_item_new(face->menu); - e_menu_item_label_set(mi, _("Test Face Menu Item")); -} diff --git a/src/modules/gadget_test/e_mod_main.h b/src/modules/gadget_test/e_mod_main.h deleted file mode 100644 index 02ab36b14..000000000 --- a/src/modules/gadget_test/e_mod_main.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -typedef struct _Test Test; -struct _Test -{ - int val; -}; - -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_save (E_Module *m); -EAPI int e_modapi_info (E_Module *m); -EAPI int e_modapi_about (E_Module *m); -/*EAPI int e_modapi_config (E_Module *module);*/ - -#endif diff --git a/src/modules/test/.cvsignore b/src/modules/test/.cvsignore deleted file mode 100644 index 60ebc832f..000000000 --- a/src/modules/test/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.lo -module.la diff --git a/src/modules/test/Makefile.am b/src/modules/test/Makefile.am deleted file mode 100644 index b4ad15189..000000000 --- a/src/modules/test/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -MODULE = test - -# data files for the module -filesdir = $(libdir)/enlightenment/modules/$(MODULE) -files_DATA = -EXTRA_DIST = $(files_DATA) - -# the module .so file -INCLUDES = -I. \ - -I$(top_srcdir) \ - -I$(top_srcdir)/$(MODULE) \ - -I$(top_srcdir)/src/bin \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/modules \ - @e_cflags@ -pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) -pkg_LTLIBRARIES = module.la -module_la_SOURCES = e_mod_main.c \ - e_mod_main.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ -module_la_LDFLAGS = -module -avoid-version -module_la_DEPENDENCIES = $(top_builddir)/config.h - diff --git a/src/modules/test/e_mod_main.c b/src/modules/test/e_mod_main.c deleted file mode 100644 index 0b3a83a69..000000000 --- a/src/modules/test/e_mod_main.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2 - */ -#include "e.h" -#include "e_mod_main.h" - -EAPI E_Module_Api e_modapi = -{ - E_MODULE_API_VERSION, - "Test" -}; - -EAPI void * -e_modapi_init(E_Module *m) -{ - E_Menu *mn; - E_Menu_Item *mi; - - mn = e_menu_new(); - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Module Config Menu Item 1")); - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Module Config Menu Item 2")); - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Module Config Menu Item 3")); - mi = e_menu_item_new(mn); - e_menu_item_separator_set(mi, 1); - mi = e_menu_item_new(mn); - e_menu_item_label_set(mi, _("Something Else")); - m->config_menu = mn; - - return e_modapi_init; /* bogus pointer - just to say we worked */ -} - -EAPI int -e_modapi_shutdown(E_Module *m) -{ - if (m->config_menu) - { - e_menu_deactivate(m->config_menu); - e_object_unref(E_OBJECT(m->config_menu)); - m->config_menu = NULL; - } - return 1; -} - -EAPI int -e_modapi_save(E_Module *m) -{ - return 1; -} - -EAPI int -e_modapi_info(E_Module *m) -{ - return 1; -} - -EAPI int -e_modapi_about(E_Module *m) -{ - e_module_dialog_show(_("Enlightenment Test Module"), - _("This module is VERY simple and is only used to test the basic
" - "interface of the Enlightenment 0.17.0 module system. Please
" - "ignore this module unless you are working on the module system.")); - return 1; -} diff --git a/src/modules/test/e_mod_main.h b/src/modules/test/e_mod_main.h deleted file mode 100644 index d464890c4..000000000 --- a/src/modules/test/e_mod_main.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef E_MOD_MAIN_H -#define E_MOD_MAIN_H - -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_save (E_Module *m); -EAPI int e_modapi_info (E_Module *m); -EAPI int e_modapi_about (E_Module *m); - -#endif