discomfitor pushed a commit to branch master.
commit d77d9134f8c9d86443662ad4581c047562d560ba
Author: Mike Blumenkrantz <[email protected]>
Date: Wed Jul 17 12:30:48 2013 +0100
delete e pixmap atom based on atom pixmap atom, not pixmap
---
ChangeLog | 3 ++-
NEWS | 1 +
src/lib/ecore_x/xcb/ecore_xcb_e.c | 2 +-
src/lib/ecore_x/xlib/ecore_x_e.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 381f666..a1e9b20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,8 @@
2013-07-17 Mike Blumenkrantz
- * Ecore-X: add error messages for xlib, ECORE_X_ATOM_XDND_DIRECTSAVE0
+ * Ecore-X: add error messages for xlib, ECORE_X_ATOM_XDND_DIRECTSAVE0,
+ fix ecore_x_e_comp_pixmap_set to delete pixmap atom
correctly
2013-07-15 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index 18b22d5..a55f4f1 100644
--- a/NEWS
+++ b/NEWS
@@ -346,6 +346,7 @@ Fixes:
- Fix selection parser to not overrun buffer read by using longs on 64bit.
- Fix x11 selection trailing nul byte in text.
- Fix BadMatch errors in ecore_x_image_get when requested size was larger
than XImage size
+ - Fix ecore_x_e_comp_pixmap_set to delete pixmap atom correctly
* Ecore_Wayland:
- Fix return type of function ecore_wl_outputs_get().
* Ecore_Input_Evas:
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_e.c
b/src/lib/ecore_x/xcb/ecore_xcb_e.c
index 8fe0104..31e3578 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_e.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_e.c
@@ -680,7 +680,7 @@ ecore_x_e_comp_pixmap_set(Ecore_X_Window win,
ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_PIXMAP,
ECORE_X_ATOM_PIXMAP, &pixmap, 1);
else
- ecore_x_window_prop_property_del(win, pixmap);
+ ecore_x_window_prop_property_del(win, ECORE_X_ATOM_E_COMP_PIXMAP);
}
EAPI Ecore_X_Pixmap
diff --git a/src/lib/ecore_x/xlib/ecore_x_e.c b/src/lib/ecore_x/xlib/ecore_x_e.c
index 93e1ebe..aa6764d 100644
--- a/src/lib/ecore_x/xlib/ecore_x_e.c
+++ b/src/lib/ecore_x/xlib/ecore_x_e.c
@@ -1685,7 +1685,7 @@ ecore_x_e_comp_pixmap_set(Ecore_X_Window win,
ecore_x_window_prop_xid_set(win, ECORE_X_ATOM_E_COMP_PIXMAP,
ECORE_X_ATOM_PIXMAP, &pixmap, 1);
else
- ecore_x_window_prop_property_del(win, pixmap);
+ ecore_x_window_prop_property_del(win, ECORE_X_ATOM_E_COMP_PIXMAP);
}
EAPI Ecore_X_Pixmap
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
