NetworkManager r3525 - in trunk: . libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Wed Apr  2 18:36:07 2008
New Revision: 3525
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3525&view=rev

Log:
2008-04-02  Dan Williams  <dcbw redhat com>

	* libnm-util/nm-setting-connection.c
	  libnm-util/nm-setting-connection.h
		- (set_property, get_property, nm_setting_connection_class_init): remove
			the 'lockdown' property; it's functionality will be replaced by
			PolicyKit instead



Modified:
   trunk/ChangeLog
   trunk/libnm-util/nm-setting-connection.c
   trunk/libnm-util/nm-setting-connection.h

Modified: trunk/libnm-util/nm-setting-connection.c
==============================================================================
--- trunk/libnm-util/nm-setting-connection.c	(original)
+++ trunk/libnm-util/nm-setting-connection.c	Wed Apr  2 18:36:07 2008
@@ -11,7 +11,6 @@
 	PROP_TYPE,
 	PROP_AUTOCONNECT,
 	PROP_TIMESTAMP,
-	PROP_LOCKDOWN,
 
 	LAST_PROP
 };
@@ -88,9 +87,6 @@
 	case PROP_TIMESTAMP:
 		setting->timestamp = g_value_get_uint64 (value);
 		break;
-	case PROP_LOCKDOWN:
-		setting->lockdown = g_value_dup_string (value);
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -116,9 +112,6 @@
 	case PROP_TIMESTAMP:
 		g_value_set_uint64 (value, setting->timestamp);
 		break;
-	case PROP_LOCKDOWN:
-		g_value_set_string (value, setting->lockdown);
-		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -169,12 +162,4 @@
 						  "Connection timestamp",
 						  0, G_MAXUINT64, 0,
 						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_FUZZY_IGNORE));
-
-	g_object_class_install_property
-		(object_class, PROP_LOCKDOWN,
-		 g_param_spec_string (NM_SETTING_CONNECTION_LOCKDOWN,
-						  "Lockdown",
-						  "Connection lockdown policy",
-						  NULL,
-						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 }

Modified: trunk/libnm-util/nm-setting-connection.h
==============================================================================
--- trunk/libnm-util/nm-setting-connection.h	(original)
+++ trunk/libnm-util/nm-setting-connection.h	Wed Apr  2 18:36:07 2008
@@ -20,7 +20,6 @@
 #define NM_SETTING_CONNECTION_TYPE        "type"
 #define NM_SETTING_CONNECTION_AUTOCONNECT "autoconnect"
 #define NM_SETTING_CONNECTION_TIMESTAMP   "timestamp"
-#define NM_SETTING_CONNECTION_LOCKDOWN    "lockdown"
 
 typedef struct {
 	NMSetting parent;
@@ -29,13 +28,6 @@
 	char *type;
 	gboolean autoconnect;
 	guint64 timestamp;
-
-	/* One of:
-	 *   device     - specified device may only use this connection
-	 *   connection - only this connection may be used to connect to compatible
-	 *                networks (matched on SSID, Bluetooth address, etc)
-	 */
-	char *lockdown;
 } NMSettingConnection;
 
 typedef struct {