From 501a389a199f8b0f8eeb9d0430cb57d2a8d531df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Fri, 2 Mar 2012 09:02:33 +0100
Subject: [PATCH] cli: enable OLPC device now that we have it in libnm-glib

---
 cli/src/connections.c | 8 +++-----
 cli/src/devices.c     | 6 +++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/cli/src/connections.c b/cli/src/connections.c
index 00cc0b5daf..b315637b41 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -39,7 +39,7 @@
 #endif
 #include <nm-device-modem.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-remote-settings.h>
 #include <nm-vpn-connection.h>
@@ -1273,7 +1273,6 @@ check_bt_compatible (NMDeviceBt *device, NMConnection *connection, GError **erro
 	return addr_match;
 }
 
-#if 0
 static gboolean
 check_olpc_mesh_compatible (NMDeviceOlpcMesh *device, NMConnection *connection, GError **error)
 {
@@ -1300,7 +1299,6 @@ check_olpc_mesh_compatible (NMDeviceOlpcMesh *device, NMConnection *connection,
 
 	return TRUE;
 }
-#endif
 
 #if WITH_WIMAX
 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);
 	else if (NM_IS_DEVICE_BT (device))
 		return check_bt_compatible (NM_DEVICE_BT (device), connection, error);
-//	else if (NM_IS_DEVICE_OLPC_MESH (device))
-//		return check_olpc_mesh_compatible (NM_DEVICE_OLPC_MESH (device), connection, error);
+	else if (NM_IS_DEVICE_OLPC_MESH (device))
+		return check_olpc_mesh_compatible (NM_DEVICE_OLPC_MESH (device), connection, error);
 #if WITH_WIMAX
 	else if (NM_IS_DEVICE_WIMAX (device))
 		return check_wimax_compatible (NM_DEVICE_WIMAX (device), connection, error);
diff --git a/cli/src/devices.c b/cli/src/devices.c
index 01cc764846..269ed10934 100644
--- a/cli/src/devices.c
+++ b/cli/src/devices.c
@@ -33,7 +33,7 @@
 #include <nm-device-wifi.h>
 #include <nm-device-modem.h>
 #include <nm-device-bt.h>
-//#include <nm-device-olpc-mesh.h>
+#include <nm-device-olpc-mesh.h>
 #if WITH_WIMAX
 #include <nm-device-wimax.h>
 #endif
@@ -446,8 +446,8 @@ device_type_to_string (NMDevice *device)
 		return _("Unknown");
 	case NM_DEVICE_TYPE_BT:
 		return NM_SETTING_BLUETOOTH_SETTING_NAME;
-//	case NM_DEVICE_TYPE_OLPC_MESH:
-//		return NM_SETTING_OLPC_MESH_SETTING_NAME;
+	case NM_DEVICE_TYPE_OLPC_MESH:
+		return NM_SETTING_OLPC_MESH_SETTING_NAME;
 #if WITH_WIMAX
 	case NM_DEVICE_TYPE_WIMAX:
 		return NM_SETTING_WIMAX_SETTING_NAME;