From bfb89c4857e631d4c44cd2cbf463d7faa2228508 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Sun, 19 Apr 2009 06:46:02 +0000 Subject: [PATCH] missing guards-- SVN revision: 40209 --- legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c | 57 ++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c index 65fb2f2a10..cf6f070274 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb.c @@ -409,14 +409,33 @@ ecore_x_init(const char *name) if (!_ecore_xcb_event_handlers) { /* We get the replies of the QueryVersion request because we leave */ +#ifdef ECORE_XCB_DAMAGE _ecore_x_damage_init_finalize(); +#endif /* ECORE_XCB_DAMAGE */ +#ifdef ECORE_XCB_COMPOSITE _ecore_x_composite_init_finalize(); +#endif /* ECORE_XCB_COMPOSITE */ +#ifdef ECORE_XCB_DPMS _ecore_x_dpms_init_finalize(); +#endif /* ECORE_XCB_DPMS */ +#ifdef ECORE_XCB_RANDR _ecore_x_randr_init_finalize(); +#endif /* ECORE_XCB_RANDR */ +#ifdef ECORE_XCB_SCREENSAVER + _ecore_x_screensaver_init_finalize(); +#endif /* ECORE_XCB_SCREENSAVER */ +#ifdef ECORE_XCB_SHAPE _ecore_x_shape_init_finalize(); +#endif /* ECORE_XCB_SHAPE */ +#ifdef ECORE_XCB_SYNC _ecore_x_sync_init_finalize(); +#endif /* ECORE_XCB_SYNC */ +#ifdef ECORE_XCB_FIXES _ecore_x_xfixes_init_finalize(); +#endif /* ECORE_XCB_FIXES */ +#ifdef ECORE_XCB_XINERAMA _ecore_x_xinerama_init_finalize(); +#endif /* ECORE_XCB_XINERAMA */ xcb_disconnect(_ecore_xcb_conn); _ecore_xcb_fd_handler_handle = NULL; @@ -585,14 +604,33 @@ ecore_x_init(const char *name) if (!_ecore_xcb_fd_handler_handle) { /* We get the replies of the QueryVersion request because we leave */ +#ifdef ECORE_XCB_DAMAGE _ecore_x_damage_init_finalize(); +#endif /* ECORE_XCB_DAMAGE */ +#ifdef ECORE_XCB_COMPOSITE _ecore_x_composite_init_finalize(); +#endif /* ECORE_XCB_COMPOSITE */ +#ifdef ECORE_XCB_DPMS _ecore_x_dpms_init_finalize(); +#endif /* ECORE_XCB_DPMS */ +#ifdef ECORE_XCB_RANDR _ecore_x_randr_init_finalize(); +#endif /* ECORE_XCB_RANDR */ +#ifdef ECORE_XCB_SCREENSAVER + _ecore_x_screensaver_init_finalize(); +#endif /* ECORE_XCB_SCREENSAVER */ +#ifdef ECORE_XCB_SHAPE _ecore_x_shape_init_finalize(); +#endif /* ECORE_XCB_SHAPE */ +#ifdef ECORE_XCB_SYNC _ecore_x_sync_init_finalize(); +#endif /* ECORE_XCB_SYNC */ +#ifdef ECORE_XCB_FIXES _ecore_x_xfixes_init_finalize(); +#endif /* ECORE_XCB_FIXES */ +#ifdef ECORE_XCB_XINERAMA _ecore_x_xinerama_init_finalize(); +#endif /* ECORE_XCB_XINERAMA */ xcb_disconnect(_ecore_xcb_conn); free(_ecore_xcb_event_handlers); @@ -615,14 +653,33 @@ ecore_x_init(const char *name) _ecore_xcb_private_window = ecore_x_window_override_new(0, -77, -777, 123, 456); /* We finally get the replies of the QueryVersion request */ +#ifdef ECORE_XCB_DAMAGE _ecore_x_damage_init_finalize(); +#endif /* ECORE_XCB_DAMAGE */ +#ifdef ECORE_XCB_COMPOSITE _ecore_x_composite_init_finalize(); +#endif /* ECORE_XCB_COMPOSITE */ +#ifdef ECORE_XCB_DPMS _ecore_x_dpms_init_finalize(); +#endif /* ECORE_XCB_DPMS */ +#ifdef ECORE_XCB_RANDR _ecore_x_randr_init_finalize(); +#endif /* ECORE_XCB_RANDR */ +#ifdef ECORE_XCB_SCREENSAVER + _ecore_x_screensaver_init_finalize(); +#endif /* ECORE_XCB_SCREENSAVER */ +#ifdef ECORE_XCB_SHAPE _ecore_x_shape_init_finalize(); +#endif /* ECORE_XCB_SHAPE */ +#ifdef ECORE_XCB_SYNC _ecore_x_sync_init_finalize(); +#endif /* ECORE_XCB_SYNC */ +#ifdef ECORE_XCB_FIXES _ecore_x_xfixes_init_finalize(); +#endif /* ECORE_XCB_FIXES */ +#ifdef ECORE_XCB_XINERAMA _ecore_x_xinerama_init_finalize(); +#endif /* ECORE_XCB_XINERAMA */ return _ecore_xcb_init_count; }