From 204358e8ddfccbf82ddeb2b5990246449821d5e0 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Thu, 4 Jun 2015 19:25:56 +0900 Subject: [PATCH] Fix spec file and guard macro fix for X11 environment Change-Id: Ib0462b2d6fae3b45f284d7a865151da4c5f05f0d Signed-off-by: Sangyoon Jang --- packaging/capi-system-media-key.spec | 2 +- src/media_key.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packaging/capi-system-media-key.spec b/packaging/capi-system-media-key.spec index 17843c0..1d02f27 100644 --- a/packaging/capi-system-media-key.spec +++ b/packaging/capi-system-media-key.spec @@ -27,7 +27,7 @@ BuildRequires: pkgconfig(utilX) %package devel Summary: A Media Key library in SLP C API (Development) -Group: Development/API +Group: System/API Requires: %{name} = %{version}-%{release} %description devel diff --git a/src/media_key.c b/src/media_key.c index a1de3a8..ded4f84 100644 --- a/src/media_key.c +++ b/src/media_key.c @@ -21,8 +21,9 @@ #include #include #include -#if X11 +#if defined(X11) #include +#include #endif #include @@ -60,7 +61,7 @@ static int _media_key_initialized; static Ecore_Event_Handler *media_key_up; static Ecore_Event_Handler *media_key_down; -#if X11 +#if defined(X11) static Ecore_X_Window win; #endif @@ -68,7 +69,7 @@ static int _media_key_init(void) { if (_media_key_initialized) return 0; -#if X11 +#if defined(X11) ecore_x_init(NULL); win = ecore_x_window_input_new(ecore_x_window_root_first_get(), 0, 0, 1, 1); @@ -88,7 +89,7 @@ static int _media_key_init(void) static void _media_key_fini(void) { -#if X11 +#if defined(X11) ecore_x_window_free(win); ecore_x_shutdown(); #endif @@ -141,7 +142,7 @@ static Eina_Bool _media_key_release_cb(void *data, int type, void *event) return ECORE_CALLBACK_RENEW; } -#if X11 +#if defined(X11) static int _grab_media_key(void) { int i; @@ -193,7 +194,7 @@ int media_key_reserve(media_key_event_cb callback, void *user_data) return MEDIA_KEY_ERROR_OPERATION_FAILED; } -#if X11 +#if defined(X11) ret = _grab_media_key(); #else ret = 0; @@ -226,7 +227,7 @@ int media_key_release(void) LOGI("media key is not reserved"); return MEDIA_KEY_ERROR_NONE; } -#if X11 +#if defined(X11) ret = _ungrab_media_key(); #else ret = 0; -- 2.7.4