From 56d748d1d9e12d89e2809e5e20147ac02b95f28a Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Apr 03 2008 01:10:47 +0000
Subject: - Honor MAC address locking for wired & wireless devices


---

diff --git a/.cvsignore b/.cvsignore
index e8c7b71..58fd4d2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -86,3 +86,5 @@ NetworkManager-0.7.0.svn3476.tar.gz
 nm-applet-0.7.0.svn606.tar.gz
 NetworkManager-0.7.0.svn3521.tar.gz
 nm-applet-0.7.0.svn636.tar.gz
+NetworkManager-0.7.0.svn3527.tar.gz
+nm-applet-0.7.0.svn645.tar.gz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 2c2e1ea..92e754f 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -9,8 +9,8 @@ ExcludeArch: s390 s390x
 %define libnl_version 1.0-0.15.pre8.git20071218
 %define ppp_version 2.2.4
 
-%define snapshot svn3521
-%define applet_snapshot svn636
+%define snapshot svn3527
+%define applet_snapshot svn645
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -279,6 +279,9 @@ fi
 
 
 %changelog
+* Wed Apr  2 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3527
+- Honor MAC address locking for wired & wireless devices
+
 * Mon Mar 31 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.9.1.svn3521
 - Show VPN failures
 - Support Static WEP key indexes
diff --git a/nm-applet-0.7.0-disable-stuff.patch b/nm-applet-0.7.0-disable-stuff.patch
index e36c341..6d571d1 100644
--- a/nm-applet-0.7.0-disable-stuff.patch
+++ b/nm-applet-0.7.0-disable-stuff.patch
@@ -8,26 +8,26 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connectio
 +if (FALSE) {
  	g_signal_connect (G_OBJECT (clist),
  	                  "row-activated", G_CALLBACK (connection_double_clicked_cb),
- 	                  NULL);
+ 	                  list);
 +}
  
  	gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (clist),
  	                                             -1, "Name", gtk_cell_renderer_text_new (),
 @@ -444,15 +446,19 @@ new_connection_list (NMConnectionList *l
- 	g_object_set_data (G_OBJECT (button), "nm-connection-list", list);
+ 	g_object_set_data (G_OBJECT (button), CONNECTION_LIST_TAG, list);
  	g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (add_connection_cb), clist);
  	g_free (name);
 +	gtk_widget_set_sensitive (button, FALSE);
  
  	name = g_strdup_printf ("%s_edit", prefix);
  	button = glade_xml_get_widget (list->gui, name);
- 	g_object_set_data (G_OBJECT (button), "nm-connection-list", list);
+ 	g_object_set_data (G_OBJECT (button), CONNECTION_LIST_TAG, list);
  	g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (edit_connection_cb), clist);
-+#if 0
++if (FALSE) {
  	g_signal_connect (G_OBJECT (select),
  	                  "changed", G_CALLBACK (list_selection_changed_cb),
  	                  button);
-+#endif
++}
  	g_free (name);
 +	gtk_widget_set_sensitive (button, FALSE);
  
diff --git a/sources b/sources
index 1886b14..7e174fd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3585104d8f4afc09a3b031c279598a9b  NetworkManager-0.7.0.svn3521.tar.gz
-b737ae84f0522f0fb989ef3ef9dfd02f  nm-applet-0.7.0.svn636.tar.gz
+2c076621548e735a68285e7de7b4bfca  NetworkManager-0.7.0.svn3527.tar.gz
+887070e1cca22b4c1f2ad8fd3c198714  nm-applet-0.7.0.svn645.tar.gz