From 644ab6a7d3f3462b782258e5bb8bac35d46064a0 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 9 Sep 2011 22:33:33 -0400 Subject: [PATCH] Nix inaccurately named g_main_context_init_pipe() ...and fold its contents into g_main_context_new() --- glib/gmain.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/glib/gmain.c b/glib/gmain.c index a178725..855e63a 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -497,14 +497,6 @@ g_main_context_unref (GMainContext *context) g_free (context); } -static void -g_main_context_init_pipe (GMainContext *context) -{ - context->wakeup = g_wakeup_new (); - g_wakeup_get_pollfd (context->wakeup, &context->wake_up_rec); - g_main_context_add_poll_unlocked (context, 0, &context->wake_up_rec); -} - /** * g_main_context_new: * @@ -554,7 +546,9 @@ g_main_context_new (void) context->time_is_fresh = FALSE; - g_main_context_init_pipe (context); + context->wakeup = g_wakeup_new (); + g_wakeup_get_pollfd (context->wakeup, &context->wake_up_rec); + g_main_context_add_poll_unlocked (context, 0, &context->wake_up_rec); G_LOCK (main_context_list); main_context_list = g_slist_append (main_context_list, context); -- 2.7.4