From dd933bf536537301b3663a9af2030babc97c39c2 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Mon, 14 Nov 2011 18:49:50 +0000 Subject: [PATCH] Ecore_X(cb): Fix formatting in ecore_xcb_window. Fix buggers in ICCCM code which were not setting icccm wm protocols correctly. This 'fix' matches up w/ the xcb_icccm_* functions defined in the xcb headers. SVN revision: 65195 --- legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c | 13 ++++++------- legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c index 425ebb1748..6459db76d6 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c @@ -1017,9 +1017,9 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, ECORE_X_ATOM_WM_PROTOCOLS, win, count, atoms); #else - xcb_icccm_set_wm_protocols(_ecore_xcb_conn, + xcb_icccm_set_wm_protocols(_ecore_xcb_conn, win, ECORE_X_ATOM_WM_PROTOCOLS, - win, count, atoms); + count, atoms); #endif free(atoms); } @@ -1043,10 +1043,9 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, ECORE_X_ATOM_WM_PROTOCOLS, win, count - 1, protos.atoms); #else - xcb_icccm_set_wm_protocols(_ecore_xcb_conn, + xcb_icccm_set_wm_protocols(_ecore_xcb_conn, win, ECORE_X_ATOM_WM_PROTOCOLS, - win, count - 1, - protos.atoms); + count - 1, protos.atoms); #endif else ecore_x_window_prop_property_del(win, @@ -1135,8 +1134,8 @@ ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win, xcb_set_wm_protocols(_ecore_xcb_conn, ECORE_X_ATOM_WM_PROTOCOLS, win, num, protos); #else - xcb_icccm_set_wm_protocols(_ecore_xcb_conn, ECORE_X_ATOM_WM_PROTOCOLS, - win, num, protos); + xcb_icccm_set_wm_protocols(_ecore_xcb_conn, win, + ECORE_X_ATOM_WM_PROTOCOLS, num, protos); #endif else ecore_x_window_prop_property_del(win, ECORE_X_ATOM_WM_PROTOCOLS); diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c index bf2e04086a..2616c9330e 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_window.c @@ -356,7 +356,7 @@ ecore_x_window_free(Ecore_X_Window win) /* XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT, */ /* (const char *)&ev); */ - xcb_destroy_window(_ecore_xcb_conn, win); + xcb_destroy_window(_ecore_xcb_conn, win); // ecore_x_flush(); } }