diff options
| author | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-07-14 19:39:12 +0200 |
| commit | 34b1c46437df982495d08a8bbb8bd0b262d8af48 (patch) | |
| tree | 1db29ec39d9f733922b3a33cabcc8e6486fa06aa /src/settings/nm-settings-connection.c | |
| parent | 50fc50153b0036516b853aa576dc435bd53ce736 (diff) | |
| parent | 50a58f0fabd8a34c1b6108a107e08abe3c1ccd24 (diff) | |
Merge tag 'upstream/1.0.4'
Upstream version 1.0.4
Diffstat (limited to 'src/settings/nm-settings-connection.c')
| -rw-r--r-- | src/settings/nm-settings-connection.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c index ec2052f0..0f67a216 100644 --- a/src/settings/nm-settings-connection.c +++ b/src/settings/nm-settings-connection.c @@ -96,6 +96,8 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; typedef struct { + gboolean removed; + NMAgentManager *agent_mgr; NMSessionMonitor *session_monitor; guint session_changed_id; @@ -1742,6 +1744,12 @@ impl_settings_connection_clear_secrets (NMSettingsConnection *self, void nm_settings_connection_signal_remove (NMSettingsConnection *self) { + NMSettingsConnectionPrivate *priv = NM_SETTINGS_CONNECTION_GET_PRIVATE (self); + + if (priv->removed) + g_return_if_reached (); + priv->removed = TRUE; + /* Emit removed first */ g_signal_emit_by_name (self, NM_SETTINGS_CONNECTION_REMOVED); |