From ee0a3a59c738f9a38f1e6425c84f405feb59580d Mon Sep 17 00:00:00 2001 From: Ryan Hope Date: Wed, 13 Jul 2022 10:58:51 +0100 Subject: [PATCH] gio: Ensure extension points are registered when creating Settings backends Add missing call to _g_io_modules_ensure_extension_points_registered() to GRegistryBackend, GNullSettingsBackend, and GNextstepSettingsBackend (cherry-picked from commit 924da751c2d3ed4636223343ebaa7364b97f8f93) --- gio/gnextstepsettingsbackend.m | 3 ++- gio/gnullsettingsbackend.c | 3 ++- gio/gregistrysettingsbackend.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gio/gnextstepsettingsbackend.m b/gio/gnextstepsettingsbackend.m index c09d995b6..cde636cee 100644 --- a/gio/gnextstepsettingsbackend.m +++ b/gio/gnextstepsettingsbackend.m @@ -21,7 +21,7 @@ #include "gsettingsbackendinternal.h" #include "gsimplepermission.h" -#include "giomodule.h" +#include "giomodule-priv.h" #import @@ -44,6 +44,7 @@ struct _GNextstepSettingsBackend G_DEFINE_TYPE_WITH_CODE (GNextstepSettingsBackend, g_nextstep_settings_backend, G_TYPE_SETTINGS_BACKEND, + _g_io_modules_ensure_extension_points_registered (); g_io_extension_point_implement (G_SETTINGS_BACKEND_EXTENSION_POINT_NAME, g_define_type_id, "nextstep", 90)); diff --git a/gio/gnullsettingsbackend.c b/gio/gnullsettingsbackend.c index 6b6f8cf75..48819962e 100644 --- a/gio/gnullsettingsbackend.c +++ b/gio/gnullsettingsbackend.c @@ -20,7 +20,7 @@ #include "config.h" #include "gsettingsbackendinternal.h" -#include "giomodule.h" +#include "giomodule-priv.h" #include "gsimplepermission.h" @@ -36,6 +36,7 @@ typedef GSettingsBackend GNullSettingsBackend; G_DEFINE_TYPE_WITH_CODE (GNullSettingsBackend, g_null_settings_backend, G_TYPE_SETTINGS_BACKEND, + _g_io_modules_ensure_extension_points_registered (); g_io_extension_point_implement (G_SETTINGS_BACKEND_EXTENSION_POINT_NAME, g_define_type_id, "null", 10)) diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c index a7171a21f..fd87cdba3 100644 --- a/gio/gregistrysettingsbackend.c +++ b/gio/gregistrysettingsbackend.c @@ -91,7 +91,7 @@ #include "gregistrysettingsbackend.h" #include "gsettingsbackend.h" -#include "giomodule.h" +#include "giomodule-priv.h" #include @@ -177,6 +177,7 @@ typedef struct { G_DEFINE_TYPE_WITH_CODE (GRegistryBackend, g_registry_backend, G_TYPE_SETTINGS_BACKEND, + _g_io_modules_ensure_extension_points_registered (); g_io_extension_point_implement (G_SETTINGS_BACKEND_EXTENSION_POINT_NAME, g_define_type_id, "registry", 90))