Rename some more functions to be 'illume' specific so we don't clash.

SVN revision: 46514

src/modules/illume2/e_mod_config.c

@@ -91,13 +91,13 @@ e_mod_illume_config_init(void)
    /* add config items to category */
    e_configure_registry_generic_item_add("illume/policy", 0, _("Policy"), 
                                          NULL, "enlightenment/policy", 
-                                         e_mod_config_policy_show);
+                                         e_mod_illume_config_policy_show);
    e_configure_registry_generic_item_add("illume/animation", 0, _("Animation"), 
                                          NULL, "enlightenment/animation", 
-                                         e_mod_config_animation_show);
+                                         e_mod_illume_config_animation_show);
    e_configure_registry_generic_item_add("illume/windows", 0, _("Windows"), 
                                          NULL, "enlightenment/windows", 
-                                         e_mod_config_windows_show);
+                                         e_mod_illume_config_windows_show);
 
    return 1;
 }

src/modules/illume2/e_mod_config_animation.c

@@ -2,17 +2,17 @@
 #include "e_mod_config_animation.h"
 
 /* local function prototypes */
-static void *_e_mod_config_animation_create(E_Config_Dialog *cfd);
+static void *_e_mod_illume_config_animation_create(E_Config_Dialog *cfd);
-static void _e_mod_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void _e_mod_illume_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_e_mod_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_e_mod_illume_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _e_mod_config_animation_change(void *data, Evas_Object *obj, void *event);
+static void _e_mod_illume_config_animation_change(void *data, Evas_Object *obj, void *event);
-static int _e_mod_config_animation_timeout(void *data);
+static int _e_mod_illume_config_animation_timeout(void *data);
 
 /* local variables */
 Ecore_Timer *_anim_change_timer = NULL;
 
 void 
-e_mod_config_animation_show(E_Container *con, const char *params __UNUSED__) 
+e_mod_illume_config_animation_show(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
@@ -22,9 +22,9 @@ e_mod_config_animation_show(E_Container *con, const char *params __UNUSED__)
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return;
 
-   v->create_cfdata = _e_mod_config_animation_create;
+   v->create_cfdata = _e_mod_illume_config_animation_create;
-   v->free_cfdata = _e_mod_config_animation_free;
+   v->free_cfdata = _e_mod_illume_config_animation_free;
-   v->basic.create_widgets = _e_mod_config_animation_ui;
+   v->basic.create_widgets = _e_mod_illume_config_animation_ui;
    v->basic_only = 1;
    v->normal_win = 1;
    v->scroll = 1;
@@ -39,20 +39,20 @@ e_mod_config_animation_show(E_Container *con, const char *params __UNUSED__)
 
 /* local function prototypes */
 static void *
-_e_mod_config_animation_create(E_Config_Dialog *cfd) 
+_e_mod_illume_config_animation_create(E_Config_Dialog *cfd) 
 {
    return NULL;
 }
 
 static void 
-_e_mod_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_animation_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    if (_anim_change_timer) ecore_timer_del(_anim_change_timer);
    _anim_change_timer = NULL;
 }
 
 static Evas_Object *
-_e_mod_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *list, *of, *ow;
    E_Radio_Group *rg;
@@ -64,23 +64,23 @@ _e_mod_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Dat
    ow = e_widget_radio_add(evas, _("Slow"), 2000, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Medium"), 1000, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Fast"), 500, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Very Fast"), 250, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Off"), 0, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    of = e_widget_framelist_add(evas, _("Quickpanel"), 0);
@@ -88,38 +88,38 @@ _e_mod_config_animation_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Dat
    ow = e_widget_radio_add(evas, _("Slow"), 2000, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Medium"), 1000, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Fast"), 500, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Very Fast"), 250, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    ow = e_widget_radio_add(evas, _("Off"), 0, rg);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_animation_change, NULL);
+                                  _e_mod_illume_config_animation_change, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    return list;
 }
 
 static void 
-_e_mod_config_animation_change(void *data, Evas_Object *obj, void *event) 
+_e_mod_illume_config_animation_change(void *data, Evas_Object *obj, void *event) 
 {
    if (_anim_change_timer) ecore_timer_del(_anim_change_timer);
    _anim_change_timer = 
-     ecore_timer_add(0.5, _e_mod_config_animation_timeout, data);
+     ecore_timer_add(0.5, _e_mod_illume_config_animation_timeout, data);
 }
 
 static int 
