[PATCH] libnm-util: remove unused zone related code
- From: Jiri Popelka <jpopelka redhat com>
- To: NetworkManager-list gnome org
- Subject: [PATCH] libnm-util: remove unused zone related code
- Date: Tue, 19 Jun 2012 16:47:31 +0200
The test in verify() has been probably result of my
copy-paste-fu. It's wrong and useless anyway.
Those #defines are not used anywhere.
---
libnm-util/nm-setting-connection.c | 8 --------
libnm-util/nm-setting-connection.h | 7 -------
2 files changed, 15 deletions(-)
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index 94ca911..80380f3 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -601,14 +601,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
return FALSE;
}
- if (priv->zone && !priv->zone[0]) {
- g_set_error (error,
- NM_SETTING_CONNECTION_ERROR,
- NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
- NM_SETTING_CONNECTION_TYPE);
- return FALSE;
- }
-
/* Make sure the corresponding 'type' item is present */
if (all_settings && !g_slist_find_custom (all_settings, priv->type, find_setting_by_name)) {
g_set_error (error,
diff --git a/libnm-util/nm-setting-connection.h b/libnm-util/nm-setting-connection.h
index 1987484..7aaf752 100644
--- a/libnm-util/nm-setting-connection.h
+++ b/libnm-util/nm-setting-connection.h
@@ -79,13 +79,6 @@ GQuark nm_setting_connection_error_quark (void);
#define NM_SETTING_CONNECTION_MASTER "master"
#define NM_SETTING_CONNECTION_SLAVE_TYPE "slave-type"
-/* Well-known zone names */
-#define NM_SETTING_CONNECTION_ZONE_TRUSTED "trusted"
-#define NM_SETTING_CONNECTION_ZONE_HOME "home"
-#define NM_SETTING_CONNECTION_ZONE_WORK "work"
-#define NM_SETTING_CONNECTION_ZONE_PUBLIC "public"
-#define NM_SETTING_CONNECTION_ZONE_BLOCK "block"
-
/**
* NMSettingConnection:
*
--
1.7.10.2
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]