Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

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


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/ibox/e_mod_main.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_main.c        22 Sep 2005 18:17:17 -0000      1.17
+++ e_mod_main.c        23 Sep 2005 17:13:47 -0000      1.18
@@ -92,23 +92,17 @@
 static void    _ibox_box_cb_menu_edit(void *data, E_Menu *m, E_Menu_Item *mi);
 
 /* public module routines. all modules must have these */
+E_Module_Api e_module_api = 
+{
+   E_MODULE_API_VERSION,
+   "IBox"
+};
+
 void *
 e_modapi_init(E_Module *m)
 {
    IBox *ib;
 
-   /* 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>"), 
-                                  _("IBox"), E_MODULE_API_VERSION, 
m->api->version);
-
-       e_module_dialog_show(_("Enlightenment IBox Module"), buf);
-       return NULL;
-     }
    /* actually init ibox */
    ib = _ibox_new();
    m->config_menu = ib->config_menu;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/ibox/e_mod_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.h        8 Jun 2005 12:12:27 -0000       1.4
+++ e_mod_main.h        23 Sep 2005 17:13:47 -0000      1.5
@@ -84,6 +84,8 @@
    unsigned char  raise_on_hilight : 1;
 };
 
+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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to