---
.../Ewl_Engine_Evas_Software_Xcb.h | 2 +-
src/engines/evas_software_xcb/Makefile.am | 5 ++---
.../ewl_engine_evas_software_xcb.c | 10 ++++++----
src/engines/xcb/Makefile.am | 2 +-
src/engines/xcb/ewl_engine_xcb.c | 4 ++--
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/engines/evas_software_xcb/Ewl_Engine_Evas_Software_Xcb.h
b/src/engines/evas_software_xcb/Ewl_Engine_Evas_Software_Xcb.h
index 9e45297..53c1f9f 100644
--- a/src/engines/evas_software_xcb/Ewl_Engine_Evas_Software_Xcb.h
+++ b/src/engines/evas_software_xcb/Ewl_Engine_Evas_Software_Xcb.h
@@ -5,7 +5,7 @@
#include "ewl_base.h"
#include <Ecore_X.h>
#include <Evas.h>
-#include <Evas_Engine_Software_Xcb.h>
+#include <Evas_Engine_Software_X11.h>
#define EWL_ENGINE_EVAS_SOFTWARE_XCB(engine) \
((Ewl_Engine_Evas_Software_Xcb *)engine)
diff --git a/src/engines/evas_software_xcb/Makefile.am
b/src/engines/evas_software_xcb/Makefile.am
index a33bbf0..6a2839e 100644
--- a/src/engines/evas_software_xcb/Makefile.am
+++ b/src/engines/evas_software_xcb/Makefile.am
@@ -5,8 +5,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib \
-I$(top_srcdir)/src/engines/evas_software_xcb \
-I$(top_builddir)/src/engines/evas_software_xcb \
-...@ecore_cflags@ \
-...@evas_software_xcb_cflags@
+...@ecore_cflags@
pkgdir = $(libdir)/ewl/engines
@@ -18,7 +17,7 @@ evas_software_xcb_la_SOURCES = \
Ewl_Engine_Evas_Software_Xcb.h \
ewl_engine_evas_software_xcb.c
-evas_software_xcb_la_LIBADD = $(top_builddir)/src/lib/libewl.la
+evas_software_xcb_la_LIBADD = $(top_builddir)/src/lib/libewl.la
@ECORE_XCB_LIBS@ @ECORE_LIBS@
evas_software_xcb_la_LDFLAGS = -module -version-info @INTERFACE_VERSION@
evas_software_xcb_la_DEPENDENCIES =
diff --git a/src/engines/evas_software_xcb/ewl_engine_evas_software_xcb.c
b/src/engines/evas_software_xcb/ewl_engine_evas_software_xcb.c
index fc87237..f18c54e 100644
--- a/src/engines/evas_software_xcb/ewl_engine_evas_software_xcb.c
+++ b/src/engines/evas_software_xcb/ewl_engine_evas_software_xcb.c
@@ -1,9 +1,11 @@
/* vim: set sw=8 ts=8 sts=8 expandtab: */
-#include "Ewl_Engine_Evas_Software_X11.h"
+#include "Ewl_Engine_Evas_Software_Xcb.h"
#include "ewl_private.h"
#include "ewl_debug.h"
#include "ewl_macros.h"
+#include <xcb/xcb.h>
+
static void ee_canvas_setup(Ewl_Window *win, int debug);
static int ee_init(Ewl_Engine *engine);
static void ee_shutdown(Ewl_Engine *engine);
@@ -130,11 +132,11 @@ ee_canvas_setup(Ewl_Window *win, int debug)
sinfo->info.backend = EVAS_ENGINE_INFO_SOFTWARE_X11_BACKEND_XCB;
sinfo->info.connection = ecore_x_connection_get();
sinfo->info.screen = ecore_x_default_screen_get();
- sinfo->info.visual = visualtype_get(sinfo->info.conn,
+ sinfo->info.visual = visualtype_get(sinfo->info.connection,
sinfo->info.screen);
- sinfo->info.colormap = sinfo->info.screen->default_colormap;
+ sinfo->info.colormap =
((xcb_screen_t*)sinfo->info.screen)->default_colormap;
sinfo->info.drawable = (Ecore_X_Window)win->window;
- sinfo->info.depth = sinfo->info.screen->root_depth;
+ sinfo->info.depth = ((xcb_screen_t*)sinfo->info.screen)->root_depth;
sinfo->info.rotation = 0;
sinfo->info.debug = debug;
diff --git a/src/engines/xcb/Makefile.am b/src/engines/xcb/Makefile.am
index 456e4a3..a892101 100644
--- a/src/engines/xcb/Makefile.am
+++ b/src/engines/xcb/Makefile.am
@@ -18,7 +18,7 @@ xcb_la_SOURCES = \
Ewl_Engine_Xcb.h \
ewl_engine_xcb.c
-xcb_la_LIBADD = $(top_builddir)/src/lib/libewl.la
+xcb_la_LIBADD = $(top_builddir)/src/lib/libewl.la @ECORE_XCB_LIBS@ @ECORE_LIBS@
xcb_la_LDFLAGS = -module -version-info @INTERFACE_VERSION@
xcb_la_DEPENDENCIES =
diff --git a/src/engines/xcb/ewl_engine_xcb.c b/src/engines/xcb/ewl_engine_xcb.c
index 1452f6e..cb4251e 100644
--- a/src/engines/xcb/ewl_engine_xcb.c
+++ b/src/engines/xcb/ewl_engine_xcb.c
@@ -909,7 +909,7 @@ ee_dnd_drag_types_set(Ewl_Embed *embed, const char **types,
unsigned int num)
ecore_x_dnd_aware_set((Ecore_X_Window)embed->canvas_window,
(num > 0 ? 1 : 0));
ecore_x_dnd_type_get_fetch();
- ecore_x_dnd_types_set((Ecore_X_Window)embed->canvas_window, (char
**)types, num);
+ ecore_x_dnd_types_set((Ecore_X_Window)embed->canvas_window, types,
num);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1182,7 +1182,7 @@ ewl_ev_x_key_up(void *data __UNUSED__, int type
__UNUSED__, void *e)
ev = e;
- window = ewl_window_window_find((void *)ev->win);
+ window = ewl_window_window_find((void *)ev->window);
if (!window)
DRETURN_INT(TRUE, DLEVEL_STABLE);
--
1.6.2.1
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensign option that enables unlimited
royalty-free distribution of the report engine for externally facing
server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