-_e_mod_config_animation_timeout(void *data) 
+_e_mod_illume_config_animation_timeout(void *data) 
 {
    e_config_save_queue();
    _anim_change_timer = NULL;

src/modules/illume2/e_mod_config_animation.h

@@ -1,6 +1,6 @@
 #ifndef E_MOD_CONFIG_ANIMATION_H
 # define E_MOD_CONFIG_ANIMATION_H
 
-void e_mod_config_animation_show(E_Container *con, const char *params __UNUSED__);
+void e_mod_illume_config_animation_show(E_Container *con, const char *params __UNUSED__);
 
 #endif

src/modules/illume2/e_mod_config_policy.c

@@ -2,21 +2,21 @@
 #include "e_mod_config_policy.h"
 
 /* local function prototypes */
-static void *_e_mod_config_policy_create(E_Config_Dialog *cfd);
+static void *_e_mod_illume_config_policy_create(E_Config_Dialog *cfd);
-static void _e_mod_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void _e_mod_illume_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_e_mod_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _e_mod_config_policy_list_changed(void *data);
+static void _e_mod_illume_config_policy_list_changed(void *data);
-static int _e_mod_config_policy_change_timeout(void *data);
+static int _e_mod_illume_config_policy_change_timeout(void *data);
-static Evas_Object *_e_mod_config_policy_settings_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_e_mod_illume_config_policy_settings_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static Eina_List *_e_mod_config_policy_policies_get(void);
+static Eina_List *_e_mod_illume_config_policy_policies_get(void);
-static void _e_mod_config_policy_policy_free(E_Illume_Policy *p);
+static void _e_mod_illume_config_policy_policy_free(E_Illume_Policy *p);
 
 /* local variables */
 Ecore_Timer *_policy_change_timer = NULL;
 const char *_policy_name = NULL;
 
 void 
-e_mod_config_policy_show(E_Container *con, const char *params) 
+e_mod_illume_config_policy_show(E_Container *con, const char *params) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
@@ -26,9 +26,9 @@ e_mod_config_policy_show(E_Container *con, const char *params)
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return;
 
-   v->create_cfdata = _e_mod_config_policy_create;
+   v->create_cfdata = _e_mod_illume_config_policy_create;
-   v->free_cfdata = _e_mod_config_policy_free;
+   v->free_cfdata = _e_mod_illume_config_policy_free;
-   v->basic.create_widgets = _e_mod_config_policy_ui;
+   v->basic.create_widgets = _e_mod_illume_config_policy_ui;
    v->basic_only = 1;
    v->normal_win = 1;
    v->scroll = 1;
@@ -40,20 +40,20 @@ e_mod_config_policy_show(E_Container *con, const char *params)
 
 /* local functions */
 static void *
-_e_mod_config_policy_create(E_Config_Dialog *cfd) 
+_e_mod_illume_config_policy_create(E_Config_Dialog *cfd) 
 {
    return NULL;
 }
 
 static void 
-_e_mod_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_policy_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
    _policy_change_timer = NULL;
 }
 
 static Evas_Object *
-_e_mod_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *list, *ow;
    Eina_List *policies;
@@ -69,13 +69,13 @@ _e_mod_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *
    e_widget_ilist_clear(ow);
    e_widget_ilist_go(ow);
 
