downstream: use ifdef SUPPORT_INPUT_FOCUS for keyboard focus functions. accepted/tizen/ivi/20141215.104228 submit/tizen_ivi/20141210.445566 submit/tizen_ivi/20141210.778899
authorJan Ekström <jan.ekstrom@intel.com>
Tue, 2 Dec 2014 08:37:07 +0000 (10:37 +0200)
committerJanos Kovacs <jankovac503@gmail.com>
Wed, 10 Dec 2014 15:08:15 +0000 (17:08 +0200)
Change-Id: I109bc54490bc1fbd395cdac9ca25a620f5f0a7c2

weston-ivi-shell/src/ivi-controller.c

index 088f640..861b460 100755 (executable)
@@ -1114,6 +1114,7 @@ controller_surface_set_input_focus(struct wl_client *client,
               uint32_t device,
               int32_t enabled)
 {
+#ifdef SUPPORT_INPUT_FOCUS
     (void)client;
     struct ivisurface *ivisurf = wl_resource_get_user_data(resource);
 
@@ -1124,6 +1125,7 @@ controller_surface_set_input_focus(struct wl_client *client,
             send_all_keyboard_focus(ivisurf->shell);
         }
     }
+#endif
 }
 
 static const
@@ -1657,9 +1659,11 @@ controller_set_keyboard_focus(struct wl_client *client,
                               struct wl_resource *resource,
                               struct wl_array *surfaces)
 {
+#ifdef SUPPORT_INPUT_FOCUS
     struct ivicontroller *ctrl = wl_resource_get_user_data(resource);
     ivi_layout_set_keyboard_focus_on(surfaces->data, surfaces->size);
     send_all_keyboard_focus(ctrl->shell);
+#endif
 }
 
 static const struct ivi_controller_interface controller_implementation = {