Changeset 5eb392f

Timestamp:

Mar 25, 2011, 3:46:46 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

cd28517

Parents:

7b2686d

git-author:

David Benjamin <davidben@mit.edu> (02/25/11 22:06:45)

git-committer:

David Benjamin <davidben@mit.edu> (03/25/11 03:46:46)

Message:

Also make owl_process_messages a GSource

File:

• owl.c (modified) (4 diffs)

owl.c

@@ -166 +166 @@
  * was ignored due to user settings or otherwise.
  */
-int owl_process_message(owl_message *m) {
+static int owl_process_message(owl_message *m) {
   const owl_filter *f;
   /* if this message it on the puntlist, nuke it and continue */
@@ -251 +251 @@
 }
 
+static gboolean owl_process_messages_prepare(GSource *source, int *timeout) {
+  *timeout = -1;
+  return owl_global_messagequeue_pending(&g);
+}
+
+static gboolean owl_process_messages_check(GSource *source) {
+  return owl_global_messagequeue_pending(&g);
+}
+
 /*
  * Process any new messages we have waiting in the message queue.
- * Returns 1 if any messages were added to the message list, and 0 otherwise.
  */
-int owl_process_messages(owl_ps_action *d, void *p)
-{
+static gboolean owl_process_messages_dispatch(GSource *source, GSourceFunc callback, gpointer user_data) {
   int newmsgs=0;
   int followlast = owl_global_should_followlast(&g);
@@ -280 +287 @@
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
   }
-  return newmsgs;
-}
+  return TRUE;
+}
+
+static GSourceFuncs owl_process_messages_funcs = {
+  owl_process_messages_prepare,
+  owl_process_messages_check,
+  owl_process_messages_dispatch,
+  NULL
+};
 
 void owl_process_input(const owl_io_dispatch *d, void *data)
@@ -573 +587 @@
   g_source_unref(source);
 
-  owl_select_add_pre_select_action(owl_process_messages, NULL, NULL);
+  source = g_source_new(&owl_process_messages_funcs, sizeof(GSource));
+  g_source_attach(source, NULL);
+  g_source_unref(source);
+
   owl_select_add_pre_select_action(owl_errsignal_pre_select_action, NULL, NULL);