styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

deduplicate global gadget handler variables 

ref T6125, T4648
This commit is contained in:
Mike Blumenkrantz 2017-10-06 11:37:50 -04:00
parent d7060c7c6f
commit 031b0bdc60
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/e_gadget.c
View File

@ -120,7 +120,7 @@ static Evas_Object *desktop_editor;
static Eina_Bool added;
static Evas_Object *pointer_site;
static Eina_List *handlers;
static Eina_List *pointer_site_handlers;
static Eina_Hash *gadget_external_domains;
static Eina_Hash *gadget_types;
@ -2572,7 +2572,7 @@ _editor_pointer_site_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
e_comp_ungrab_input(1, 1);
free(data);
pointer_site = NULL;
E_FREE_LIST(handlers, ecore_event_handler_del);
E_FREE_LIST(pointer_site_handlers, ecore_event_handler_del);
}
static void
@ -2701,10 +2701,10 @@ _editor_pointer_site_init(E_Gadget_Site_Orient orient, Evas_Object *site, Evas_O
evas_object_pass_events_set(active->site, 1);
evas_object_event_callback_add(pointer_site, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _editor_site_hints, active);
evas_object_event_callback_add(pointer_site, EVAS_CALLBACK_DEL, _editor_pointer_site_del, active);
E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_MOUSE_MOVE, _editor_pointer_move, active);
E_LIST_HANDLER_APPEND(pointer_site_handlers, ECORE_EVENT_MOUSE_MOVE, _editor_pointer_move, active);
if (!orient)
E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_MOUSE_WHEEL, _editor_pointer_wheel, active);
E_LIST_HANDLER_APPEND(handlers,
E_LIST_HANDLER_APPEND(pointer_site_handlers, ECORE_EVENT_MOUSE_WHEEL, _editor_pointer_wheel, active);
E_LIST_HANDLER_APPEND(pointer_site_handlers,
up ? ECORE_EVENT_MOUSE_BUTTON_UP : ECORE_EVENT_MOUSE_BUTTON_DOWN, _editor_pointer_button, active);
rect = evas_object_rectangle_add(e_comp->evas);