summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib/ecore/ecore_main.c
diff options
context:
space:
mode:
authorMike McCormack <mj.mccormack@samsung.com>2011-07-08 10:26:14 +0000
committerMike McCormack <mikem@ring3k.org>2011-07-08 10:26:14 +0000
commitcd493ac0b328ac1e6ffb065165b633fa273256b6 (patch)
tree5b531aaddce575677899918c351413e4cdc0786a /legacy/ecore/src/lib/ecore/ecore_main.c
parent22719d510759a58080af27ca496931c2c77e3883 (diff)
ecore: Check signals in glib prepare only
Signed-off-by: Mike McCormack <mj.mccormack@samsung.com> SVN revision: 61151
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore/ecore_main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c
index 2dc59d8790..67bc07fba5 100644
--- a/legacy/ecore/src/lib/ecore/ecore_main.c
+++ b/legacy/ecore/src/lib/ecore/ecore_main.c
@@ -611,17 +611,16 @@ _ecore_main_gsource_check(GSource *source __UNUSED__)
611static gboolean 611static gboolean
612_ecore_main_gsource_dispatch(GSource *source __UNUSED__, GSourceFunc callback __UNUSED__, gpointer user_data __UNUSED__) 612_ecore_main_gsource_dispatch(GSource *source __UNUSED__, GSourceFunc callback __UNUSED__, gpointer user_data __UNUSED__)
613{ 613{
614 gboolean events_ready, timers_ready, idlers_ready, signals_ready; 614 gboolean events_ready, timers_ready, idlers_ready;
615 double next_time = _ecore_timer_next_get(); 615 double next_time = _ecore_timer_next_get();
616 616
617 events_ready = _ecore_event_exist(); 617 events_ready = _ecore_event_exist();
618 timers_ready = _ecore_timers_exists() && (0.0 == next_time); 618 timers_ready = _ecore_timers_exists() && (0.0 == next_time);
619 idlers_ready = _ecore_idler_exist(); 619 idlers_ready = _ecore_idler_exist();
620 signals_ready = (_ecore_signal_count_get() > 0);
621 620
622 in_main_loop++; 621 in_main_loop++;
623 INF("enter idling=%d fds=%d events=%d signals=%d timers=%d (next=%.2f) idlers=%d", 622 INF("enter idling=%d fds=%d events=%d timers=%d (next=%.2f) idlers=%d",
624 ecore_idling, ecore_fds_ready, events_ready, signals_ready, 623 ecore_idling, ecore_fds_ready, events_ready,
625 timers_ready, next_time, idlers_ready); 624 timers_ready, next_time, idlers_ready);
626 625
627 if (ecore_idling && events_ready) 626 if (ecore_idling && events_ready)
@@ -641,7 +640,7 @@ _ecore_main_gsource_dispatch(GSource *source __UNUSED__, GSourceFunc callback __
641 events_ready = _ecore_event_exist(); 640 events_ready = _ecore_event_exist();
642 idlers_ready = _ecore_idler_exist(); 641 idlers_ready = _ecore_idler_exist();
643 642
644 if ((ecore_fds_ready || events_ready || timers_ready || idlers_ready || signals_ready)) 643 if (ecore_fds_ready || events_ready || timers_ready || idlers_ready)
645 { 644 {
646 _ecore_idle_exiter_call(); 645 _ecore_idle_exiter_call();
647 ecore_idling = 0; 646 ecore_idling = 0;