libnm-util: remove unused zone related code

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.
This commit is contained in:
Jiri Popelka 2012-06-19 16:47:31 +02:00 committed by Jiří Klimeš
parent b37ed68e18
commit ec821e0783
2 changed files with 0 additions and 15 deletions

View file

@ -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,

View file

@ -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:
*