luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-02 09:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GApplication: don't create a mainloop

Browse Source 
Just iterate the main context directly.  Also: avoid calling the virtual
functions for mainloops.

https://bugzilla.gnome.org/show_bug.cgi?id=658805
This commit is contained in:
Ryan Lortie 2011-09-13 21:57:30 -04:00
parent 39294664a6
commit 43007aa2d2
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gio/gapplication.c
View File

@ -149,7 +149,6 @@ struct _GApplicationPrivate
gchar *id; gchar *id;
GActionGroup *actions; GActionGroup *actions;
GMainLoop *mainloop;
guint inactivity_timeout_id; guint inactivity_timeout_id;
guint inactivity_timeout; guint inactivity_timeout;
@ -364,22 +363,6 @@ g_application_real_add_platform_data (GApplication *application,
{ {
} }
static void
g_application_real_quit_mainloop (GApplication *application)
{
if (application->priv->mainloop != NULL)
g_main_loop_quit (application->priv->mainloop);
}
static void
g_application_real_run_mainloop (GApplication *application)
{
if (application->priv->mainloop == NULL)
application->priv->mainloop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (application->priv->mainloop);
}
/* GObject implementation stuff {{{1 */ /* GObject implementation stuff {{{1 */
static void static void
g_application_set_property (GObject *object, g_application_set_property (GObject *object,
@ -502,9 +485,6 @@ g_application_finalize (GObject *object)
g_application_impl_destroy (application->priv->impl); g_application_impl_destroy (application->priv->impl);
g_free (application->priv->id); g_free (application->priv->id);
if (application->priv->mainloop)
g_main_loop_unref (application->priv->mainloop);
G_OBJECT_CLASS (g_application_parent_class) G_OBJECT_CLASS (g_application_parent_class)
->finalize (object); ->finalize (object);
} }
@ -536,8 +516,6 @@ g_application_class_init (GApplicationClass *class)
class->command_line = g_application_real_command_line; class->command_line = g_application_real_command_line;
class->local_command_line = g_application_real_local_command_line; class->local_command_line = g_application_real_local_command_line;
class->add_platform_data = g_application_real_add_platform_data; class->add_platform_data = g_application_real_add_platform_data;
class->quit_mainloop = g_application_real_quit_mainloop;
class->run_mainloop = g_application_real_run_mainloop;
g_object_class_install_property (object_class, PROP_APPLICATION_ID, g_object_class_install_property (object_class, PROP_APPLICATION_ID,
g_param_spec_string ("application-id", g_param_spec_string ("application-id",
@ -1088,8 +1066,7 @@ inactivity_timeout_expired (gpointer data)
{ {
GApplication *application = G_APPLICATION (data); GApplication *application = G_APPLICATION (data);
G_APPLICATION_GET_CLASS (application) application->priv->inactivity_timeout_id = 0;
->quit_mainloop (application);
return FALSE; return FALSE;
} }
@ -1111,17 +1088,9 @@ g_application_release (GApplication *application)
{ {
application->priv->use_count--; application->priv->use_count--;
if (application->priv->use_count == 0) if (application->priv->use_count == 0 && application->priv->inactivity_timeout)
{ application->priv->inactivity_timeout_id = g_timeout_add (application->priv->inactivity_timeout,
if (application->priv->inactivity_timeout) inactivity_timeout_expired, application);
application->priv->inactivity_timeout_id =
g_timeout_add (application->priv->inactivity_timeout,
inactivity_timeout_expired, application);
else
G_APPLICATION_GET_CLASS (application)
->quit_mainloop (application);
}
} }
/* Activate, Open {{{1 */ /* Activate, Open {{{1 */
@ -1346,11 +1315,9 @@ g_application_run (GApplication *application,
g_timeout_add (10000, inactivity_timeout_expired, application); g_timeout_add (10000, inactivity_timeout_expired, application);
} }
if (application->priv->use_count || while (application->priv->use_count || application->priv->inactivity_timeout_id)
application->priv->inactivity_timeout_id)
{ {
G_APPLICATION_GET_CLASS (application) g_main_context_iteration (NULL, TRUE);
->run_mainloop (application);
status = 0; status = 0;
} }