luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

GApplication: fix inactivity-timeout

Browse Source 
Create the gobject property for it.

Tweak the logic of having a pending timeout at the time that the
application starts -- run the mainloop with a use count of zero if there
is a timeout active.
This commit is contained in:
Ryan Lortie 2010-10-06 14:05:40 -04:00
parent a7923a4aa3
commit 72ce1c7eb6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gio/gapplication.c
View File

@ -372,6 +372,11 @@ g_application_class_init (GApplicationClass *class)
"If this application instance is remote",
FALSE, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (object_class, PROP_INACTIVITY_TIMEOUT,
g_param_spec_boolean ("inactivity-timeout", "inactivity timeout",
"time (ms) to stay alive after becoming idle",
0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_application_signals[SIGNAL_STARTUP] =
g_signal_new ("startup", G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST,
@ -984,14 +989,17 @@ g_application_run_with_arguments (GApplication *application,
g_variant_unref (arguments);
if (application->priv->use_count ||
application->priv->flags & G_APPLICATION_FLAGS_IS_SERVICE)
if (application->priv->flags & G_APPLICATION_FLAGS_IS_SERVICE &&
!application->priv->use_count &&
!application->priv->inactivity_timeout_id)
{
if (!application->priv->use_count)
application->priv->inactivity_timeout_id =
g_timeout_add (10000, inactivity_timeout_expired, application);
application->priv->inactivity_timeout_id =
g_timeout_add (10000, inactivity_timeout_expired, application);
}
if (application->priv->use_count ||
application->priv->inactivity_timeout_id)
{
G_APPLICATION_GET_CLASS (application)
->run_mainloop (application);
status = 0;