NetworkManager r3699 - in trunk: . libnm-util

[dcbw svn gnome org]

Author: dcbw
Date: Thu May 29 02:11:17 2008
New Revision: 3699
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3699&view=rev

Log:
2008-05-28  Dan Williams  <dcbw redhat com>

	Revert r3697 (adhoc-create property patch); it's the wrong way to do this.



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

Modified: trunk/libnm-util/nm-setting-wireless.c
==============================================================================
--- trunk/libnm-util/nm-setting-wireless.c	(original)
+++ trunk/libnm-util/nm-setting-wireless.c	Thu May 29 02:11:17 2008
@@ -18,7 +18,6 @@
 	PROP_0,
 	PROP_SSID,
 	PROP_MODE,
-	PROP_ADHOC_CREATE,
 	PROP_BAND,
 	PROP_CHANNEL,
 	PROP_BSSID,
@@ -226,11 +225,6 @@
 		return FALSE;
 	}
 
-	if (self->mode && strcmp (self->mode, "adhoc") && self->adhoc_create) {
-		g_warning ("Key 'adhoc-create' only valid with Ad-Hoc mode.");
-		return FALSE;
-	}
-
 	if (self->band && !nm_utils_string_in_list (self->band, valid_bands)) {
 		g_warning ("Invalid band. Should be either 'a' or 'bg'");
 		return FALSE;
@@ -336,9 +330,6 @@
 		g_free (setting->mode);
 		setting->mode = g_value_dup_string (value);
 		break;
-	case PROP_ADHOC_CREATE:
-		setting->adhoc_create = g_value_get_boolean (value);
-		break;
 	case PROP_BAND:
 		g_free (setting->band);
 		setting->band = g_value_dup_string (value);
@@ -392,9 +383,6 @@
 	case PROP_MODE:
 		g_value_set_string (value, setting->mode);
 		break;
-	case PROP_ADHOC_CREATE:
-		g_value_set_boolean (value, setting->adhoc_create);
-		break;
 	case PROP_BAND:
 		g_value_set_string (value, setting->band);
 		break;
@@ -458,14 +446,6 @@
 						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
 
 	g_object_class_install_property
-		(object_class, PROP_ADHOC_CREATE,
-		 g_param_spec_boolean (NM_SETTING_WIRELESS_ADHOC_CREATE,
-						  "Ad-Hoc Create",
-						  "Ad-Hoc Create",
-						  FALSE,
-						  G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE));
-
-	g_object_class_install_property
 		(object_class, PROP_BAND,
 		 g_param_spec_string (NM_SETTING_WIRELESS_BAND,
 						  "Band",

Modified: trunk/libnm-util/nm-setting-wireless.h
==============================================================================
--- trunk/libnm-util/nm-setting-wireless.h	(original)
+++ trunk/libnm-util/nm-setting-wireless.h	Thu May 29 02:11:17 2008
@@ -17,25 +17,23 @@
 
 #define NM_SETTING_WIRELESS_SETTING_NAME "802-11-wireless"
 
-#define NM_SETTING_WIRELESS_SSID         "ssid"
-#define NM_SETTING_WIRELESS_MODE         "mode"
-#define NM_SETTING_WIRELESS_ADHOC_CREATE "adhoc-create"
-#define NM_SETTING_WIRELESS_BAND         "band"
-#define NM_SETTING_WIRELESS_CHANNEL      "channel"
-#define NM_SETTING_WIRELESS_BSSID        "bssid"
-#define NM_SETTING_WIRELESS_RATE         "rate"
-#define NM_SETTING_WIRELESS_TX_POWER     "tx-power"
-#define NM_SETTING_WIRELESS_MAC_ADDRESS  "mac-address"
-#define NM_SETTING_WIRELESS_MTU          "mtu"
-#define NM_SETTING_WIRELESS_SEEN_BSSIDS  "seen-bssids"
-#define NM_SETTING_WIRELESS_SEC          "security"
+#define NM_SETTING_WIRELESS_SSID        "ssid"
+#define NM_SETTING_WIRELESS_MODE        "mode"
+#define NM_SETTING_WIRELESS_BAND        "band"
+#define NM_SETTING_WIRELESS_CHANNEL     "channel"
+#define NM_SETTING_WIRELESS_BSSID       "bssid"
+#define NM_SETTING_WIRELESS_RATE        "rate"
+#define NM_SETTING_WIRELESS_TX_POWER    "tx-power"
+#define NM_SETTING_WIRELESS_MAC_ADDRESS "mac-address"
+#define NM_SETTING_WIRELESS_MTU         "mtu"
+#define NM_SETTING_WIRELESS_SEEN_BSSIDS "seen-bssids"
+#define NM_SETTING_WIRELESS_SEC         "security"
 
 typedef struct {
 	NMSetting parent;
 
 	GByteArray *ssid;
 	char *mode;
-	gboolean adhoc_create;
 	char *band;
 	guint32 channel;
 	GByteArray *bssid;