-   policies = _e_mod_config_policy_policies_get();
+   policies = _e_mod_illume_config_policy_policies_get();
    if (policies) 
      {
         EINA_LIST_FREE(policies, p) 
           {
              e_widget_ilist_append(ow, NULL, strdup(p->api->label), 
-                                   _e_mod_config_policy_list_changed, NULL, 
+                                   _e_mod_illume_config_policy_list_changed, NULL, 
                                    strdup(p->api->name));
 
              if ((p) && (_e_illume_cfg->policy.name) && 
@@ -98,7 +98,7 @@ _e_mod_config_policy_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *
 }
 
 static void 
-_e_mod_config_policy_list_changed(void *data) 
+_e_mod_illume_config_policy_list_changed(void *data) 
 {
    if (_e_illume_cfg->policy.name) 
      eina_stringshare_del(_e_illume_cfg->policy.name);
@@ -106,11 +106,11 @@ _e_mod_config_policy_list_changed(void *data)
      _e_illume_cfg->policy.name = eina_stringshare_add(_policy_name);
    if (_policy_change_timer) ecore_timer_del(_policy_change_timer);
    _policy_change_timer = 
-     ecore_timer_add(0.5, _e_mod_config_policy_change_timeout, data);
+     ecore_timer_add(0.5, _e_mod_illume_config_policy_change_timeout, data);
 }
 
 static int 
-_e_mod_config_policy_change_timeout(void *data) 
+_e_mod_illume_config_policy_change_timeout(void *data) 
 {
    e_config_save_queue();
    _policy_change_timer = NULL;
@@ -119,7 +119,7 @@ _e_mod_config_policy_change_timeout(void *data)
 }
 
 static Eina_List *
-_e_mod_config_policy_policies_get(void) 
+_e_mod_illume_config_policy_policies_get(void) 
 {
    Eina_List *l = NULL, *files;
    char dir[PATH_MAX], *file;
@@ -136,7 +136,7 @@ _e_mod_config_policy_policies_get(void)
         snprintf(dir, sizeof(dir),"%s/policies/%s", _e_illume_mod_dir, file);
 
         p = E_OBJECT_ALLOC(E_Illume_Policy, E_ILLUME_POLICY_TYPE,
-                         _e_mod_config_policy_policy_free);
+                         _e_mod_illume_config_policy_policy_free);
         if (!p) continue;
 
         p->handle = dlopen(dir, RTLD_NOW | RTLD_GLOBAL);
@@ -164,7 +164,7 @@ _e_mod_config_policy_policies_get(void)
 }
 
 static void 
-_e_mod_config_policy_policy_free(E_Illume_Policy *p) 
+_e_mod_illume_config_policy_policy_free(E_Illume_Policy *p) 
 {
    p->api = NULL;
 

src/modules/illume2/e_mod_config_policy.h

@@ -1,6 +1,6 @@
 #ifndef E_MOD_CONFIG_POLICY_H
 # define E_MOD_CONFIG_POLICY_H
 
-void e_mod_config_policy_show(E_Container *con, const char *params __UNUSED__);
+void e_mod_illume_config_policy_show(E_Container *con, const char *params __UNUSED__);
 
 #endif

src/modules/illume2/e_mod_config_windows.c

@@ -3,23 +3,23 @@
 #include "e_mod_select_window.h"
 
 /* local function prototypes */
-static void *_e_mod_config_windows_create(E_Config_Dialog *cfd);
+static void *_e_mod_illume_config_windows_create(E_Config_Dialog *cfd);
-static void _e_mod_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void _e_mod_illume_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_e_mod_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_e_mod_illume_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _e_mod_config_windows_check_changed(void *data, Evas_Object *obj, void *event);
+static void _e_mod_illume_config_windows_check_changed(void *data, Evas_Object *obj, void *event);
-static void _e_mod_config_windows_change(void *data, Evas_Object *obj, void *event);
+static void _e_mod_illume_config_windows_change(void *data, Evas_Object *obj, void *event);
-static int _e_mod_config_windows_change_timeout(void *data);
+static int _e_mod_illume_config_windows_change_timeout(void *data);
-static void _e_mod_config_windows_select_home(void *data, void *data2);
+static void _e_mod_illume_config_windows_select_home(void *data, void *data2);
-static void _e_mod_config_windows_select_vkbd(void *data, void *data2);
+static void _e_mod_illume_config_windows_select_vkbd(void *data, void *data2);
-static void _e_mod_config_windows_select_softkey(void *data, void *data2);
+static void _e_mod_illume_config_windows_select_softkey(void *data, void *data2);
-static void _e_mod_config_windows_select_indicator(void *data, void *data2);
+static void _e_mod_illume_config_windows_select_indicator(void *data, void *data2);
 
 /* local variables */
 Ecore_Timer *_windows_change_timer = NULL;
 
 /* public functions */
 void 
-e_mod_config_windows_show(E_Container *con, const char *params __UNUSED__) 
+e_mod_illume_config_windows_show(E_Container *con, const char *params __UNUSED__) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
@@ -29,9 +29,9 @@ e_mod_config_windows_show(E_Container *con, const char *params __UNUSED__)
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return;
 
-   v->create_cfdata = _e_mod_config_windows_create;
+   v->create_cfdata = _e_mod_illume_config_windows_create;
-   v->free_cfdata = _e_mod_config_windows_free;
+   v->free_cfdata = _e_mod_illume_config_windows_free;
-   v->basic.create_widgets = _e_mod_config_windows_ui;
+   v->basic.create_widgets = _e_mod_illume_config_windows_ui;
    v->basic_only = 1;
    v->normal_win = 1;
    v->scroll = 1;
@@ -44,20 +44,20 @@ e_mod_config_windows_show(E_Container *con, const char *params __UNUSED__)
 
 /* local function prototypes */
 static void *
-_e_mod_config_windows_create(E_Config_Dialog *cfd) 
+_e_mod_illume_config_windows_create(E_Config_Dialog *cfd) 
 {
    return NULL;
 }
 
 static void 
-_e_mod_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_windows_free(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
    if (_windows_change_timer) ecore_timer_del(_windows_change_timer);
    _windows_change_timer = NULL;
 }
 
 static Evas_Object *
-_e_mod_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *list, *of, *ow;
 
@@ -65,127 +65,127 @@ _e_mod_config_windows_ui(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 
    of = e_widget_framelist_add(evas, _("Home"), 0);
    ow = e_widget_button_add(evas, _("Select Window"), NULL, 
-                            _e_mod_config_windows_select_home, NULL, NULL);
+                            _e_mod_illume_config_windows_select_home, NULL, NULL);
    e_widget_framelist_object_append(of, ow);
    ow = e_widget_check_add(evas, _("Match Window Class"), 
                            &_e_illume_cfg->policy.home.match.class);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Name"), 
                            &_e_illume_cfg->policy.home.match.name);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Title"), 
                            &_e_illume_cfg->policy.home.match.title);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Type"), 
                            &_e_illume_cfg->policy.home.match.type);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    of = e_widget_framelist_add(evas, _("Indicator"), 0);
    ow = e_widget_button_add(evas, _("Select Window"), NULL, 
-                            _e_mod_config_windows_select_indicator, NULL, NULL);
+                            _e_mod_illume_config_windows_select_indicator, NULL, NULL);
    e_widget_framelist_object_append(of, ow);
    ow = e_widget_check_add(evas, _("Match Window Class"), 
                            &_e_illume_cfg->policy.indicator.match.class);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Name"), 
                            &_e_illume_cfg->policy.indicator.match.name);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Title"), 
                            &_e_illume_cfg->policy.indicator.match.title);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Type"), 
                            &_e_illume_cfg->policy.indicator.match.type);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    of = e_widget_framelist_add(evas, _("Keyboard"), 0);
    ow = e_widget_button_add(evas, _("Select Window"), NULL, 
-                            _e_mod_config_windows_select_vkbd, NULL, NULL);
+                            _e_mod_illume_config_windows_select_vkbd, NULL, NULL);
    e_widget_framelist_object_append(of, ow);
    ow = e_widget_check_add(evas, _("Match Window Class"), 
                            &_e_illume_cfg->policy.vkbd.match.class);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Name"), 
                            &_e_illume_cfg->policy.vkbd.match.name);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Title"), 
                            &_e_illume_cfg->policy.vkbd.match.title);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Type"), 
                            &_e_illume_cfg->policy.vkbd.match.type);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    of = e_widget_framelist_add(evas, _("Softkey"), 0);
    ow = e_widget_button_add(evas, _("Select Window"), NULL, 
-                            _e_mod_config_windows_select_softkey, NULL, NULL);
+                            _e_mod_illume_config_windows_select_softkey, NULL, NULL);
    e_widget_framelist_object_append(of, ow);
    ow = e_widget_check_add(evas, _("Match Window Class"), 
                            &_e_illume_cfg->policy.softkey.match.class);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Name"), 
                            &_e_illume_cfg->policy.softkey.match.name);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Title"), 
                            &_e_illume_cfg->policy.softkey.match.title);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    ow = e_widget_check_add(evas, _("Match Window Type"), 
                            &_e_illume_cfg->policy.softkey.match.type);
    e_widget_framelist_object_append(of, ow);
    evas_object_smart_callback_add(ow, "changed", 
-                                  _e_mod_config_windows_check_changed, NULL);
+                                  _e_mod_illume_config_windows_check_changed, NULL);
    e_widget_list_object_append(list, of, 1, 0, 0.0);
 
    return list;
 }
 
 static void 
