Remove EAPI from functions that do not need it.

Create a gadget that can be added to gadcons for switching policy dual-app
mode.

SVN revision: 44083

diff --git a/src/modules/illume2/Makefile.am b/src/modules/illume2/Makefile.am
index 916e170..9704abf 100644 (file)
--- a/src/modules/illume2/Makefile.am
+++ b/src/modules/illume2/Makefile.am
@@ -38,7 +38,9 @@ module_la_SOURCES      = e_mod_main.h \
                          e_mod_policy.h \
                          e_mod_policy.c \
                          e_mod_policy_settings.h \
-                         e_mod_policy_settings.c
+                         e_mod_policy_settings.c \
+                         e_mod_gadcon.h \
+                         e_mod_gadcon.c
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version

diff --git a/src/modules/illume2/e-module-illume2.edj b/src/modules/illume2/e-module-illume2.edj
index 3c09021..0853076 100644 (file)
Binary files a/src/modules/illume2/e-module-illume2.edj and b/src/modules/illume2/e-module-illume2.edj differ

diff --git a/src/modules/illume2/e_mod_config.c b/src/modules/illume2/e_mod_config.c
index 8ab6642..7295557 100644 (file)
--- a/src/modules/illume2/e_mod_config.c
+++ b/src/modules/illume2/e_mod_config.c
@@ -11,7 +11,7 @@ EAPI Il_Config *il_cfg = NULL;
 static E_Config_DD *conf_edd = NULL;
 
 /* public functions */
-EAPI int 
+int 
 il_config_init(E_Module *m) 
 {
    conf_edd = E_CONFIG_DD_NEW("Illume_Cfg", Il_Config);
@@ -150,7 +150,7 @@ il_config_init(E_Module *m)
    return 1;
 }
 
-EAPI int 
+int 
 il_config_shutdown(void) 
 {
    e_configure_registry_item_del("illume/policy_settings");
@@ -198,7 +198,7 @@ il_config_shutdown(void)
    return 1;
 }
 
-EAPI int 
+int 
 il_config_save(void) 
 {
    e_config_domain_save("module.illume2", conf_edd, il_cfg);

diff --git a/src/modules/illume2/e_mod_config.h b/src/modules/illume2/e_mod_config.h
index 42170f3..1f3b648 100644 (file)
--- a/src/modules/illume2/e_mod_config.h
+++ b/src/modules/illume2/e_mod_config.h
@@ -43,9 +43,9 @@ struct _Il_Config
    E_Config_Dialog *cfd;
 };
 
-EAPI int il_config_init(E_Module *m);
-EAPI int il_config_shutdown(void);
-EAPI int il_config_save(void);
+int il_config_init(E_Module *m);
+int il_config_shutdown(void);
+int il_config_save(void);
 
 extern EAPI Il_Config *il_cfg;
 

diff --git a/src/modules/illume2/e_mod_main.c b/src/modules/illume2/e_mod_main.c
index 96d957f..40f707c 100644 (file)
--- a/src/modules/illume2/e_mod_main.c
+++ b/src/modules/illume2/e_mod_main.c
@@ -3,6 +3,7 @@
 #include "e_mod_config.h"
 #include "e_mod_layout.h"
 #include "e_kbd.h"
+#include "e_mod_gadcon.h"
 
 static E_Kbd *kbd = NULL;
 
@@ -19,6 +20,10 @@ e_modapi_init(E_Module *m)
    /* init the config system */
    if (!il_config_init(m)) return NULL;
 
+   /* init the gadcon subsystem for adding a "button" to any gadget container
+    * which will allow easy switching between policy app modes */
+   e_mod_gadcon_init();
+
    /* set up the virtual keyboard */
    e_kbd_init(m);
 
@@ -32,6 +37,7 @@ e_modapi_init(E_Module *m)
    /* show the keyboard if needed */
    e_kbd_show(kbd);
 
+
    /* return NULL on failure, anything else on success. the pointer
     * returned will be set as m->data for convenience tracking */
    return m;
@@ -51,6 +57,9 @@ e_modapi_shutdown(E_Module *m)
    /* shutdown the kbd subsystem */
    e_kbd_shutdown();
 
+   /* shutdown the gadget subsystem */
+   e_mod_gadcon_shutdown();
+
    /* shutdown the config subsystem */
    il_config_shutdown();
 

diff --git a/src/modules/illume2/e_mod_windows.c b/src/modules/illume2/e_mod_windows.c
index 1c06d24..621f83d 100644 (file)
--- a/src/modules/illume2/e_mod_windows.c
+++ b/src/modules/illume2/e_mod_windows.c
@@ -36,7 +36,7 @@ il_config_windows_show(E_Container *con, const char *params)
    v->scroll = 1;
    cfd = e_config_dialog_new(con, _("Window Settings"), "E", 
                              "_config_illume_windows_settings", 
-                             "enlightenment/windows", 0, v, NULL);
+                             "preferences-system-windows", 0, v, NULL);
    e_dialog_resizable_set(cfd->dia, 1);
 }