aboutsummaryrefslogtreecommitdiff
path: root/src/lib/eventloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/eventloop.c')
-rw-r--r--src/lib/eventloop.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index aaa20cdf..b4459d86 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -194,11 +194,11 @@ GNUNET_GTK_main_loop_quit (struct GNUNET_GTK_MainLoop *ml)
194 194
195/** 195/**
196 * Obtain the name of the configuration file that is being used. 196 * Obtain the name of the configuration file that is being used.
197 * 197 *
198 * @param ml handle to the main loop 198 * @param ml handle to the main loop
199 * @return name of configuration file 199 * @return name of configuration file
200 */ 200 */
201const char * 201const char *
202GNUNET_GTK_main_loop_get_configuration_file (struct GNUNET_GTK_MainLoop *ml) 202GNUNET_GTK_main_loop_get_configuration_file (struct GNUNET_GTK_MainLoop *ml)
203{ 203{
204 return ml->cfgfile; 204 return ml->cfgfile;
@@ -213,7 +213,7 @@ GNUNET_GTK_main_loop_get_configuration_file (struct GNUNET_GTK_MainLoop *ml)
213 * @return NULL on error, otherwise the object 213 * @return NULL on error, otherwise the object
214 */ 214 */
215GObject * 215GObject *
216GNUNET_GTK_main_loop_get_object (struct GNUNET_GTK_MainLoop *ml, 216GNUNET_GTK_main_loop_get_object (struct GNUNET_GTK_MainLoop * ml,
217 const char *name) 217 const char *name)
218{ 218{
219 return gtk_builder_get_object (ml->builder, name); 219 return gtk_builder_get_object (ml->builder, name);
@@ -497,7 +497,7 @@ gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds,
497 } 497 }
498 } 498 }
499 } 499 }
500 500
501 if ((rfds != NULL) && (rfds->sds.fd_count > 0)) 501 if ((rfds != NULL) && (rfds->sds.fd_count > 0))
502 { 502 {
503#if DEBUG_EVENTLOOP 503#if DEBUG_EVENTLOOP
@@ -756,7 +756,8 @@ gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds,
756 error = GetLastError (); 756 error = GetLastError ();
757#if DEBUG_EVENTLOOP 757#if DEBUG_EVENTLOOP
758 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 758 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
759 "send to the socket %u returned %d (%u)\n", ui, status, error); 759 "send to the socket %u returned %d (%u)\n", ui, status,
760 error);
760#endif 761#endif
761 if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN) || 762 if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN) ||
762 (status == -1 && gso_result == 0 && error == WSAENOTCONN && 763 (status == -1 && gso_result == 0 && error == WSAENOTCONN &&
@@ -831,7 +832,7 @@ gnunet_gtk_select (void *cls, struct GNUNET_NETWORK_FDSet *rfds,
831 */ 832 */
832static void 833static void
833run_main_loop (void *cls, char *const *args, const char *cfgfile, 834run_main_loop (void *cls, char *const *args, const char *cfgfile,
834 const struct GNUNET_CONFIGURATION_Handle *cfg) 835 const struct GNUNET_CONFIGURATION_Handle *cfg)
835{ 836{
836 struct GNUNET_GTK_MainLoop *ml = cls; 837 struct GNUNET_GTK_MainLoop *ml = cls;
837 int argc; 838 int argc;
@@ -907,8 +908,8 @@ GNUNET_GTK_main_loop_start (const char *binary_name, const char *binary_help,
907 ml.main_window_file = main_window_file; 908 ml.main_window_file = main_window_file;
908 ml.main_task = main_task; 909 ml.main_task = main_task;
909 ret = 910 ret =
910 GNUNET_PROGRAM_run (argc, argv, binary_name, binary_help, 911 GNUNET_PROGRAM_run (argc, argv, binary_name, binary_help, options,
911 options, &run_main_loop, &ml); 912 &run_main_loop, &ml);
912 if (NULL != ml.cached_poll_array) 913 if (NULL != ml.cached_poll_array)
913 g_free (ml.cached_poll_array); 914 g_free (ml.cached_poll_array);
914 if (NULL != ml.rs) 915 if (NULL != ml.rs)