-_e_mod_config_windows_check_changed(void *data, Evas_Object *obj, void *event) 
+_e_mod_illume_config_windows_check_changed(void *data, Evas_Object *obj, void *event) 
 {
-   _e_mod_config_windows_change(data, obj, event);
+   _e_mod_illume_config_windows_change(data, obj, event);
 }
 
 static void 
-_e_mod_config_windows_change(void *data, Evas_Object *obj, void *event) 
+_e_mod_illume_config_windows_change(void *data, Evas_Object *obj, void *event) 
 {
    if (_windows_change_timer) ecore_timer_del(_windows_change_timer);
    _windows_change_timer = 
-     ecore_timer_add(0.5, _e_mod_config_windows_change_timeout, data);
+     ecore_timer_add(0.5, _e_mod_illume_config_windows_change_timeout, data);
 }
 
 static int 
-_e_mod_config_windows_change_timeout(void *data) 
+_e_mod_illume_config_windows_change_timeout(void *data) 
 {
    e_config_save_queue();
    _windows_change_timer = NULL;
@@ -193,29 +193,29 @@ _e_mod_config_windows_change_timeout(void *data)
 }
 
 static void 
-_e_mod_config_windows_select_home(void *data, void *data2) 
+_e_mod_illume_config_windows_select_home(void *data, void *data2) 
 {
    if (e_config_dialog_find("E", "_config_illume_select_window")) return;
-   e_mod_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_HOME);
+   e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_HOME);
 }
 
 static void 
