colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-06-10 Dan Williams <dcbw@redhat.com>

Browse Source 
The grand 802-3-ethernet rename.  Get rid of the 802-3/8023/802_3 bits.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3741 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-06-10 15:54:23 +00:00
parent 6919b29f11
commit 2b00116361
43 changed files with 363 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
system-settings/plugins/ifcfg-fedora/nm-ifcfg-connection.c
View File

@@ -124,26 +124,26 @@ get_ether_device_udi (DBusGConnection *g_connection, GByteArray *mac, GSList *de
static NMDeviceType
get_device_type_for_connection (NMConnection *connection)
{
NMDeviceType devtype = DEVICE_TYPE_UNKNOWN;
NMDeviceType devtype = NM_DEVICE_TYPE_UNKNOWN;
NMSettingConnection *s_con;
s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
if (!s_con)
return DEVICE_TYPE_UNKNOWN;
return NM_DEVICE_TYPE_UNKNOWN;
if ( !strcmp (s_con->type, NM_SETTING_WIRED_SETTING_NAME)
|| !strcmp (s_con->type, NM_SETTING_PPPOE_SETTING_NAME)) {
if (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED))
devtype = DEVICE_TYPE_802_3_ETHERNET;
devtype = NM_DEVICE_TYPE_ETHERNET;
} else if (!strcmp (s_con->type, NM_SETTING_WIRELESS_SETTING_NAME)) {
if (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS))
devtype = DEVICE_TYPE_802_11_WIRELESS;
devtype = NM_DEVICE_TYPE_WIFI;
} else if (!strcmp (s_con->type, NM_SETTING_GSM_SETTING_NAME)) {
if (nm_connection_get_setting (connection, NM_TYPE_SETTING_GSM))
devtype = DEVICE_TYPE_GSM;
devtype = NM_DEVICE_TYPE_GSM;
} else if (!strcmp (s_con->type, NM_SETTING_CDMA_SETTING_NAME)) {
if (nm_connection_get_setting (connection, NM_TYPE_SETTING_CDMA))
devtype = DEVICE_TYPE_CDMA;
devtype = NM_DEVICE_TYPE_CDMA;
}
return devtype;
@@ -160,22 +160,22 @@ get_udi_for_connection (NMConnection *connection,
char *udi = NULL;
GSList *devices = NULL;
if (devtype == DEVICE_TYPE_UNKNOWN)
if (devtype == NM_DEVICE_TYPE_UNKNOWN)
devtype = get_device_type_for_connection (connection);
switch (devtype) {
case DEVICE_TYPE_802_3_ETHERNET:
case NM_DEVICE_TYPE_ETHERNET:
s_wired = (NMSettingWired *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRED);
if (s_wired) {
devices = nm_system_config_hal_manager_get_devices_of_type (hal_mgr, DEVICE_TYPE_802_3_ETHERNET);
devices = nm_system_config_hal_manager_get_devices_of_type (hal_mgr, NM_DEVICE_TYPE_ETHERNET);
udi = get_ether_device_udi (g_connection, s_wired->mac_address, devices);
}
break;
case DEVICE_TYPE_802_11_WIRELESS:
case NM_DEVICE_TYPE_WIFI:
s_wireless = (NMSettingWireless *) nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS);
if (s_wireless) {
devices = nm_system_config_hal_manager_get_devices_of_type (hal_mgr, DEVICE_TYPE_802_11_WIRELESS);
devices = nm_system_config_hal_manager_get_devices_of_type (hal_mgr, NM_DEVICE_TYPE_WIFI);
udi = get_ether_device_udi (g_connection, s_wireless->mac_address, devices);
}
break;
@@ -255,7 +255,7 @@ nm_ifcfg_connection_new (const char *filename,
if (!wrapped)
return NULL;
udi = get_udi_for_connection (wrapped, g_connection, hal_mgr, DEVICE_TYPE_UNKNOWN);
udi = get_udi_for_connection (wrapped, g_connection, hal_mgr, NM_DEVICE_TYPE_UNKNOWN);
object = (GObject *) g_object_new (NM_TYPE_IFCFG_CONNECTION,
NM_IFCFG_CONNECTION_FILENAME, filename,

4
system-settings/plugins/ifcfg-suse/parser.c
View File

@@ -658,10 +658,10 @@ parse_ifcfg (const char *iface, NMDeviceType type)
connection = nm_connection_new ();
switch (type) {
case DEVICE_TYPE_802_3_ETHERNET:
case NM_DEVICE_TYPE_ETHERNET:
parse_ethernet (connection, file, iface);
break;
case DEVICE_TYPE_802_11_WIRELESS:
case NM_DEVICE_TYPE_WIFI:
parse_wireless (connection, file, iface);
break;
default:

8
system-settings/plugins/ifcfg-suse/plugin.c
View File

@@ -232,7 +232,7 @@ device_added_cb (NMSystemConfigHalManager *hal_mgr,
{
SCPluginIfcfg *self = SC_PLUGIN_IFCFG (user_data);
if (dev_type != DEVICE_TYPE_802_3_ETHERNET && dev_type != DEVICE_TYPE_802_11_WIRELESS)
if (dev_type != NM_DEVICE_TYPE_ETHERNET && dev_type != NM_DEVICE_TYPE_WIFI)
return;
read_connection (self, udi, dev_type);
@@ -248,7 +248,7 @@ device_removed_cb (NMSystemConfigHalManager *hal_mgr,
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (self);
NMExportedConnection *exported;
if (dev_type != DEVICE_TYPE_802_3_ETHERNET && dev_type != DEVICE_TYPE_802_11_WIRELESS)
if (dev_type != NM_DEVICE_TYPE_ETHERNET && dev_type != NM_DEVICE_TYPE_WIFI)
return;
if (g_hash_table_remove (priv->unmanaged_devices, udi))
@@ -291,8 +291,8 @@ get_connections (NMSystemConfigInterface *config)
if (!priv->initialized) {
const char *filename;
read_connections_by_type (self, DEVICE_TYPE_802_3_ETHERNET);
read_connections_by_type (self, DEVICE_TYPE_802_11_WIRELESS);
read_connections_by_type (self, NM_DEVICE_TYPE_ETHERNET);
read_connections_by_type (self, NM_DEVICE_TYPE_WIFI);
filename = SYSCONFDIR"/sysconfig/network/routes";
monitor_routes (self, filename);