Rename some functions so they do not conflict w/ illume-softkey.

SVN revision: 43976

diff --git a/src/modules/illume-indicator/e_mod_main.c b/src/modules/illume-indicator/e_mod_main.c
index 9dcf160..6c72941 100644 (file)
--- a/src/modules/illume-indicator/e_mod_main.c
+++ b/src/modules/illume-indicator/e_mod_main.c
@@ -13,9 +13,9 @@ e_modapi_init(E_Module *m)
 {
    if (!il_ind_config_init(m)) return NULL;
 
-   e_mod_win_init();
+   e_mod_ind_win_init();
 
-   iwin = e_mod_win_new();
+   iwin = e_mod_ind_win_new();
 
    return m;
 }
@@ -26,7 +26,7 @@ e_modapi_shutdown(E_Module *m)
    e_object_del(E_OBJECT(iwin));
    iwin = NULL;
 
-   e_mod_win_shutdown();
+   e_mod_ind_win_shutdown();
    il_ind_config_shutdown();
    return 1;
 }

diff --git a/src/modules/illume-indicator/e_mod_win.c b/src/modules/illume-indicator/e_mod_win.c
index 058ecde..bcdc12d 100644 (file)
--- a/src/modules/illume-indicator/e_mod_win.c
+++ b/src/modules/illume-indicator/e_mod_win.c
@@ -20,19 +20,19 @@ static void _il_ind_win_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
 static void _il_ind_win_cb_menu_contents(void *data, E_Menu *mn, E_Menu_Item *mi);
 
 EAPI int 
-e_mod_win_init(void) 
+e_mod_ind_win_init(void) 
 {
    return 1;
 }
 
 EAPI int 
-e_mod_win_shutdown(void) 
+e_mod_ind_win_shutdown(void) 
 {
    return 1;
 }
 
 EAPI Il_Ind_Win *
-e_mod_win_new(void) 
+e_mod_ind_win_new(void) 
 {
    Il_Ind_Win *iwin;
    E_Zone *zone;

diff --git a/src/modules/illume-indicator/e_mod_win.h b/src/modules/illume-indicator/e_mod_win.h
index 14e61c6..6497cba 100644 (file)
--- a/src/modules/illume-indicator/e_mod_win.h
+++ b/src/modules/illume-indicator/e_mod_win.h
@@ -1,8 +1,8 @@
 #ifndef E_MOD_WIN_H
 #define E_MOD_WIN_H
 
-EAPI int e_mod_win_init(void);
-EAPI int e_mod_win_shutdown(void);
-EAPI Il_Ind_Win *e_mod_win_new(void);
+EAPI int e_mod_ind_win_init(void);
+EAPI int e_mod_ind_win_shutdown(void);
+EAPI Il_Ind_Win *e_mod_ind_win_new(void);
 
 #endif