summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-07-10 13:57:35 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-07-10 13:57:35 -0400
commit2138010127903134bdf1d8149e99d8250d8eebba (patch)
treeece83c682909e8bb8abd8c1ffe01e759998b1334
parentac26c0a69d0b4fc4b8e3517e23fe6b5c3b77a555 (diff)
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
-rw-r--r--src/lib/ecore_x/ecore_x_fixes.c3
-rw-r--r--src/lib/ecore_x/ecore_x_present.c9
-rw-r--r--src/lib/elementary/elm_sys_notify.c7
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)
28 { 28 {
29 _fixes_available = 1; 29 _fixes_available = 1;
30 30
31 if (ECORE_X_EVENT_FIXES_SELECTION_NOTIFY == 0) 31 ECORE_X_EVENT_FIXES_SELECTION_NOTIFY = ecore_event_type_new();
32 ECORE_X_EVENT_FIXES_SELECTION_NOTIFY = ecore_event_type_new();
33 } 32 }
34 else 33 else
35 _fixes_available = 0; 34 _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;
13void 13void
14_ecore_x_present_init(void) 14_ecore_x_present_init(void)
15{ 15{
16 if (ECORE_X_EVENT_PRESENT_CONFIGURE == 0) 16 ECORE_X_EVENT_PRESENT_CONFIGURE = ecore_event_type_new();
17 { 17 ECORE_X_EVENT_PRESENT_COMPLETE = ecore_event_type_new();
18 ECORE_X_EVENT_PRESENT_CONFIGURE = ecore_event_type_new(); 18 ECORE_X_EVENT_PRESENT_IDLE = ecore_event_type_new();
19 ECORE_X_EVENT_PRESENT_COMPLETE = ecore_event_type_new();
20 ECORE_X_EVENT_PRESENT_IDLE = ecore_event_type_new();
21 }
22#ifdef ECORE_XPRESENT 19#ifdef ECORE_XPRESENT
23 LOGFN(__FILE__, __LINE__, __FUNCTION__); 20 LOGFN(__FILE__, __LINE__, __FUNCTION__);
24 _ecore_x_present_exists = XPresentQueryExtension(_ecore_x_disp, &_ecore_x_present_major, NULL, NULL); 21 _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)
209EOLIAN static void 209EOLIAN static void
210_elm_sys_notify_class_constructor(Efl_Class *klass EINA_UNUSED) 210_elm_sys_notify_class_constructor(Efl_Class *klass EINA_UNUSED)
211{ 211{
212 if (ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED == 0) 212 ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = ecore_event_type_new();
213 { 213 ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = ecore_event_type_new();
214 ELM_EVENT_SYS_NOTIFY_NOTIFICATION_CLOSED = ecore_event_type_new();
215 ELM_EVENT_SYS_NOTIFY_ACTION_INVOKED = ecore_event_type_new();
216 }
217} 214}
218 215
219/*============================================================================* 216/*============================================================================*