Make menu-screen not dependent of utilx.

Change-Id: Ia3519d0e02f580fd0d225d72fb81c098b90a9c87

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1c20aa..58a68d6 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,6 @@ pkg_check_modules(MENU_PKGS REQUIRED
        shortcut
        sysman
        syspopup-caller
-       utilX
 )
 
 ADD_DEFINITIONS("-DENABLE_BGIMAGE")

diff --git a/debian/control b/debian/control
index ae4e7a2..7ca6f5b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: menu-screen
 Section: utils
 Priority: extra
 Maintainer: Jin Yoon <jinny.yoon@samsung.com>
-Build-Depends: debhelper (>= 5), libelm-dev, libslp-utilx-dev, libslp-setting-dev, libefreet-dev, libslp-sysman-dev, libslp-pm-dev, dlog-dev, libecore-dev, libaul-1-dev, libpkgmgr-client-dev, syspopup-caller-dev, libheynoti-dev, libail-0-dev, librua-dev, libslp-shortcut-dev, menu-daemon, capi-appfw-application-dev, libbadge-dev, pkgmgr-info-dev, capi-system-info-dev, libshortcut-dev, libappsvc-dev
+Build-Depends: debhelper (>= 5), libelm-dev, libslp-setting-dev, libefreet-dev, libslp-sysman-dev, libslp-pm-dev, dlog-dev, libecore-dev, libaul-1-dev, libpkgmgr-client-dev, syspopup-caller-dev, libheynoti-dev, libail-0-dev, librua-dev, libslp-shortcut-dev, menu-daemon, capi-appfw-application-dev, libbadge-dev, pkgmgr-info-dev, capi-system-info-dev, libshortcut-dev, libappsvc-dev
 Homepage: N/A
 Standards-Version: 0.1.0
 
 Package: org.tizen.menu-screen
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libelm, libeina, libslp-utilx-0, libslp-setting-0, libefreet, libslp-sysman, libslp-pm-0, libdlog-0, libaul-1, libpkgmgr-client-0, syspopup-caller-0, libheynoti-0, libail-0, menu-daemon, capi-appfw-application, libbadge, pkgmgr-info, capi-system-info, libshortcut-0, libappsvc-0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libelm, libeina, libslp-setting-0, libefreet, libslp-sysman, libslp-pm-0, libdlog-0, libaul-1, libpkgmgr-client-0, syspopup-caller-0, libheynoti-0, libail-0, menu-daemon, capi-appfw-application, libbadge, pkgmgr-info, capi-system-info, libshortcut-0, libappsvc-0
 Description: inhouse menu-screen
 
 Package: org.tizen.menu-screen-dbg

diff --git a/packaging/org.tizen.menu-screen.spec b/packaging/org.tizen.menu-screen.spec
index f42d200..b728517 100644 (file)
--- a/packaging/org.tizen.menu-screen.spec
+++ b/packaging/org.tizen.menu-screen.spec
@@ -47,7 +47,6 @@ BuildRequires:  pkgconfig(pkgmgr-info)
 BuildRequires:  pkgconfig(shortcut)
 BuildRequires:  pkgconfig(sysman)
 BuildRequires:  pkgconfig(syspopup-caller)
-BuildRequires:  pkgconfig(utilX)
 BuildRequires:  cmake
 BuildRequires:  edje-tools
 BuildRequires:  gettext-tools

diff --git a/src/layout.c b/src/layout.c
index 8ac7374..5ec2d6b 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -18,7 +18,6 @@
 
 #include <Elementary.h>
 #include <Ecore_X.h>
-#include <utilX.h>
 #include <vconf.h>
 
 #include "menu_screen.h"

diff --git a/src/menu_screen.c b/src/menu_screen.c
index 8740092..987b058 100644 (file)
--- a/src/menu_screen.c
+++ b/src/menu_screen.c
@@ -23,7 +23,6 @@
 #include <Elementary.h>
 #include <stdbool.h>
 #include <system_info.h>
-#include <utilX.h>
 #include <vconf.h>
 
 #include "conf.h"
@@ -47,15 +46,11 @@
 extern int aul_listen_app_dead_signal(int (*func)(int signal, void *data), void *data);
 static struct {
        int state;
-       Evas *evas;
-       Ecore_Evas *ee;
        Evas_Object *win;
        Elm_Theme *theme;
        bool is_done;
 } menu_screen_info = {
        .state = APP_STATE_PAUSE,
-       .evas = NULL,
-       .ee = NULL,
        .win = NULL,
        .theme = NULL,
        .is_done = false,
@@ -65,7 +60,7 @@ static struct {
 
 HAPI Evas *menu_screen_get_evas(void)
 {
-       return menu_screen_info.evas;
+       return evas_object_evas_get(menu_screen_info.win);
 }
 
 
@@ -135,16 +130,6 @@ static menu_screen_error_e _create_canvas(char *name, char *title)
                _D("Failed to set the window role as MENU_SCREEN");
        }
 
-       menu_screen_info.evas = evas_object_evas_get(menu_screen_info.win);
-       if (!menu_screen_info.evas) {
-               _E("[%s] Failed to get the evas object", __func__);
-       }
-
-       menu_screen_info.ee = ecore_evas_ecore_evas_get(menu_screen_info.evas);
-       if (!menu_screen_info.ee) {
-               _E("[%s] Failed to get ecore_evas object", __func__);
-       }
-
        evas_object_show(menu_screen_info.win);
 
        return MENU_SCREEN_ERROR_OK;
@@ -161,11 +146,7 @@ static void _destroy_canvas(void)
 
 static int _dead_cb(int pid, void *data)
 {
-       utilx_hide_fake_effect(
-               ecore_x_display_get(),
-               ecore_x_window_root_get(ecore_evas_window_get(menu_screen_info.ee))
-       );
-
+       evas_object_show(menu_screen_get_win());
        return EXIT_SUCCESS;
 }
 
@@ -396,10 +377,7 @@ static void _resume_cb(void *data)
                _E("Failed to set %s to 1", VCONFKEY_IDLE_SCREEN_TOP);
        }
 
-       utilx_hide_fake_effect(
-               ecore_x_display_get(),
-               ecore_x_window_root_get(ecore_evas_window_get(menu_screen_info.ee))
-       );
+       evas_object_show(menu_screen_get_win());
 
        menu_screen_info.state = APP_STATE_RESUME;
 }
@@ -414,10 +392,7 @@ static void _service_cb(service_h service, void *data)
                _E("Failed to set %s to 1", VCONFKEY_IDLE_SCREEN_TOP);
        }
 
-       utilx_hide_fake_effect(
-               ecore_x_display_get(),
-               ecore_x_window_root_get(ecore_evas_window_get(menu_screen_info.ee))
-       );
+       evas_object_show(menu_screen_get_win());
 }