-_e_mod_config_windows_select_vkbd(void *data, void *data2) 
+_e_mod_illume_config_windows_select_vkbd(void *data, void *data2) 
 {
    if (e_config_dialog_find("E", "_config_illume_select_window")) return;
-   e_mod_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_VKBD);
+   e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_VKBD);
 }
 
 static void 
-_e_mod_config_windows_select_softkey(void *data, void *data2) 
+_e_mod_illume_config_windows_select_softkey(void *data, void *data2) 
 {
    if (e_config_dialog_find("E", "_config_illume_select_window")) return;
-   e_mod_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_SOFTKEY);
+   e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_SOFTKEY);
 }
 
 static void 
-_e_mod_config_windows_select_indicator(void *data, void *data2) 
+_e_mod_illume_config_windows_select_indicator(void *data, void *data2) 
 {
    if (e_config_dialog_find("E", "_config_illume_select_window")) return;
-   e_mod_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_INDICATOR);
+   e_mod_illume_config_select_window(E_ILLUME_SELECT_WINDOW_TYPE_INDICATOR);
 }

src/modules/illume2/e_mod_config_windows.h

@@ -1,6 +1,6 @@
 #ifndef E_MOD_CONFIG_WINDOWS_H
 # define E_MOD_CONFIG_WINDOWS_H
 
-void e_mod_config_windows_show(E_Container *con, const char *params __UNUSED__);
+void e_mod_illume_config_windows_show(E_Container *con, const char *params __UNUSED__);
 
 #endif

src/modules/illume2/e_mod_select_window.c

@@ -2,12 +2,12 @@
 #include "e_mod_select_window.h"
 
 /* local function prototypes */
-static void *_e_mod_config_select_window_create_data(E_Config_Dialog *cfd);
+static void *_e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd);
-static void _e_mod_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
+static void _e_mod_illume_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static Evas_Object *_e_mod_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
+static Evas_Object *_e_mod_illume_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static void _e_mod_config_select_window_list_changed(void *data);
+static void _e_mod_illume_config_select_window_list_changed(void *data);
-static int _e_mod_config_select_window_change_timeout(void *data);
+static int _e_mod_illume_config_select_window_change_timeout(void *data);
-static int _e_mod_config_select_window_match(E_Border *bd);
+static int _e_mod_illume_config_select_window_match(E_Border *bd);
 
 /* local variables */
 E_Illume_Select_Window_Type stype;
