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

Avoid a race in application registration

Browse Source 
We need to register the object before taking the name.
Remove the workarounds for this race from the test suite.
This commit is contained in:
Matthias Clasen 2010-06-12 18:40:45 -04:00
parent 5e03f273be
commit fdb15058a4
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gio/gdbusapplication.c
View File

@ -289,22 +289,6 @@ ensure_bus (GApplication *app)
static void
_g_application_platform_init (GApplication *app)
{
GError *error = NULL;
guint registration_id;
ensure_bus (app);
registration_id = g_dbus_connection_register_object (app->priv->session_bus,
app->priv->dbus_path,
&application_dbus_interface_info,
&application_dbus_vtable,
app, NULL,
&error);
if (registration_id == 0)
{
g_error ("%s", error->message);
g_error_free (error);
}
}
static gboolean
@ -313,11 +297,24 @@ _g_application_platform_acquire_single_instance (GApplication *app,
{
GVariant *request_result;
guint32 request_status;
gboolean result;
guint registration_id;
ensure_bus (app);
if (app->priv->session_bus == NULL)
return FALSE;
registration_id = g_dbus_connection_register_object (app->priv->session_bus,
app->priv->dbus_path,
&application_dbus_interface_info,
&application_dbus_vtable,
app,
NULL,
error);
if (registration_id == 0)
return FALSE;
request_result = g_dbus_connection_call_sync (app->priv->session_bus,
"org.freedesktop.DBus",
"/org/freedesktop/DBus",
@ -327,7 +324,10 @@ _g_application_platform_acquire_single_instance (GApplication *app,
NULL, 0, -1, NULL, error);
if (request_result == NULL)
return FALSE;
{
result = FALSE;
goto done;
}
if (g_variant_is_of_type (request_result, G_VARIANT_TYPE ("(u)")))
g_variant_get (request_result, "(u)", &request_status);
@ -343,10 +343,17 @@ _g_application_platform_acquire_single_instance (GApplication *app,
else
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Unknown error");
return FALSE;
result = FALSE;
goto done;
}
return TRUE;
result = TRUE;
done:
if (!result)
g_dbus_connection_unregister_object (app->priv->session_bus, registration_id);
return result;
}
static void

7
gio/tests/testapps.c
View File

@ -339,12 +339,7 @@ test_quit_on_app_appeared (void)
on_name_disappeared_quit,
loop,
NULL);
/* We need a timeout here, since we may otherwise end up calling
* Quit after the application took the name, but before it registered
* the object.
*/
g_timeout_add (500, call_quit, NULL);
call_quit (NULL);
g_main_loop_run (loop);