summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--packaging/libwidget_service.spec4
-rw-r--r--src/widget_service.c5
3 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8d2c86..f39051b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ pkg_check_modules(pkgs REQUIRED
libtzplatform-config
uuid
cynara-client
- ecore-wayland
+ ecore-wl2
iniparser
libsmack
)
diff --git a/packaging/libwidget_service.spec b/packaging/libwidget_service.spec
index 0a3c8e2..7496df0 100644
--- a/packaging/libwidget_service.spec
+++ b/packaging/libwidget_service.spec
@@ -26,7 +26,7 @@ BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(aul)
BuildRequires: pkgconfig(cynara-client)
BuildRequires: pkgconfig(pkgmgr-installer)
-BuildRequires: pkgconfig(ecore-wayland)
+BuildRequires: pkgconfig(ecore-wl2)
BuildRequires: pkgconfig(iniparser)
BuildRequires: pkgconfig(libsmack)
@@ -50,7 +50,7 @@ Gathering the installed widget information.
cp %{SOURCE1001} .
%build
-
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
make %{?jobs:-j%jobs}
diff --git a/src/widget_service.c b/src/widget_service.c
index aad837e..fcb1928 100644
--- a/src/widget_service.c
+++ b/src/widget_service.c
@@ -29,7 +29,7 @@
#include <vconf.h>
#include <vconf-keys.h>
#include <unicode/uloc.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
#include <aul.h>
#include <tzplatform_config.h>
#include <pkgmgr-info.h>
@@ -499,6 +499,7 @@ static char *_resolution_file_path(void)
char *path;
int length;
int w, h;
+ Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get(NULL);
length = strlen(RESOLUTION_PATH_FORMAT) + 12;
path = calloc(1, length);
@@ -507,7 +508,7 @@ static char *_resolution_file_path(void)
return NULL;
}
- ecore_wl_screen_size_get(&w, &h);
+ ecore_wl2_display_screen_size_get(wl2_display, &w, &h);
_D("screen size : %d %d", w, h);
snprintf(path, length, RESOLUTION_PATH_FORMAT, w, h);