Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/modules/battery


Modified Files:
        e_mod_main.c e_mod_main.h 


Log Message:
Move module api check to module loader.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- e_mod_main.c        22 Sep 2005 18:17:16 -0000      1.47
+++ e_mod_main.c        23 Sep 2005 17:13:47 -0000      1.48
@@ -65,23 +65,17 @@
 static int battery_count;
 
 /* public module routines. all modules must have these */
+E_Module_Api e_module_api = 
+{
+   E_MODULE_API_VERSION,
+   "Battery"
+};
+
 void *
 e_modapi_init(E_Module *m)
 {
    Battery *e;
 
-   /* check module api version */
-   if (m->api->version < E_MODULE_API_VERSION)
-     {
-       char buf[4096];
-       snprintf(buf, sizeof(buf), _("Module API Error<br>Error initializing 
Module: %s<br>"
-                                    "It requires a minimum module API version 
of: %i.<br>"
-                                    "The module API advertized by 
Enlightenment is: %i.<br>"), 
-                                  _("Battery"), E_MODULE_API_VERSION, 
m->api->version);
-
-       e_module_dialog_show(_("Enlightenment Battery Module"), buf);
-       return NULL;
-     }
    /* actually init battery */
    e = _battery_new();
    m->config_menu = e->config_menu;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/battery/e_mod_main.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_main.h        30 Aug 2005 12:15:36 -0000      1.11
+++ e_mod_main.h        23 Sep 2005 17:13:47 -0000      1.12
@@ -86,6 +86,8 @@
    char *time;
 };
 
+extern E_Module_Api e_module_api;
+
 EAPI void *e_modapi_init     (E_Module *m);
 EAPI int   e_modapi_shutdown (E_Module *m);
 EAPI int   e_modapi_save     (E_Module *m);




-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to