@@ -15,7 +15,7 @@ Ecore_Timer *_sw_change_timer = NULL;
 
 /* public functions */
 void 
-e_mod_config_select_window(E_Illume_Select_Window_Type type) 
+e_mod_illume_config_select_window(E_Illume_Select_Window_Type type) 
 {
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
@@ -25,9 +25,9 @@ e_mod_config_select_window(E_Illume_Select_Window_Type type)
    v = E_NEW(E_Config_Dialog_View, 1);
    if (!v) return;
 
-   v->create_cfdata = _e_mod_config_select_window_create_data;
+   v->create_cfdata = _e_mod_illume_config_select_window_create_data;
-   v->free_cfdata = _e_mod_config_select_window_free_data;
+   v->free_cfdata = _e_mod_illume_config_select_window_free_data;
-   v->basic.create_widgets = _e_mod_config_select_window_create;
+   v->basic.create_widgets = _e_mod_illume_config_select_window_create;
    v->basic_only = 1;
    v->normal_win = 1;
    v->scroll = 1;
@@ -41,19 +41,19 @@ e_mod_config_select_window(E_Illume_Select_Window_Type type)
 }
 
 static void *
-_e_mod_config_select_window_create_data(E_Config_Dialog *cfd) 
+_e_mod_illume_config_select_window_create_data(E_Config_Dialog *cfd) 
 {
    return NULL;
 }
 
 static void 
-_e_mod_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_select_window_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) 
 {
 
 }
 
 static Evas_Object *
-_e_mod_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
+_e_mod_illume_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata) 
 {
    Evas_Object *list, *ow;
    Eina_List *bds, *l;
@@ -78,10 +78,10 @@ _e_mod_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Di
 
              if (!(bd = l->data)) continue;
              if (e_object_is_del(E_OBJECT(bd))) continue;
-             if (_e_mod_config_select_window_match(bd)) sel = i;
+             if (_e_mod_illume_config_select_window_match(bd)) sel = i;
              if (!(name = e_border_name_get(bd))) continue;
              e_widget_ilist_append(ow, NULL, name, 
-                                   _e_mod_config_select_window_list_changed, 
+                                   _e_mod_illume_config_select_window_list_changed, 
                                    bd, name);
           }
      }
@@ -97,7 +97,7 @@ _e_mod_config_select_window_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Di
 }
 
 static void 
-_e_mod_config_select_window_list_changed(void *data) 
+_e_mod_illume_config_select_window_list_changed(void *data) 
 {
    E_Border *bd;
    Ecore_X_Window_Type wtype;
@@ -162,11 +162,11 @@ _e_mod_config_select_window_list_changed(void *data)
 
    if (_sw_change_timer) ecore_timer_del(_sw_change_timer);
    _sw_change_timer = 
-     ecore_timer_add(0.5, _e_mod_config_select_window_change_timeout, data);
+     ecore_timer_add(0.5, _e_mod_illume_config_select_window_change_timeout, data);
 }
 
 static int 
-_e_mod_config_select_window_change_timeout(void *data) 
+_e_mod_illume_config_select_window_change_timeout(void *data) 
 {
    e_config_save_queue();
    _sw_change_timer = NULL;
@@ -174,7 +174,7 @@ _e_mod_config_select_window_change_timeout(void *data)
 }
 
 static int 
-_e_mod_config_select_window_match(E_Border *bd) 
+_e_mod_illume_config_select_window_match(E_Border *bd) 
 {
    Ecore_X_Window_Type wtype;
    char *title, *name, *class;

src/modules/illume2/e_mod_select_window.h

@@ -10,6 +10,6 @@ enum _E_Illume_Select_Window_Type
      E_ILLUME_SELECT_WINDOW_TYPE_INDICATOR
 };
 
-void e_mod_config_select_window(E_Illume_Select_Window_Type type);
+void e_mod_illume_config_select_window(E_Illume_Select_Window_Type type);
 
 #endif