From 2c032d8f1c6292c1338a615e6ec40252889ba85c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 22 Jan 2015 00:29:39 +0100 Subject: Imported Upstream version 1.0.0 --- src/settings/plugins/keyfile/nm-keyfile-connection.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/settings/plugins/keyfile/nm-keyfile-connection.c') diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c index 4ef761c6..c852f028 100644 --- a/src/settings/plugins/keyfile/nm-keyfile-connection.c +++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c @@ -19,9 +19,11 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ +#include "config.h" + #include #include -#include +#include #include #include @@ -63,7 +65,7 @@ nm_keyfile_connection_new (NMConnection *source, uuid = nm_connection_get_uuid (NM_CONNECTION (tmp)); if (!uuid) { - g_set_error (error, KEYFILE_PLUGIN_ERROR, 0, + g_set_error (error, NM_SETTINGS_ERROR, NM_SETTINGS_ERROR_INVALID_CONNECTION, "Connection in file %s had no UUID", full_path); g_object_unref (tmp); return NULL; @@ -166,11 +168,7 @@ nm_keyfile_connection_init (NMKeyfileConnection *connection) static void finalize (GObject *object) { - NMKeyfileConnectionPrivate *priv = NM_KEYFILE_CONNECTION_GET_PRIVATE (object); - - nm_connection_clear_secrets (NM_CONNECTION (object)); - - g_free (priv->path); + g_free (NM_KEYFILE_CONNECTION_GET_PRIVATE (object)->path); G_OBJECT_CLASS (nm_keyfile_connection_parent_class)->finalize (object); } @@ -184,7 +182,7 @@ nm_keyfile_connection_class_init (NMKeyfileConnectionClass *keyfile_connection_c g_type_class_add_private (keyfile_connection_class, sizeof (NMKeyfileConnectionPrivate)); /* Virtual methods */ - object_class->finalize = finalize; + object_class->finalize = finalize; settings_class->commit_changes = commit_changes; settings_class->delete = do_delete; } -- cgit 1.3.0-6-gf8a5