From db41fe3cf2b8048eda0229a0b541a441a558d85e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 9 Feb 2011 18:41:17 -0600 Subject: [PATCH] settings: add error for already existing UUID --- src/settings/nm-settings-error.c | 12 ++++++++++-- src/settings/nm-settings-error.h | 7 ++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/settings/nm-settings-error.c b/src/settings/nm-settings-error.c index 025ae581a2..7e24fb71ff 100644 --- a/src/settings/nm-settings-error.c +++ b/src/settings/nm-settings-error.c @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2008 Novell, Inc. - * Copyright (C) 2008 - 2010 Red Hat, Inc. + * Copyright (C) 2008 - 2011 Red Hat, Inc. */ #include "nm-settings-error.h" @@ -57,14 +57,22 @@ nm_settings_error_get_type (void) ENUM_ENTRY (NM_SETTINGS_ERROR_PERMISSION_DENIED, "PermissionDenied"), /* The requested setting does not existing in this connection. */ ENUM_ENTRY (NM_SETTINGS_ERROR_INVALID_SETTING, "InvalidSetting"), - + /* The caller does not have permission to perform this operation */ ENUM_ENTRY (NM_SETTINGS_ERROR_NOT_PRIVILEGED, "NotPrivileged"), + /* No plugin supports adding new connections */ ENUM_ENTRY (NM_SETTINGS_ERROR_ADD_NOT_SUPPORTED, "AddNotSupported"), + /* The plugin providing this connection does not support updating it */ ENUM_ENTRY (NM_SETTINGS_ERROR_UPDATE_NOT_SUPPORTED, "UpdateNotSupported"), + /* The plugin providing this connection does not support deleting it */ ENUM_ENTRY (NM_SETTINGS_ERROR_DELETE_NOT_SUPPORTED, "DeleteNotSupported"), + /* Failed to add the connection */ ENUM_ENTRY (NM_SETTINGS_ERROR_ADD_FAILED, "AddFailed"), + /* No plugin supports modifying the system hostname */ ENUM_ENTRY (NM_SETTINGS_ERROR_SAVE_HOSTNAME_NOT_SUPPORTED, "SaveHostnameNotSupported"), + /* Saving the system hostname failed */ ENUM_ENTRY (NM_SETTINGS_ERROR_SAVE_HOSTNAME_FAILED, "SaveHostnameFailed"), + /* A connection with this UUID already exists */ + ENUM_ENTRY (NM_SETTINGS_ERROR_UUID_EXISTS, "UuidExists"), { 0, 0, 0 } }; diff --git a/src/settings/nm-settings-error.h b/src/settings/nm-settings-error.h index 45996a2f20..b782a7791c 100644 --- a/src/settings/nm-settings-error.h +++ b/src/settings/nm-settings-error.h @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2008 Novell, Inc. - * Copyright (C) 2008 - 2010 Red Hat, Inc. + * Copyright (C) 2008 - 2011 Red Hat, Inc. */ #ifndef NM_SETTINGS_ERROR_H @@ -41,12 +41,13 @@ enum { NM_SETTINGS_ERROR_ADD_FAILED, NM_SETTINGS_ERROR_SAVE_HOSTNAME_NOT_SUPPORTED, NM_SETTINGS_ERROR_SAVE_HOSTNAME_FAILED, + NM_SETTINGS_ERROR_UUID_EXISTS, }; #define NM_SETTINGS_ERROR (nm_settings_error_quark ()) -#define NM_TYPE_SETTINGS_ERROR (nm_settings_error_get_type ()) +GQuark nm_settings_error_quark (void); -GQuark nm_settings_error_quark (void); +#define NM_TYPE_SETTINGS_ERROR (nm_settings_error_get_type ()) GType nm_settings_error_get_type (void); #endif /* NM_SETTINGS_ERROR_H */