fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 06:50:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

trivial: rename some old ModemManager defines

Browse source
This commit is contained in:
Dan Williams 2013-05-29 10:31:22 -05:00
parent c41bd34570
commit 7f6d10f3c3
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/modem-manager/nm-modem-manager.c
View file

@ -173,7 +173,7 @@ create_modem (NMModemManager *self, const char *path)
{
NMModem *modem = NULL;
char *data_device = NULL, *driver = NULL, *master_device = NULL;
uint modem_type = MM_MODEM_TYPE_UNKNOWN;
uint modem_type = MM_OLD_MODEM_TYPE_UNKNOWN;
uint ip_method = MM_MODEM_IP_METHOD_PPP;
uint ip_timeout = 0;
NMModemState state = NM_MODEM_STATE_UNKNOWN;
@ -188,7 +188,7 @@ create_modem (NMModemManager *self, const char *path)
&modem_type, &ip_method, &ip_timeout, &state))
return;
if (modem_type == MM_MODEM_TYPE_UNKNOWN) {
if (modem_type == MM_OLD_MODEM_TYPE_UNKNOWN) {
nm_log_warn (LOGD_MB, "modem with path %s has unknown type, ignoring", path);
return;
}
@ -208,9 +208,9 @@ create_modem (NMModemManager *self, const char *path)
return;
}
if (modem_type == MM_MODEM_TYPE_GSM)
if (modem_type == MM_OLD_MODEM_TYPE_GSM)
modem = nm_modem_gsm_new (path, data_device, ip_method, state);
else if (modem_type == MM_MODEM_TYPE_CDMA)
else if (modem_type == MM_OLD_MODEM_TYPE_CDMA)
modem = nm_modem_cdma_new (path, data_device, ip_method, state);
else
nm_log_warn (LOGD_MB, "unknown modem type '%d'", modem_type);

6
src/modem-manager/nm-modem-types.h
View file

@ -30,9 +30,9 @@
#define MM_OLD_DBUS_INTERFACE_MODEM_GSM_CARD "org.freedesktop.ModemManager.Modem.Gsm.Card"
#define MM_OLD_DBUS_INTERFACE_MODEM_GSM_NETWORK "org.freedesktop.ModemManager.Modem.Gsm.Network"
#define MM_MODEM_TYPE_UNKNOWN 0
#define MM_MODEM_TYPE_GSM 1
#define MM_MODEM_TYPE_CDMA 2
#define MM_OLD_MODEM_TYPE_UNKNOWN 0
#define MM_OLD_MODEM_TYPE_GSM 1
#define MM_OLD_MODEM_TYPE_CDMA 2
/* Errors */