diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:31:58 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-08-03 09:31:58 +0000 |
commit | ddc9d3d734e965237d70751f90fbf9778dc2a9a8 (patch) | |
tree | 2b27189ccdaba025e94d8bfb24eba5cc9aed04b6 | |
parent | bb8a7009f57533532370eb68527f422b73611261 (diff) | |
download | gnunet-gtk-ddc9d3d734e965237d70751f90fbf9778dc2a9a8.tar.gz gnunet-gtk-ddc9d3d734e965237d70751f90fbf9778dc2a9a8.zip |
-do not use TRUE ==
-rw-r--r-- | src/lib/eventloop.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c index 537e9547..448dc83d 100644 --- a/src/lib/eventloop.c +++ b/src/lib/eventloop.c | |||
@@ -428,8 +428,11 @@ _gnunet_selector_thread (void *p) | |||
428 | return 0; | 428 | return 0; |
429 | } | 429 | } |
430 | 430 | ||
431 | |||
431 | static int | 432 | static int |
432 | handle_gui_events (struct GNUNET_GTK_MainLoop *ml, gint max_priority, gint need_gfds) | 433 | handle_gui_events (struct GNUNET_GTK_MainLoop *ml, |
434 | gint max_priority, | ||
435 | gint need_gfds) | ||
433 | { | 436 | { |
434 | /* Take care of GUI events. | 437 | /* Take care of GUI events. |
435 | * Dispatching the events here will eventually crash the scheduler, must do this | 438 | * Dispatching the events here will eventually crash the scheduler, must do this |
@@ -438,9 +441,10 @@ handle_gui_events (struct GNUNET_GTK_MainLoop *ml, gint max_priority, gint need_ | |||
438 | */ | 441 | */ |
439 | if (NULL == ml->gmc) | 442 | if (NULL == ml->gmc) |
440 | return GNUNET_NO; | 443 | return GNUNET_NO; |
441 | if (TRUE == | 444 | if (g_main_context_check (ml->gmc, |
442 | g_main_context_check (ml->gmc, max_priority, | 445 | max_priority, |
443 | ml->cached_poll_array, need_gfds)) | 446 | ml->cached_poll_array, |
447 | need_gfds)) | ||
444 | { | 448 | { |
445 | GNUNET_SCHEDULER_add_continuation_with_priority (&dispatch_gtk_task, ml, | 449 | GNUNET_SCHEDULER_add_continuation_with_priority (&dispatch_gtk_task, ml, |
446 | GNUNET_SCHEDULER_REASON_STARTUP, | 450 | GNUNET_SCHEDULER_REASON_STARTUP, |
@@ -768,10 +772,12 @@ gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds, | |||
768 | */ | 772 | */ |
769 | if (NULL != ml->gmc) | 773 | if (NULL != ml->gmc) |
770 | { | 774 | { |
771 | if (TRUE == | 775 | if (g_main_context_check (ml->gmc, |
772 | g_main_context_check (ml->gmc, max_priority, | 776 | max_priority, |
773 | &ml->cached_poll_array[fd_counter], need_gfds)) | 777 | &ml->cached_poll_array[fd_counter], |
774 | GNUNET_SCHEDULER_add_continuation_with_priority (&dispatch_gtk_task, ml, | 778 | need_gfds)) |
779 | GNUNET_SCHEDULER_add_continuation_with_priority (&dispatch_gtk_task, | ||
780 | ml, | ||
775 | GNUNET_SCHEDULER_REASON_STARTUP, | 781 | GNUNET_SCHEDULER_REASON_STARTUP, |
776 | GNUNET_SCHEDULER_PRIORITY_UI); | 782 | GNUNET_SCHEDULER_PRIORITY_UI); |
777 | } | 783 | } |