From bc4e1d987286d560227c30e50c2eb25903311af9 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sun, 10 Jan 2010 18:28:13 +0000 Subject: [PATCH] Check returns of keygrab and print error if needed. SVN revision: 45023 --- .../conf_theme/e_int_config_theme_import.c | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/src/modules/conf_theme/e_int_config_theme_import.c b/src/modules/conf_theme/e_int_config_theme_import.c index 104820b10..c1c2883f3 100644 --- a/src/modules/conf_theme/e_int_config_theme_import.c +++ b/src/modules/conf_theme/e_int_config_theme_import.c @@ -26,15 +26,14 @@ struct _E_Config_Dialog_Data char *file; }; -static void _theme_import_cb_delete (E_Win *win); -static void _theme_import_cb_resize (E_Win *win); -static void _theme_import_cb_wid_focus (void *data, Evas_Object *obj); -static void _theme_import_cb_selected (void *data, Evas_Object *obj); -static void _theme_import_cb_changed (void *data, Evas_Object *obj); -static void _theme_import_cb_ok (void *data, void *data2); -static void _theme_import_cb_close (void *data, void *data2); -static void _theme_import_cb_key_down (void *data, Evas *e, Evas_Object *obj, - void *event); +static void _theme_import_cb_delete(E_Win *win); +static void _theme_import_cb_resize(E_Win *win); +static void _theme_import_cb_wid_focus(void *data, Evas_Object *obj); +static void _theme_import_cb_selected(void *data, Evas_Object *obj); +static void _theme_import_cb_changed(void *data, Evas_Object *obj); +static void _theme_import_cb_ok(void *data, void *data2); +static void _theme_import_cb_close(void *data, void *data2); +static void _theme_import_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event); EAPI E_Win * e_int_config_theme_import(E_Config_Dialog *parent) @@ -46,7 +45,8 @@ e_int_config_theme_import(E_Config_Dialog *parent) E_Config_Dialog_Data *cfdata; Evas_Modifier_Mask mask; Evas_Coord w, h; - + Eina_Bool kg; + import = E_NEW(Import, 1); if (!import) return NULL; @@ -84,13 +84,21 @@ e_int_config_theme_import(E_Config_Dialog *parent) o = evas_object_rectangle_add(evas); import->event_obj = o; mask = 0; - evas_object_key_grab(o, "Tab", mask, ~mask, 0); + kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0); + if (!kg) + fprintf(stderr, "ERROR: Unable to redirect \"Tab\" key events to object %p.\n", o); mask = evas_key_modifier_mask_get(evas, "Shift"); - evas_object_key_grab(o, "Tab", mask, ~mask, 0); + kg = evas_object_key_grab(o, "Tab", mask, ~mask, 0); + if (!kg) + fprintf(stderr,"ERROR: unable to redirect \"Tab\" key events to object %p.\n", o); mask = 0; - evas_object_key_grab(o, "Return", mask, ~mask, 0); + kg = evas_object_key_grab(o, "Return", mask, ~mask, 0); + if (!kg) + fprintf(stderr,"ERROR: unable to redirect \"Return\" key events to object %p.\n", o); mask = 0; - evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0); + kg = evas_object_key_grab(o, "KP_Enter", mask, ~mask, 0); + if (!kg) + fprintf(stderr,"ERROR: unable to redirect \"KP_Enter\" key events to object %p.\n", o); mask = 0; evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _theme_import_cb_key_down, import);