From bb1b3f4c14ca504b582f22c50d62504a561d6fe5 Mon Sep 17 00:00:00 2001 From: brianjjones Date: Tue, 5 Feb 2013 15:12:28 -0800 Subject: [PATCH] Adding Ecore_Wayland.h to ui-gadget.h so that UG_INIT_EFL use doesn't cause undefined failures. --- CMakeLists.txt | 2 +- include/ui-gadget.h | 3 ++- packaging/ui-gadget-1.spec | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2992d70..e886952 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ SET(SRCS src/ug.c ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) -PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 utilX bundle dlog x11 capi-appfw-application appsvc) +PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 utilX bundle dlog x11 ecore-wayland capi-appfw-application appsvc) FOREACH(flag ${PKGS_CFLAGS}) SET(CFLAGS "${CFLAGS} ${flag}") ENDFOREACH(flag) diff --git a/include/ui-gadget.h b/include/ui-gadget.h index 40807af..6d48e02 100755 --- a/include/ui-gadget.h +++ b/include/ui-gadget.h @@ -56,6 +56,7 @@ */ #include +#include #include #ifdef __cplusplus @@ -153,7 +154,7 @@ struct ug_cbs { * @see ug_init() */ #define UG_INIT_EFL(win, opt) \ - ug_init((Display *)ecore_wl_display_get(), elm_win_wl_window_get(win), \ + ug_init((Display *)ecore_wl_display_get(), (elm_win_wl_window_get(win))->id, \ win, opt) /** diff --git a/packaging/ui-gadget-1.spec b/packaging/ui-gadget-1.spec index 684febb..691b86c 100755 --- a/packaging/ui-gadget-1.spec +++ b/packaging/ui-gadget-1.spec @@ -14,6 +14,7 @@ BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(bundle) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(ecore-wayland) BuildRequires: pkgconfig(appsvc) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(capi-system-runtime-info) -- 2.7.4