From e2d297e5ff2a93ad6032dbb21ef7b54e3c41ddb8 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 2 Feb 2011 20:32:15 -0600 Subject: [PATCH] settings: fix loading of keyfile connections Updating unmanaged specs may cause load_connections() to be called, and the keyfile plugin needs to be registered before that. --- src/settings/nm-settings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index e47b89fb43..b28ae36dde 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -1357,7 +1357,6 @@ nm_settings_new (const char *config_file, g_object_unref (self); return NULL; } - unmanaged_specs_changed (NULL, self); } /* Add the keyfile plugin last */ @@ -1365,6 +1364,8 @@ nm_settings_new (const char *config_file, g_assert (keyfile_plugin); add_plugin (self, NM_SYSTEM_CONFIG_INTERFACE (keyfile_plugin)); + unmanaged_specs_changed (NULL, self); + dbus_g_connection_register_g_object (priv->bus, NM_DBUS_PATH_SETTINGS, G_OBJECT (self)); return self; }