luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-11 03:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '769778-dbus_register-contract' into 'master'

Browse Source 
gapplication: Add postconditions on calls to GApplication.dbus_register

Closes #1188

See merge request GNOME/glib!1800
This commit is contained in:
Sebastian Dröge 2020-12-12 09:01:00 +00:00
commit 975603d74f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gapplicationimpl-dbus.c
View File

@ -371,6 +371,7 @@ g_application_impl_attempt_primary (GApplicationImpl *impl,
GApplicationFlags app_flags; GApplicationFlags app_flags;
GVariant *reply; GVariant *reply;
guint32 rval; guint32 rval;
GError *local_error = NULL;
if (org_gtk_Application == NULL) if (org_gtk_Application == NULL)
{ {
@ -430,8 +431,14 @@ g_application_impl_attempt_primary (GApplicationImpl *impl,
if (!app_class->dbus_register (impl->app, if (!app_class->dbus_register (impl->app,
impl->session_bus, impl->session_bus,
impl->object_path, impl->object_path,
error)) &local_error))
return FALSE; {
g_return_val_if_fail (local_error != NULL, FALSE);
g_propagate_error (error, g_steal_pointer (&local_error));
return FALSE;
}
g_return_val_if_fail (local_error == NULL, FALSE);
if (impl->bus_name == NULL) if (impl->bus_name == NULL)
{ {