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

cli: enable OLPC device now that we have it in libnm-glib

Browse Source
This commit is contained in:
Jiří Klimeš
2012-03-02 09:02:33 +01:00
parent 960621c400
commit 501a389a19
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cli/src/connections.c
View File

@@ -39,7 +39,7 @@
#endif #endif
#include <nm-device-modem.h> #include <nm-device-modem.h>
#include <nm-device-bt.h> #include <nm-device-bt.h>
//#include <nm-device-olpc-mesh.h> #include <nm-device-olpc-mesh.h>
#include <nm-device-infiniband.h> #include <nm-device-infiniband.h>
#include <nm-remote-settings.h> #include <nm-remote-settings.h>
#include <nm-vpn-connection.h> #include <nm-vpn-connection.h>
@@ -1273,7 +1273,6 @@ check_bt_compatible (NMDeviceBt *device, NMConnection *connection, GError **erro
return addr_match; return addr_match;
} }
#if 0
static gboolean static gboolean
check_olpc_mesh_compatible (NMDeviceOlpcMesh *device, NMConnection *connection, GError **error) check_olpc_mesh_compatible (NMDeviceOlpcMesh *device, NMConnection *connection, GError **error)
{ {
@@ -1300,7 +1299,6 @@ check_olpc_mesh_compatible (NMDeviceOlpcMesh *device, NMConnection *connection,
return TRUE; return TRUE;
} }
#endif
#if WITH_WIMAX #if WITH_WIMAX
static gboolean static gboolean
@@ -1458,8 +1456,8 @@ nm_device_is_connection_compatible (NMDevice *device, NMConnection *connection,
return check_wifi_compatible (NM_DEVICE_WIFI (device), connection, error); return check_wifi_compatible (NM_DEVICE_WIFI (device), connection, error);
else if (NM_IS_DEVICE_BT (device)) else if (NM_IS_DEVICE_BT (device))
return check_bt_compatible (NM_DEVICE_BT (device), connection, error); return check_bt_compatible (NM_DEVICE_BT (device), connection, error);
// else if (NM_IS_DEVICE_OLPC_MESH (device)) else if (NM_IS_DEVICE_OLPC_MESH (device))
// return check_olpc_mesh_compatible (NM_DEVICE_OLPC_MESH (device), connection, error); return check_olpc_mesh_compatible (NM_DEVICE_OLPC_MESH (device), connection, error);
#if WITH_WIMAX #if WITH_WIMAX
else if (NM_IS_DEVICE_WIMAX (device)) else if (NM_IS_DEVICE_WIMAX (device))
return check_wimax_compatible (NM_DEVICE_WIMAX (device), connection, error); return check_wimax_compatible (NM_DEVICE_WIMAX (device), connection, error);

6
cli/src/devices.c
View File

@@ -33,7 +33,7 @@
#include <nm-device-wifi.h> #include <nm-device-wifi.h>
#include <nm-device-modem.h> #include <nm-device-modem.h>
#include <nm-device-bt.h> #include <nm-device-bt.h>
//#include <nm-device-olpc-mesh.h> #include <nm-device-olpc-mesh.h>
#if WITH_WIMAX #if WITH_WIMAX
#include <nm-device-wimax.h> #include <nm-device-wimax.h>
#endif #endif
@@ -446,8 +446,8 @@ device_type_to_string (NMDevice *device)
return _("Unknown"); return _("Unknown");
case NM_DEVICE_TYPE_BT: case NM_DEVICE_TYPE_BT:
return NM_SETTING_BLUETOOTH_SETTING_NAME; return NM_SETTING_BLUETOOTH_SETTING_NAME;
// case NM_DEVICE_TYPE_OLPC_MESH: case NM_DEVICE_TYPE_OLPC_MESH:
// return NM_SETTING_OLPC_MESH_SETTING_NAME; return NM_SETTING_OLPC_MESH_SETTING_NAME;
#if WITH_WIMAX #if WITH_WIMAX
case NM_DEVICE_TYPE_WIMAX: case NM_DEVICE_TYPE_WIMAX:
return NM_SETTING_WIMAX_SETTING_NAME; return NM_SETTING_WIMAX_SETTING_NAME;