Adding Ecore_Wayland.h to ui-gadget.h so that UG_INIT_EFL use doesn't cause undefined... 21/2721/1 accepted/2.0alpha-wayland/20130206.013411 accepted/2.0alpha-wayland/20130206.013500 submit/2.0alpha-wayland/20130205.233726
authorbrianjjones <brian.j.jones@intel.com>
Tue, 5 Feb 2013 23:12:28 +0000 (15:12 -0800)
committerbrianjjones <brian.j.jones@intel.com>
Tue, 5 Feb 2013 23:14:16 +0000 (15:14 -0800)
CMakeLists.txt
include/ui-gadget.h
packaging/ui-gadget-1.spec

index 2992d70..e886952 100755 (executable)
@@ -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)
index 40807af..6d48e02 100755 (executable)
@@ -56,6 +56,7 @@
  */
 
 #include <X11/Xlib.h>
+#include <Ecore_Wayland.h>
 #include <app.h>
 
 #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)
 
 /**
index 684febb..691b86c 100755 (executable)
@@ -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)