Enlightenment CVS committal

Author  : devilhorns
Project : e_modules
Module  : cpu

Dir     : e_modules/cpu


Modified Files:
        Makefile.am e_mod_main.h e_mod_main.c 
Added Files:
        module.eap 


Log Message:
Make cpu module build again at elvelind's request, and show in module list.
No shelf code yet, draws to the desktop.

Note: This module will be removed when E gets its "official" cpu load module.

===================================================================
RCS file: /cvs/e/e_modules/cpu/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 13 May 2006 02:00:54 -0000      1.5
+++ Makefile.am 4 Jun 2006 09:58:41 -0000       1.6
@@ -9,6 +9,7 @@
 cpu.edc \
 VeraMono.ttf \
 cpu.png \
+module.eap \
 e_modules-cpu.spec e_modules-cpu.spec.in 
 
 # data files for the module
@@ -16,6 +17,7 @@
 
 files_DATA = \
 module_icon.png \
+module.eap \
 cpu.edj
 
 # the module .so file
===================================================================
RCS file: /cvs/e/e_modules/cpu/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h        5 Apr 2006 17:48:48 -0000       1.8
+++ e_mod_main.h        4 Jun 2006 09:58:41 -0000       1.9
@@ -56,7 +56,6 @@
 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 *m);
 
===================================================================
RCS file: /cvs/e/e_modules/cpu/e_mod_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_main.c        5 Apr 2006 17:48:48 -0000       1.18
+++ e_mod_main.c        4 Jun 2006 09:58:41 -0000       1.19
@@ -42,7 +42,6 @@
    if (!c)
       return NULL;
 
-   m->config_menu = c->config_menu;
    return c;
 }
 
@@ -55,12 +54,6 @@
    if (!c)
       return 0;
 
-   if (m->config_menu)
-     {
-        e_menu_deactivate(m->config_menu);
-        e_object_del(E_OBJECT(m->config_menu));
-        m->config_menu = NULL;
-     }
    if (c->cfd)
      {
         e_object_del(E_OBJECT(c->cfd));
@@ -79,13 +72,6 @@
    if (!c)
       return 0;
    e_config_domain_save("module.cpu", c->conf_edd, c->conf);
-   return 1;
-}
-
-EAPI int
-e_modapi_info(E_Module *m)
-{
-   m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
    return 1;
 }
 




_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to