Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

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


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/test/e_mod_main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.c        22 Sep 2005 18:17:18 -0000      1.7
+++ e_mod_main.c        23 Sep 2005 17:13:47 -0000      1.8
@@ -4,38 +4,31 @@
 #include "e.h"
 #include "e_mod_main.h"
 
+E_Module_Api e_module_api = 
+{
+   E_MODULE_API_VERSION,
+   "Test"
+};
+
 void *
 e_modapi_init(E_Module *m)
 {
-   if (m->api->version < E_MODULE_API_VERSION)
-     {
-       char buf[4096];
+   E_Menu *mn;
+   E_Menu_Item *mi;
 
-       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>"), 
-                                  _("Test"), E_MODULE_API_VERSION, 
m->api->version);
+   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;
 
-       e_module_dialog_show(_("Enlightenment Test Module"), buf);
-       return NULL;
-     }
-     {
-       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 */
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/test/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h        12 Apr 2005 03:34:31 -0000      1.3
+++ e_mod_main.h        23 Sep 2005 17:13:47 -0000      1.4
@@ -1,6 +1,8 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
+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