From 087319c5c0c21dfbd506ea97e91820f03f6fd9f4 Mon Sep 17 00:00:00 2001 From: sebastid Date: Wed, 7 Sep 2005 09:50:14 +0000 Subject: [PATCH] Completely wrong. Don't make private. SVN revision: 16657 --- legacy/ecore/src/lib/ecore_x/Ecore_X.h | 3 +++ legacy/ecore/src/lib/ecore_x/ecore_x.c | 6 +++--- legacy/ecore/src/lib/ecore_x/ecore_x_e.c | 2 +- legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c | 2 +- legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c | 2 +- legacy/ecore/src/lib/ecore_x/ecore_x_private.h | 7 ------- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_x/Ecore_X.h b/legacy/ecore/src/lib/ecore_x/Ecore_X.h index 577eeeaaff..fea6abc0ea 100644 --- a/legacy/ecore/src/lib/ecore_x/Ecore_X.h +++ b/legacy/ecore/src/lib/ecore_x/Ecore_X.h @@ -1078,6 +1078,7 @@ EAPI void ecore_x_window_sniff(Ecore_X_Window win); EAPI void ecore_x_window_client_sniff(Ecore_X_Window win); EAPI Ecore_X_Atom ecore_x_atom_get(const char *name); +EAPI void ecore_x_icccm_init(void); EAPI void ecore_x_icccm_state_set(Ecore_X_Window win, Ecore_X_Window_State_Hint state); EAPI Ecore_X_Window_State_Hint ecore_x_icccm_state_get(Ecore_X_Window win); EAPI void ecore_x_icccm_delete_window_send(Ecore_X_Window win, Ecore_X_Time t); @@ -1184,6 +1185,7 @@ EAPI int ecore_x_mwm_hints_get(Ecore_X_Window win, EAPI void ecore_x_mwm_borderless_set(Ecore_X_Window win, int borderless); /* netwm */ +EAPI void ecore_x_netwm_init(void); EAPI void ecore_x_netwm_wm_identify(Ecore_X_Window root, Ecore_X_Window check, const char *wm_name); EAPI void ecore_x_netwm_supported_set(Ecore_X_Window root, Ecore_X_Atom *supported, int num); EAPI int ecore_x_netwm_supported_get(Ecore_X_Window root, Ecore_X_Atom **supported, int *num); @@ -1241,6 +1243,7 @@ EAPI void ecore_x_netwm_desktop_request_send(Ecore_X_Window win, +EAPI void ecore_x_e_init(void); EAPI void ecore_x_e_frame_size_set(Ecore_X_Window win, int fl, int fr, int ft, int fb); diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x.c b/legacy/ecore/src/lib/ecore_x/ecore_x.c index 5304dc06ee..005a54efce 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x.c @@ -385,17 +385,17 @@ ecore_x_init(const char *name) ECORE_X_ATOM_TEXT = XInternAtom(_ecore_x_disp, "TEXT", False); /* Set up the ICCCM hints */ - _ecore_x_icccm_init(); + ecore_x_icccm_init(); ECORE_X_ATOM_MOTIF_WM_HINTS = XInternAtom(_ecore_x_disp, "_MOTIF_WM_HINTS", False); ECORE_X_ATOM_WIN_LAYER = XInternAtom(_ecore_x_disp, "_WIN_LAYER", False); /* Set up the _NET_... hints */ - _ecore_x_netwm_init(); + ecore_x_netwm_init(); /* old e hints init */ - _ecore_x_e_init(); + ecore_x_e_init(); /* This is just to be anal about naming conventions */ ECORE_X_ATOM_SELECTION_TARGETS = XInternAtom(_ecore_x_disp, "TARGETS", False); diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_e.c b/legacy/ecore/src/lib/ecore_x/ecore_x_e.c index 9af5da9424..398f4cc25c 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_e.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_e.c @@ -19,7 +19,7 @@ Ecore_X_Atom ECORE_X_ATOM_E_FRAME_SIZE = 0; void -_ecore_x_e_init(void) +ecore_x_e_init(void) { ECORE_X_ATOM_E_FRAME_SIZE = _ATOM_GET("_E_FRAME_SIZE"); } diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c b/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c index a7248a391a..0abf42cf1c 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_icccm.c @@ -32,7 +32,7 @@ Ecore_X_Atom ECORE_X_ATOM_WM_TRANSIENT_FOR = 0; Ecore_X_Atom ECORE_X_ATOM_WM_SAVE_YOURSELF = 0; void -_ecore_x_icccm_init(void) +ecore_x_icccm_init(void) { ECORE_X_ATOM_WM_STATE = XInternAtom(_ecore_x_disp, "WM_STATE", False); diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c b/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c index b2f2addbe6..76d970e05e 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_netwm.c @@ -169,7 +169,7 @@ Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST = 0; Ecore_X_Atom ECORE_X_ATOM_NET_WM_SYNC_REQUEST_COUNTER = 0; void -_ecore_x_netwm_init(void) +ecore_x_netwm_init(void) { ECORE_X_ATOM_NET_SUPPORTED = _ATOM_GET("_NET_SUPPORTED"); ECORE_X_ATOM_NET_SUPPORTING_WM_CHECK = _ATOM_GET("_NET_SUPPORTING_WM_CHECK"); diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h index 977dfdb957..11ec16c35a 100644 --- a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h +++ b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h @@ -210,15 +210,8 @@ void _ecore_x_dnd_drag(int x, int y); void _ecore_x_dnd_shutdown(void); /* from netwm */ -void _ecore_x_netwm_init(void); Ecore_X_Window_State _ecore_x_netwm_state_get(Ecore_X_Atom a); -/* from icccm */ -void _ecore_x_icccm_init(void); - -/* from e */ -void _ecore_x_e_init(void); - /* from sync */ #endif