[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16537 - gnunet-gtk/src/lib
From: |
gnunet |
Subject: |
[GNUnet-SVN] r16537 - gnunet-gtk/src/lib |
Date: |
Mon, 15 Aug 2011 15:06:42 +0200 |
Author: grothoff
Date: 2011-08-15 15:06:42 +0200 (Mon, 15 Aug 2011)
New Revision: 16537
Modified:
gnunet-gtk/src/lib/eventloop.c
Log:
some code cleanup
Modified: gnunet-gtk/src/lib/eventloop.c
===================================================================
--- gnunet-gtk/src/lib/eventloop.c 2011-08-15 13:03:37 UTC (rev 16536)
+++ gnunet-gtk/src/lib/eventloop.c 2011-08-15 13:06:42 UTC (rev 16537)
@@ -95,10 +95,6 @@
*/
guint poll_array_active;
- /**
- * Maximum GTK priority.
- */
- gint max_priority;
#if WINDOWS
/**
@@ -268,6 +264,7 @@
fd_set aexcept;
int pre_ret = 0;
int result = 0;
+ gint max_priority;
#if WINDOWS
int sock_read = 0;
@@ -340,6 +337,7 @@
fd_counter++;
}
#else
+ /* FIXME: why while(1) here!? */
while (1)
{
struct GNUNET_CONTAINER_SList_Iterator *t;
@@ -515,11 +513,12 @@
socks = sock_read + sock_write + sock_err;
#endif
- g_main_context_prepare (ml->gmc, &ml->max_priority);
+ /* combine with Gtk events */
+ g_main_context_prepare (ml->gmc, &max_priority);
while (1)
{
need_gfds = g_main_context_query (ml->gmc,
- ml->max_priority,
+ max_priority,
&delay,
&ml->cached_poll_array[fd_counter],
ml->cached_poll_array_size -
fd_counter);
@@ -569,7 +568,7 @@
* Startup reason is used to pass the scheduler sanity check.
*/
if (TRUE == g_main_context_check (ml->gmc,
- ml->max_priority,
+ max_priority,
&ml->cached_poll_array[fd_counter],
need_gfds))
GNUNET_SCHEDULER_add_continuation (gnunet_gtk_dispatch_task, ml,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r16537 - gnunet-gtk/src/lib,
gnunet <=