summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangyoon Jang <s89.jang@samsung.com>2015-06-04 19:25:56 +0900
committerSangyoon Jang <s89.jang@samsung.com>2015-06-04 19:25:56 +0900
commit204358e8ddfccbf82ddeb2b5990246449821d5e0 (patch)
tree032c48b98e59cdc0391092225e4a36a9e8dba264
parent0771105a16ea0acb3517d1a29aa7f9d90db35543 (diff)
downloadmedia-key-tizen_3.0.m1_mobile.tar.gz
media-key-tizen_3.0.m1_mobile.tar.bz2
media-key-tizen_3.0.m1_mobile.zip
fix for X11 environment Change-Id: Ib0462b2d6fae3b45f284d7a865151da4c5f05f0d Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
-rw-r--r--packaging/capi-system-media-key.spec2
-rw-r--r--src/media_key.c15
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 <Evas.h>
#include <Ecore.h>
#include <Ecore_Input.h>
-#if X11
+#if defined(X11)
#include <Ecore_X.h>
+#include <utilX.h>
#endif
#include <dlog.h>
@@ -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;