remove unused code

[apps/core/preloaded/quickpanel.git] / daemon / service / keyboard.c

diff --git a/daemon/service/keyboard.c b/daemon/service/keyboard.c
old mode 100644 (file)
new mode 100755 (executable)
index 94882ea..3fe19dc
--- a/daemon/service/keyboard.c
+++ b/daemon/service/keyboard.c
@@ -15,13 +15,18 @@
  *
  */
 
+#include <Elementary.h>
 #include <vconf.h>
-#ifdef HAVE_X
-#include <utilX.h>
-#include <X11/Xlib.h>
-#endif
 #include <Ecore_Input.h>
 #include <feedback.h>
+#include <tzsh.h>
+#include <tzsh_quickpanel_service.h>
+#include <notification.h>
+
+#include <E_DBus.h>
+
+#include "quickpanel-ui.h" // appdata
+#include "common_uic.h"
 #include "common.h"
 #include "noti_util.h"
 #include "keyboard.h"
@@ -84,7 +89,7 @@ HAPI void quickpanel_keyboard_init(void *data)
        Ecore_Event_Handler *hdl_key_up = NULL;
        retif(ad == NULL, , "Invalid parameter!");
 
-       if (elm_win_keygrab_set(elm_win_xwindow_get(ad->win), KEY_QUICKPANEL, 0, 0, 0, ELM_WIN_KEYGRAB_SHARED) != 0) {
+       if (elm_win_keygrab_set(ad->win, KEY_QUICKPANEL, 0, 0, 0, ELM_WIN_KEYGRAB_SHARED) == EINA_FALSE) {
                ERR("failed to grab KEY_QUICKPANEL");
        }
 
@@ -117,10 +122,9 @@ HAPI void quickpanel_keyboard_fini(void *data)
                ad->hdl_hardkey_down = NULL;
        }
 
-       if (elm_win_keygrab_unset(elm_win_xwindow_get(ad->win), KEY_QUICKPANEL, 0, 0) != 0) {
+       if (elm_win_keygrab_unset(ad->win, KEY_QUICKPANEL, 0, 0) == EINA_FALSE) {
                ERR("failed to ungrab KEY_QUICKPANEL");
        }
-
 }
 
 HAPI void quickpanel_keyboard_openning_init(void *data)
@@ -128,17 +132,18 @@ HAPI void quickpanel_keyboard_openning_init(void *data)
        struct appdata *ad = data;
        retif(ad == NULL, , "Invalid parameter!");
 
-       if (elm_win_keygrab_set(elm_win_xwindow_get(ad->win), KEY_BACK, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE ) != 0) {
+       if (elm_win_keygrab_set(ad->win, KEY_BACK, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE)  == EINA_FALSE) {
                ERR("failed to grab KEY_BACK");
        }
 
-       if (elm_win_keygrab_set(elm_win_xwindow_get(ad->win), KEY_MENU, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE ) != 0) {
+       if (elm_win_keygrab_set(ad->win, KEY_MENU, 0, 0, 0, ELM_WIN_KEYGRAB_EXCLUSIVE) == EINA_FALSE) {
                ERR("failed to grab KEY_MENU");
        }
 
-       if (elm_win_keygrab_set(elm_win_xwindow_get(ad->win), KEY_HOME, 0, 0, 0, ELM_WIN_KEYGRAB_SHARED) != 0) {
+       if (elm_win_keygrab_set(ad->win, KEY_HOME, 0, 0, 0, ELM_WIN_KEYGRAB_SHARED)  == EINA_FALSE) {
                ERR("failed to grab KEY_HOME");
        }
+
 }
 
 HAPI void quickpanel_keyboard_closing_fini(void *data)
@@ -146,15 +151,17 @@ HAPI void quickpanel_keyboard_closing_fini(void *data)
        struct appdata *ad = data;
        retif(ad == NULL, , "Invalid parameter!");
 
-       if (elm_win_keygrab_unset(elm_win_xwindow_get(ad->win), KEY_BACK ,0 ,0) != 0) {
+       if (elm_win_keygrab_unset(ad->win, KEY_BACK, 0, 0) == EINA_FALSE) {
                ERR("failed to ungrab KEY_BACK");
        }
 
-       if (elm_win_keygrab_unset(elm_win_xwindow_get(ad->win), KEY_MENU ,0 ,0) != 0) {
+       if (elm_win_keygrab_unset(ad->win, KEY_MENU, 0, 0) == EINA_FALSE) {
                ERR("failed to ungrab KEY_MENU");
        }
 
-       if (elm_win_keygrab_unset(elm_win_xwindow_get(ad->win), KEY_HOME ,0 ,0) != 0) {
+       if (elm_win_keygrab_unset(ad->win, KEY_HOME, 0, 0) == EINA_FALSE) {
                ERR("failed to ungrab KEY_HOME");
        }
 }
+
+