Changeset 44976fe

Timestamp:

May 30, 2011, 10:27:31 PM (13 years ago)

Author:

Adam Glasgall <glasgall@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

cc305b5

Parents:

259e60a8

git-author:

Adam Glasgall <adam@crossproduct.net> (03/09/11 14:43:05)

git-committer:

Adam Glasgall <glasgall@mit.edu> (05/30/11 22:27:31)

Message:

Make owl_select_post_task take a context argument

Make owl_select_post_task take a context argument to indicate /which/ running mainloop it should run the task on, since now there's more than one.

Files:

• owl.c (modified) (1 diff)
• select.c (modified) (3 diffs)

owl.c

@@ -383 +383 @@
   /* Send a message to the main thread. */
   owl_select_post_task(sig_handler_main_thread,
-                       GINT_TO_POINTER(siginfo->si_signo), NULL);
+                       GINT_TO_POINTER(siginfo->si_signo), 
+                       NULL, g_main_context_default());
 }
 

select.c

@@ -2 +2 @@
 
 static GMainLoop *loop = NULL;
-static GMainContext *context;
+static GMainContext *main_context;
 static int dispatch_active = 0;
 
@@ -344 +344 @@
 void owl_select_run_loop(void)
 {
-  context = g_main_context_default();
-  loop = g_main_loop_new(context, FALSE);
+  main_context = g_main_context_default();
+  loop = g_main_loop_new(main_context, FALSE);
   g_main_loop_run(loop);
 }
@@ -379 +379 @@
 }
 
-void owl_select_post_task(void (*cb)(void*), void *cbdata, void (*destroy_cbdata)(void*))
+void owl_select_post_task(void (*cb)(void*), void *cbdata, void (*destroy_cbdata)(void*), GMainContext *context)
 {
   GSource *source = g_idle_source_new();