- New snapshot

- Make wired device carrier state work in the applet
- Fix handling of errors with unencrypted APs
- Fix "frozen" applet icon by reporting NM state better
- Fix output of AP frequency in nm-tool

.cvsignore

@@ -11,3 +11,6 @@ NetworkManager-0.7.0.svn2852.tar.gz
 nm-applet-0.7.0.svn191.tar.gz
 NetworkManager-0.7.0.svn2880.tar.gz
 nm-applet-0.7.0.svn199.tar.gz
+NetworkManager-0.7.0.svn2884.tar.gz
+nm-applet-0.7.0.svn200.tar.gz
+NetworkManager-0.7.0.svn2886.tar.gz

NetworkManager.spec

@@ -7,7 +7,7 @@ ExcludeArch: s390 s390x
 %define gtk2_version	2.10.0
 %define wireless_tools_version 1:28-0pre9
 
-%define snapshot svn2880
+%define snapshot svn2886
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -18,9 +18,9 @@ Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
-Source1: nm-applet-%{version}.svn199.tar.gz
+Source1: nm-applet-%{version}.svn200.tar.gz
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
-Patch2: nm-applet-0.7.0-no-connection-editor.patch
+Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -123,7 +123,7 @@ NetworkManager functionality from applications that use glib.
 # unpack the applet
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
-%patch2 -p1 -b .no-connection-editor
+%patch2 -p1 -b .disable-stuff
 
 %build
 # Even though we don't require named, we still build with it
@@ -259,6 +259,13 @@ fi
 
 
 %changelog
+* Tue Sep 25 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2886
+- New snapshot
+	- Make wired device carrier state work in the applet
+	- Fix handling of errors with unencrypted APs
+	- Fix "frozen" applet icon by reporting NM state better
+	- Fix output of AP frequency in nm-tool
+
 * Tue Sep 25 2007 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.3.svn2880
 - New snapshot
 	- Fix applet icon sizing on start (mclasen)

nm-applet-0.7.0-disable-stuff.patch

@@ -0,0 +1,35 @@
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-connection-editor	2007-09-25 13:01:18.000000000 -0400
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c	2007-09-25 14:43:31.000000000 -0400
+@@ -1146,6 +1146,7 @@ static void nma_menu_add_custom_essid_it
+ 	label = gtk_label_new_with_mnemonic (_("_Connect to Other Wireless Network..."));
+ 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ 	gtk_container_add (GTK_CONTAINER (menu_item), label);
++	gtk_widget_set_sensitive (menu_item, FALSE);
+ 	gtk_widget_show_all (menu_item);
+ 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+ 	g_signal_connect (menu_item, "activate", G_CALLBACK (custom_essid_item_selected), applet);
+@@ -1167,6 +1168,7 @@ nma_menu_add_create_network_item (GtkWid
+ 	label = gtk_label_new_with_mnemonic (_("Create _New Wireless Network..."));
+ 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ 	gtk_container_add (GTK_CONTAINER (menu_item), label);
++	gtk_widget_set_sensitive (menu_item, FALSE);
+ 	gtk_widget_show_all (menu_item);
+ 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+ 	g_signal_connect (menu_item, "activate", G_CALLBACK (new_network_item_selected), applet);
+@@ -1781,6 +1783,7 @@ static GtkWidget *nma_context_menu_creat
+ 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->info_menu_item), image);
+ 	gtk_menu_shell_append (menu, applet->info_menu_item);
+ 
++#if 0
+ 	/* 'Edit Connections...' item */
+ 	applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections..."));
+ 	g_signal_connect (applet->connections_menu_item,
+@@ -1788,6 +1791,7 @@ static GtkWidget *nma_context_menu_creat
+ 				   G_CALLBACK (nma_edit_connections_cb),
+ 				   applet);
+ 	gtk_menu_shell_append (menu, applet->connections_menu_item);
++#endif
+ 
+ 	/* Separator */
+ 	nma_menu_add_separator_item (menu);

nm-applet-0.7.0-no-connection-editor.patch

@@ -1,19 +0,0 @@
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-con-editor NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.no-con-editor	2007-09-25 05:18:05.000000000 -0400
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c	2007-09-25 05:18:41.000000000 -0400
-@@ -1781,6 +1781,7 @@ static GtkWidget *nma_context_menu_creat
- 	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->info_menu_item), image);
- 	gtk_menu_shell_append (menu, applet->info_menu_item);
- 
-+#if 0
- 	/* 'Edit Connections...' item */
- 	applet->connections_menu_item = gtk_menu_item_new_with_mnemonic (_("Edit Connections..."));
- 	g_signal_connect (applet->connections_menu_item,
-@@ -1788,6 +1789,7 @@ static GtkWidget *nma_context_menu_creat
- 				   G_CALLBACK (nma_edit_connections_cb),
- 				   applet);
- 	gtk_menu_shell_append (menu, applet->connections_menu_item);
-+#endif
- 
- 	/* Separator */
- 	nma_menu_add_separator_item (menu);

sources

@@ -1,2 +1,2 @@
-25115a3500c97b6ee308852d350760ef  NetworkManager-0.7.0.svn2880.tar.gz
+8edfd5854389ea6a6b4eb1f507b46c38  nm-applet-0.7.0.svn200.tar.gz
-ec90ed799aa6c9c1c5378f8ab31c6f5c  nm-applet-0.7.0.svn199.tar.gz
+fe78cab7288beef5e69dcf897a76d16b  NetworkManager-0.7.0.svn2886.tar.gz