From 260f1d4840dc45f280bdc4fc0c29e53a06a97c9e Mon Sep 17 00:00:00 2001 From: Leandro Dorileo Date: Wed, 22 Jan 2014 15:46:40 -0200 Subject: [PATCH] utilX: get rid of utilX Now using the efl_util wrappers. Change-Id: I3d3138cace8529ec536cda13601479991525fd9d Signed-off-by: Leandro Dorileo --- CMakeLists.txt | 2 +- packaging/org.tizen.lockscreen.spec | 2 +- src/util.c | 14 +++----------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5726d07..380ca02 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,9 +39,9 @@ INCLUDE_DIRECTORIES( INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED capi-appfw-application + capi-ui-efl-util ecore-x appcore-efl - utilX ail notification security-server diff --git a/packaging/org.tizen.lockscreen.spec b/packaging/org.tizen.lockscreen.spec index 728b724..d7a47aa 100755 --- a/packaging/org.tizen.lockscreen.spec +++ b/packaging/org.tizen.lockscreen.spec @@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(ecore-x) BuildRequires: pkgconfig(appcore-efl) -BuildRequires: pkgconfig(utilX) +BuildRequires: pkgconfig(capi-ui-efl-util) BuildRequires: pkgconfig(ail) BuildRequires: pkgconfig(notification) BuildRequires: pkgconfig(security-server) diff --git a/src/util.c b/src/util.c index 6170b8e..0ab30b8 100755 --- a/src/util.c +++ b/src/util.c @@ -15,12 +15,12 @@ */ #include -#include #include #include #include #include #include +#include #include "util.h" #include "sim-state.h" @@ -35,21 +35,13 @@ static Evas_Coord pos_down_y = 0; void _set_win_property(Evas_Object * win) { - Ecore_X_Window xwin; - if (win == NULL) { LOGD("[Error:%s] Invalid argument: win is NULL", __func__); return; } - xwin = elm_win_xwindow_get(win); - if (xwin == 0) { - LOGD("[Error:%s] Cannot get xwindow", __func__); - return; - } - - utilx_set_system_notification_level(ecore_x_display_get(), xwin, UTILX_NOTIFICATION_LEVEL_NORMAL); - utilx_set_window_opaque_state(ecore_x_display_get(), xwin, UTILX_OPAQUE_STATE_ON); + efl_util_set_system_notification_level(win, EFL_UTIL_NOTIFICATION_LEVEL_NORMAL); + efl_util_set_window_opaque_state(win, EFL_UTIL_OPAQUE_STATE_ON); } Evas_Object *_add_layout(Evas_Object *parent, const char *file, const char *group) -- 2.7.4