diff options
Diffstat (limited to 'libnm-util/nm-setting-gsm.c')
| -rw-r--r-- | libnm-util/nm-setting-gsm.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c index 9f24265d..aff8be08 100644 --- a/libnm-util/nm-setting-gsm.c +++ b/libnm-util/nm-setting-gsm.c @@ -26,7 +26,6 @@ #include <string.h> #include <ctype.h> #include "nm-setting-gsm.h" -#include "nm-setting-serial.h" #include "nm-utils.h" GQuark @@ -55,7 +54,7 @@ nm_setting_gsm_error_get_type (void) ENUM_ENTRY (NM_SETTING_GSM_ERROR_INVALID_PROPERTY, "InvalidProperty"), /* The specified property was missing and is required. */ ENUM_ENTRY (NM_SETTING_GSM_ERROR_MISSING_PROPERTY, "MissingProperty"), - /* The required serial setting is missing */ + /* The required serial setting is missing (DEPRECATED) */ ENUM_ENTRY (NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING, "MissingSerialSetting"), { 0, 0, 0 } }; @@ -107,15 +106,6 @@ nm_setting_gsm_new (void) return (NMSetting *) g_object_new (NM_TYPE_SETTING_GSM, NULL); } -static gint -find_setting_by_name (gconstpointer a, gconstpointer b) -{ - NMSetting *setting = NM_SETTING (a); - const char *str = (const char *) b; - - return strcmp (nm_setting_get_name (setting), str); -} - const char * nm_setting_gsm_get_number (NMSettingGsm *setting) { @@ -207,16 +197,6 @@ verify (NMSetting *setting, GSList *all_settings, GError **error) { NMSettingGsmPrivate *priv = NM_SETTING_GSM_GET_PRIVATE (setting); - /* Serial connections require a PPP setting */ - if (all_settings && - !g_slist_find_custom (all_settings, NM_SETTING_SERIAL_SETTING_NAME, find_setting_by_name)) { - g_set_error (error, - NM_SETTING_GSM_ERROR, - NM_SETTING_GSM_ERROR_MISSING_SERIAL_SETTING, - NULL); - return FALSE; - } - if (!priv->number) { g_set_error (error, NM_SETTING_GSM_ERROR, |