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.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@65195 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_x/xcb/ecore_xcb_icccm.c b/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
index 425ebb1..6459db7 100644 (file)
--- a/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
+++ b/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/src/lib/ecore_x/xcb/ecore_xcb_window.c b/src/lib/ecore_x/xcb/ecore_xcb_window.c
index bf2e040..2616c93 100644 (file)
--- a/src/lib/ecore_x/xcb/ecore_xcb_window.c
+++ b/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();
      }
 }