From 3d686e3d8f6af393b01fe38cd7d29517e52dea50 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 7 Dec 2011 14:36:56 -0500 Subject: [PATCH] Clarify docs around main loop vfuncs Mention that the vfuncs are no longer used, and tweak the wording around what g_application_run() does. https://bugzilla.gnome.org/show_bug.cgi?id=665391 --- gio/gapplication.c | 4 ++-- gio/gapplication.h | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gio/gapplication.c b/gio/gapplication.c index b6cdd8667..e97bf2ef6 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -1246,8 +1246,8 @@ g_application_open (GApplication *application, * * If, after the above is done, the use count of the application is zero * then the exit status is returned immediately. If the use count is - * non-zero then the mainloop is run until the use count falls to zero, - * at which point 0 is returned. + * non-zero then the default main context is iterated until the use count + * falls to zero, at which point 0 is returned. * * If the %G_APPLICATION_IS_SERVICE flag is set, then the exiting at * use count of zero is delayed for a while (ie: the instance stays diff --git a/gio/gapplication.h b/gio/gapplication.h index 3622e0229..c432a3311 100644 --- a/gio/gapplication.h +++ b/gio/gapplication.h @@ -81,11 +81,13 @@ struct _GApplication * the calling instance * @add_platform_data: invoked (locally) to add 'platform data' to be sent to * the primary instance when activating, opening or invoking actions - * @quit_mainloop: invoked on the primary instance when the use count of the - * application drops to zero (and after any inactivity timeout, if - * requested) - * @run_mainloop: invoked on the primary instance from g_application_run() - * if the use-count is non-zero + * @quit_mainloop: Used to be invoked on the primary instance when the use + * count of the application drops to zero (and after any inactivity + * timeout, if requested). Not used anymore since 2.32 + * @run_mainloop: Used to be invoked on the primary instance from + * g_application_run() if the use-count is non-zero. Since 2.32, + * GApplication is iterating the main context directly and is not + * using @run_mainloop anymore * * Since: 2.28 */ -- 2.11.4.GIT