diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-06-05 12:39:32 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-06-05 12:42:12 -0500 |
| commit | b0863cbc4d54fec8d89f0952b862d4ef33c9d1f9 (patch) | |
| tree | fde1a7b8060a771db8a2f3164543a3b4eb46fe43 | |
| parent | 46853f08211269b7fcfb45e4d7b814afaf378a2d (diff) | |
| download | NetworkManager-b0863cbc4d54fec8d89f0952b862d4ef33c9d1f9.tar.gz | |
mobile: don't fail in old MM code when using deprecated functions
We want to keep using these deprecated functions when talking to
the old ModemManager to ensure behavior is unchanged.
| -rw-r--r-- | cli/src/settings.c | 2 | ||||
| -rw-r--r-- | src/modem-manager/nm-modem-old.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/cli/src/settings.c b/cli/src/settings.c index 1493e02b4f..2bb3c42b8e 100644 --- a/cli/src/settings.c +++ b/cli/src/settings.c @@ -1045,7 +1045,9 @@ static char * nmc_property_gsm_get_allowed_bands (NMSetting *setting) { NMSettingGsm *s_gsm = NM_SETTING_GSM (setting); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS return allowed_bands_to_string (nm_setting_gsm_get_allowed_bands (s_gsm)); +G_GNUC_END_IGNORE_DEPRECATIONS } DEFINE_GETTER (nmc_property_gsm_get_pin, NM_SETTING_GSM_PIN) diff --git a/src/modem-manager/nm-modem-old.c b/src/modem-manager/nm-modem-old.c index e7f672a138..bc6fe21ea0 100644 --- a/src/modem-manager/nm-modem-old.c +++ b/src/modem-manager/nm-modem-old.c @@ -470,6 +470,7 @@ create_connect_properties (NMConnection *connection) if (str) value_hash_add_str (properties, "password", str); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS /* Add both old and new preferred modes */ switch (nm_setting_gsm_get_network_type (s_gsm)) { case NM_SETTING_GSM_NETWORK_TYPE_UMTS_HSPA: @@ -501,6 +502,7 @@ create_connect_properties (NMConnection *connection) value_hash_add_uint (properties, "allowed_mode", MM_MODEM_GSM_ALLOWED_MODE_ANY); break; } +G_GNUC_END_IGNORE_DEPRECATIONS /* Roaming */ if (nm_setting_gsm_get_home_only (s_gsm)) |