network-manager-applet r704 - in trunk: . src/connection-editor

[dcbw svn gnome org]

Author: dcbw
Date: Mon Apr 28 05:25:05 2008
New Revision: 704
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=704&view=rev

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

	* src/connection-editor/page-wireless-security.c
		- (validate): unencrypted method doesn't have a security object so
			NULL here means valid

	* src/connection-editor/nm-connection-list.c
		- (create_new_connection_for_type): set default wireless mode

	* src/connection-editor/page-ip4.c
		- (cell_edited, ce_page_ip4_new): trigger validation when IP addresses
			change too



Modified:
   trunk/ChangeLog
   trunk/src/connection-editor/nm-connection-list.c
   trunk/src/connection-editor/page-ip4.c
   trunk/src/connection-editor/page-wireless-security.c

Modified: trunk/src/connection-editor/nm-connection-list.c
==============================================================================
--- trunk/src/connection-editor/nm-connection-list.c	(original)
+++ trunk/src/connection-editor/nm-connection-list.c	Mon Apr 28 05:25:05 2008
@@ -342,11 +342,15 @@
 
 		type_setting = nm_setting_wired_new ();
 	} else if (ctype == NM_TYPE_SETTING_WIRELESS) {
+		NMSettingWireless *s_wireless;
+
 		s_con->id = get_next_available_name (list, _("Wireless connection %d"));
 		s_con->type = g_strdup (NM_SETTING_WIRELESS_SETTING_NAME);
 		s_con->autoconnect = TRUE;
 
 		type_setting = nm_setting_wireless_new ();
+		s_wireless = NM_SETTING_WIRELESS (type_setting);
+		s_wireless->mode = g_strdup ("infrastructure");
 	} else if (ctype == NM_TYPE_SETTING_GSM) {
 		/* Since GSM is a placeholder for both GSM and CDMA; ask the user which
 		 * one they really want.

Modified: trunk/src/connection-editor/page-ip4.c
==============================================================================
--- trunk/src/connection-editor/page-ip4.c	(original)
+++ trunk/src/connection-editor/page-ip4.c	Mon Apr 28 05:25:05 2008
@@ -331,7 +331,9 @@
              const gchar *new_text,
              gpointer user_data)
 {
-	GtkListStore *store = GTK_LIST_STORE (user_data);
+	CEPageIP4 *self = CE_PAGE_IP4 (user_data);
+	CEPageIP4Private *priv = CE_PAGE_IP4_GET_PRIVATE (self);
+	GtkListStore *store = GTK_LIST_STORE (gtk_tree_view_get_model (priv->addr_list));
 	GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
 	GtkTreeIter iter;
 	guint32 column = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (cell), "column"));
@@ -339,6 +341,8 @@
 	gtk_tree_model_get_iter (GTK_TREE_MODEL (store), &iter, path);
 	gtk_list_store_set (store, &iter, column, new_text, -1);
 	gtk_tree_path_free (path);
+
+	ce_page_changed (CE_PAGE (self));
 }
 
 static void
@@ -438,7 +442,7 @@
 	/* IP Address column */
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "editable", TRUE, NULL);
-	g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited), store);
+	g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited), self);
 	g_object_set_data (G_OBJECT (renderer), "column", GUINT_TO_POINTER (COL_ADDRESS));
 	g_signal_connect (renderer, "editing-started", G_CALLBACK (cell_editing_started), store);
 
@@ -453,7 +457,7 @@
 	/* Netmask column */
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "editable", TRUE, NULL);
-	g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited), store);
+	g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited), self);
 	g_object_set_data (G_OBJECT (renderer), "column", GUINT_TO_POINTER (COL_NETMASK));
 	g_signal_connect (renderer, "editing-started", G_CALLBACK (cell_editing_started), store);
 
@@ -468,7 +472,7 @@
 	/* Gateway column */
 	renderer = gtk_cell_renderer_text_new ();
 	g_object_set (renderer, "editable", TRUE, NULL);
-	g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited), store);
+	g_signal_connect (renderer, "edited", G_CALLBACK (cell_edited), self);
 	g_object_set_data (G_OBJECT (renderer), "column", GUINT_TO_POINTER (COL_GATEWAY));
 	g_signal_connect (renderer, "editing-started", G_CALLBACK (cell_editing_started), store);
 

Modified: trunk/src/connection-editor/page-wireless-security.c
==============================================================================
--- trunk/src/connection-editor/page-wireless-security.c	(original)
+++ trunk/src/connection-editor/page-wireless-security.c	Mon Apr 28 05:25:05 2008
@@ -386,7 +386,7 @@
 
 	sec = wireless_security_combo_get_active (self);
 	if (!sec)
-		return FALSE;
+		return TRUE; /* Unencrypted/open method doesn't have a WirelessSecurity */
 
 	ssid = ce_page_wireless_get_ssid (self->wireless_page);
 	if (ssid) {