styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename a couple of functions as they conflict w/ the indicator module. 

SVN revision: 43974
This commit is contained in:
Christopher Michael 2009-11-25 16:56:22 +00:00
parent 8de4615f22
commit aa2fc5cf16
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/illume-softkey/e_mod_main.c
View File

@ -13,9 +13,9 @@ e_modapi_init(E_Module *m)
{ {
if (!il_sk_config_init(m)) return NULL; if (!il_sk_config_init(m)) return NULL;
e_mod_win_init(); e_mod_sk_win_init();
swin = e_mod_win_new(); swin = e_mod_sk_win_new();
return m; return m;
} }
@ -26,7 +26,7 @@ e_modapi_shutdown(E_Module *m)
e_object_del(E_OBJECT(swin)); e_object_del(E_OBJECT(swin));
swin = NULL; swin = NULL;
e_mod_win_shutdown(); e_mod_sk_win_shutdown();
il_sk_config_shutdown(); il_sk_config_shutdown();

14
src/modules/illume-softkey/e_mod_win.c
View File

@ -10,19 +10,19 @@ static void _il_sk_win_cb_back_click(void *data, void *data2);
static void _il_sk_win_cb_close_click(void *data, void *data2); static void _il_sk_win_cb_close_click(void *data, void *data2);
EAPI int EAPI int
e_mod_win_init(void) e_mod_sk_win_init(void)
{ {
return 1; return 1;
} }
EAPI int EAPI int
e_mod_win_shutdown(void) e_mod_sk_win_shutdown(void)
{ {
return 1; return 1;
} }
EAPI Il_Sk_Win * EAPI Il_Sk_Win *
e_mod_win_new(void) e_mod_sk_win_new(void)
{ {
Il_Sk_Win *swin; Il_Sk_Win *swin;
E_Zone *zone; E_Zone *zone;
@ -37,11 +37,11 @@ e_mod_win_new(void)
if (!swin) return NULL; if (!swin) return NULL;
swin->win = e_win_new(e_util_container_number_get(0)); swin->win = e_win_new(e_util_container_number_get(0));
states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR; // states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR;
states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER; // states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER;
ecore_x_netwm_window_state_set(swin->win->evas_win, states, 2); // ecore_x_netwm_window_state_set(swin->win->evas_win, states, 2);
ecore_x_icccm_hints_set(swin->win->evas_win, 0, 0, 0, 0, 0, 0, 0); ecore_x_icccm_hints_set(swin->win->evas_win, 0, 0, 0, 0, 0, 0, 0);
ecore_x_netwm_window_type_set(swin->win->evas_win, ECORE_X_WINDOW_TYPE_DOCK); // ecore_x_netwm_window_type_set(swin->win->evas_win, ECORE_X_WINDOW_TYPE_DOCK);
zone = e_util_container_zone_number_get(0, 0); zone = e_util_container_zone_number_get(0, 0);
e_win_no_remember_set(swin->win, 1); e_win_no_remember_set(swin->win, 1);

6
src/modules/illume-softkey/e_mod_win.h
View File

@ -1,8 +1,8 @@
#ifndef E_MOD_WIN_H #ifndef E_MOD_WIN_H
#define E_MOD_WIN_H #define E_MOD_WIN_H
EAPI int e_mod_win_init(void); EAPI int e_mod_sk_win_init(void);
EAPI int e_mod_win_shutdown(void); EAPI int e_mod_sk_win_shutdown(void);
EAPI Il_Sk_Win *e_mod_win_new(void); EAPI Il_Sk_Win *e_mod_sk_win_new(void);
#endif #endif