From c57e5a6b66b8a29d4c16dacf9aafc7ee04a27243 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 13 Apr 2016 16:57:40 +0200 Subject: [PATCH] manager: fix implementation of NMManager's "startup-complete Due to a bug, NMManager would connect to "notify::connections" and might miss an important notification when NMSettings declares startup-complete. Fixes: b067ca703404ccad68404456c83caa5983a597ab --- src/settings/nm-settings.c | 7 +++++++ src/settings/nm-settings.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 4ad395a10b..015c242ae9 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -2435,6 +2435,13 @@ nm_settings_class_init (NMSettingsClass *class) G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property + (object_class, PROP_STARTUP_COMPLETE, + g_param_spec_boolean (NM_SETTINGS_STARTUP_COMPLETE, "", "", + FALSE, + G_PARAM_READABLE | + G_PARAM_STATIC_STRINGS)); + /* signals */ signals[CONNECTION_ADDED] = g_signal_new (NM_SETTINGS_SIGNAL_CONNECTION_ADDED, diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h index 051c209423..fb7f113171 100644 --- a/src/settings/nm-settings.h +++ b/src/settings/nm-settings.h @@ -41,7 +41,7 @@ #define NM_SETTINGS_HOSTNAME "hostname" #define NM_SETTINGS_CAN_MODIFY "can-modify" #define NM_SETTINGS_CONNECTIONS "connections" -#define NM_SETTINGS_STARTUP_COMPLETE "connections" +#define NM_SETTINGS_STARTUP_COMPLETE "startup-complete" #define NM_SETTINGS_SIGNAL_CONNECTION_ADDED "connection-added" #define NM_SETTINGS_SIGNAL_CONNECTION_UPDATED "connection-updated"