From fa29050cd7355c522a100d7276c667e198c007e6 Mon Sep 17 00:00:00 2001 From: "ky85.kim" Date: Thu, 11 Jun 2015 21:18:05 +0900 Subject: [PATCH] Remove ecore_x dependency Change-Id: I678a1806889d53cc3254b030ebdfccac11868483 --- CMakeLists.txt | 2 +- client/vc.c | 8 ++++++++ common/vc_main.h | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4807bfb..ae46760 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") INCLUDE(FindPkgConfig) pkg_check_modules(pkgs REQUIRED aul capi-base-common capi-media-audio-io capi-media-sound-manager capi-network-bluetooth - dbus-1 dlog ecore ecore-x glib-2.0 libprivilege-control libxml-2.0 vconf + dbus-1 dlog ecore glib-2.0 libprivilege-control libxml-2.0 vconf ) ## API ## diff --git a/client/vc.c b/client/vc.c index a513569..a1a2f73 100644 --- a/client/vc.c +++ b/client/vc.c @@ -33,8 +33,10 @@ static Ecore_Timer* g_connect_timer = NULL; static vc_h g_vc = NULL; +#if 0 static Ecore_Event_Handler* g_focus_in_hander = NULL; static Ecore_Event_Handler* g_focus_out_hander = NULL; +#endif Eina_Bool __vc_notify_state_changed(void *data); Eina_Bool __vc_notify_error(void *data); @@ -206,8 +208,10 @@ static void __vc_internal_unprepare() g_is_daemon_started = false; +#if 0 ecore_event_handler_del(g_focus_in_hander); ecore_event_handler_del(g_focus_out_hander); +#endif vc_cmd_parser_delete_file(getpid(), VC_COMMAND_TYPE_FOREGROUND); vc_cmd_parser_delete_file(getpid(), VC_COMMAND_TYPE_BACKGROUND); @@ -292,6 +296,7 @@ static Eina_Bool __notify_auth_changed_cb(void *data) } +#if 0 static Eina_Bool __vc_x_event_window_focus_in(void *data, int type, void *event) { Ecore_X_Event_Window_Focus_In *e; @@ -361,6 +366,7 @@ static Eina_Bool __vc_x_event_window_focus_out(void *data, int type, void *event return ECORE_CALLBACK_PASS_ON; } +#endif static void __vc_fork_vc_daemon() { @@ -426,8 +432,10 @@ static Eina_Bool __vc_connect_daemon(void *data) g_connect_timer = NULL; +#if 0 g_focus_in_hander = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_IN, __vc_x_event_window_focus_in, NULL); g_focus_out_hander = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_FOCUS_OUT, __vc_x_event_window_focus_out, NULL); +#endif vc_client_set_client_state(g_vc, VC_STATE_READY); ecore_timer_add(0, __vc_notify_state_changed, g_vc); diff --git a/common/vc_main.h b/common/vc_main.h index b94c446..1c42b71 100644 --- a/common/vc_main.h +++ b/common/vc_main.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include -- 2.7.4