zmike pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2138010127903134bdf1d8149e99d8250d8eebba
commit 2138010127903134bdf1d8149e99d8250d8eebba Author: Mike Blumenkrantz <[email protected]> Date: Wed Jul 10 13:57:35 2019 -0400 events: don't check for zeroed event types before registering them Summary: this handles the case of reinitializing a component, but it's totally broken in the case of doing a full ecore restart Depends on D9253 Reviewers: bu5hm4n Reviewed By: bu5hm4n Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9254 --- src/lib/ecore_x/ecore_x_fixes.c | 3 +-- src/lib/ecore_x/ecore_x_present.c | 9 +++------ src/lib/elementary/elm_sys_notify.c | 7 ++----- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/lib/ecore_x/ecore_x_fixes.c b/src/lib/ecore_x/ecore_x_fixes.c index f656edec6e..dd81b674c8 100644 --- a/src/lib/ecore_x/ecore_x_fixes.c +++ b/src/lib/ecore_x/ecore_x_fixes.c @@ -28,8 +28,7 @@ _ecore_x_fixes_init(void) { _fixes_available = 1; - if (ECORE_X_EVENT_FIXES_SELECTION_NOTIFY == 0) - ECORE_X_EVENT_FIXES_SELECTION_NOTIFY = ecore_event_type_new(); + ECORE_X_EVENT_FIXES_SELECTION_NOTIFY = ecore_event_type_new(); } else _fixes_available = 0; diff --git a/src/lib/ecore_x/ecore_x_present.c b/src/lib/ecore_x/ecore_x_present.c index a944f7b850..eb190b7560 100644 --- a/src/lib/ecore_x/ecore_x_present.c +++ b/src/lib/ecore_x/ecore_x_present.c @@ -13,12 +13,9 @@ static Eina_Bool _ecore_x_present_exists = EINA_FALSE; void _ecore_x_present_init(void) { - if (ECORE_X_EVENT_PRESENT_CONFIGURE == 0) - { - ECORE_X_EVENT_PRESENT_CONFIGURE = ecore_event_type_new(); - ECORE_X_EVENT_PRESENT_COMPLETE = ecore_event_type_new(); - ECORE_X_EVENT_PRESENT_IDLE = ecore_event_type_new(); - } + ECORE_X_EVENT_PRESENT_CONFIGURE = ecore_event_type_new(); + ECORE_X_EVENT_PRESENT_COMPLETE = ecore_event_type_new(); + ECORE_X_EVENT_PRESENT_IDLE = ecore_event_type_new(); #ifdef ECORE_XPRESENT LOGFN(__FILE__, __LINE__, __FUNCTION__); _ecore_x_present_exists = XPresentQueryExtension(_ecore_x_disp, &_ecore_x_present_major, NULL, NULL); diff --git a/src/lib/elementary/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c index 0b0e7f12fe..b31fee4bee 100644 --- a/src/lib/elementary/elm_sys_notify.c +++ b/src/lib/elementary/elm_sys_notify.c @@ -209,11 +209,8 @@ _elm_sys_notify_singleton_get(void) EOLIAN static void _elm_sys_notify_class_constructor(Efl_Class *klass EINA_UNUSED) { - if (ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED == 0) - { - ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = ecore_event_type_new(); - ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = ecore_event_type_new(); - } + ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = ecore_event_type_new(); + ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = ecore_event_type_new(); } /*============================================================================* --
