rpms/NetworkManager/F-8 nm-system-settings.conf, NONE, 1.1 .cvsignore, 1.76, 1.77 NetworkManager-0.6.5-fixup-internal-applet-build.patch, 1.10, 1.11 NetworkManager.spec, 1.201, 1.202 nm-applet-0.7.0-disable-stuff.patch, 1.3, 1.4 sources, 1.95, 1.96

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22706

Modified Files:
	.cvsignore 
	NetworkManager-0.6.5-fixup-internal-applet-build.patch 
	NetworkManager.spec nm-applet-0.7.0-disable-stuff.patch 
	sources 
Added Files:
	nm-system-settings.conf 
Log Message:
* Thu Feb  7 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3302
- Enable system settings service
- Enable connection editor for deleting connections
- Allow explicit disconnection of mobile broadband devices
- Add CDMA mobile broadband card support
- Fix applet memory leaks (rh #430178)
- Applet Connection Information dialog tweaks (gnome.org #505899)
- Filter input characters to passphrase/key entry (gnome.org #332951)
- Fix applet focus stealing prevention behavior




--- NEW FILE nm-system-settings.conf ---
[main]
plugins=ifcfg-fedora


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/.cvsignore,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- .cvsignore	11 Jan 2008 05:58:44 -0000	1.76
+++ .cvsignore	7 Feb 2008 23:04:59 -0000	1.77
@@ -67,3 +67,5 @@
 nm-applet-0.7.0.svn429.tar.gz
 NetworkManager-0.7.0.svn3235.tar.gz
 nm-applet-0.7.0.svn438.tar.gz
+NetworkManager-0.7.0.svn3302.tar.gz
+nm-applet-0.7.0.svn516.tar.gz

NetworkManager-0.6.5-fixup-internal-applet-build.patch:

Index: NetworkManager-0.6.5-fixup-internal-applet-build.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager-0.6.5-fixup-internal-applet-build.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- NetworkManager-0.6.5-fixup-internal-applet-build.patch	4 Jan 2008 18:51:09 -0000	1.10
+++ NetworkManager-0.6.5-fixup-internal-applet-build.patch	7 Feb 2008 23:04:59 -0000	1.11
@@ -23,7 +23,7 @@
 -		 NetworkManager >= 0.7.0
 -		 libnm_glib
 -		 libnm-util
- 		 gtk+-2.0 >= 2.6
+ 		 gtk+-2.0 >= 2.10
  		 libglade-2.0
  		 gconf-2.0
 diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am
@@ -160,8 +160,8 @@
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
 +
- nm_applet_CPPFLAGS =									\
- 	$(NMA_CFLAGS)										\
+ nm_applet_CPPFLAGS = \
+ 	$(NMA_CFLAGS) \
  	-DICONDIR=\""$(datadir)/icons"\"						\
 @@ -58,7 +62,9 @@ nm_applet_LDADD = \
  	$(NMA_LIBS) \


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- NetworkManager.spec	11 Jan 2008 05:58:45 -0000	1.201
+++ NetworkManager.spec	7 Feb 2008 23:04:59 -0000	1.202
@@ -8,8 +8,8 @@
 %define wireless_tools_version 1:28-0pre9
 %define libnl_version 1.0-0.15.pre8.git20071218
 
-%define snapshot svn3235
-%define applet_snapshot svn438
+%define snapshot svn3302
+%define applet_snapshot svn516
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
@@ -21,6 +21,7 @@
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}.%{snapshot}.tar.gz
 Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz
+Source2: nm-system-settings.conf
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: nm-applet-0.7.0-disable-stuff.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -161,6 +162,8 @@
 # install NM
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/
+
 # install the applet
 pushd nm-applet-0.7.0
   make install DESTDIR=$RPM_BUILD_ROOT
@@ -175,11 +178,7 @@
 
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.4.4/*.la
-
-# Remove system settings daemon for now
-%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/libnm-settings-plugin*
-%{__rm} -f $RPM_BUILD_ROOT%{_sbindir}/nm-system-settings
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/NetworkManager/*.la
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -220,22 +219,28 @@
 %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO
 %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf
 %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf
+%{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf
 %config %{_sysconfdir}/rc.d/init.d/NetworkManager
 %config %{_sysconfdir}/rc.d/init.d/NetworkManagerDispatcher
 %{_sbindir}/%{name}
 %{_sbindir}/NetworkManagerDispatcher
+%{_sbindir}/nm-system-settings
+%{_sysconfdir}/nm-system-settings.conf
 %dir %{_sysconfdir}/NetworkManager/
 %dir %{_sysconfdir}/NetworkManager/dispatcher.d
 %dir %{_sysconfdir}/NetworkManager/VPN
 %{_bindir}/nm-tool
 %{_libexecdir}/nm-dhcp-client.action
 %{_libdir}/libnm-util.so*
+%dir %{_libdir}/NetworkManager
+%{_libdir}/NetworkManager/*.so*
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 %dir %{_localstatedir}/run/NetworkManager
 %{_prefix}/libexec/nm-crash-logger
 %dir %{_datadir}/NetworkManager
 %{_datadir}/NetworkManager/gdb-cmd
+%{_datadir}/dbus-1/system-services/org.freedesktop.NetworkManagerSystemSettings.service
 %{_libdir}/pppd/2.4.4/nm-pppd-plugin.so
 
 %files gnome
@@ -271,6 +276,16 @@
 
 
 %changelog
+* Thu Feb  7 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3302
+- Enable system settings service
+- Enable connection editor for deleting connections
+- Allow explicit disconnection of mobile broadband devices
+- Add CDMA mobile broadband card support
+- Fix applet memory leaks (rh #430178)
+- Applet Connection Information dialog tweaks (gnome.org #505899)
+- Filter input characters to passphrase/key entry (gnome.org #332951)
+- Fix applet focus stealing prevention behavior
+
 * Fri Jan 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3235
 - Fix crash when activating a mobile broadband connection
 - Better handling of non-SSID-broadcasting APs on kernels that support it

nm-applet-0.7.0-disable-stuff.patch:

Index: nm-applet-0.7.0-disable-stuff.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/nm-applet-0.7.0-disable-stuff.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nm-applet-0.7.0-disable-stuff.patch	4 Dec 2007 19:56:06 -0000	1.3
+++ nm-applet-0.7.0-disable-stuff.patch	7 Feb 2008 23:04:59 -0000	1.4
@@ -1,43 +1,25 @@
-diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.disable-stuff NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c
---- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c.disable-stuff	2007-12-04 14:03:14.000000000 -0500
-+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet.c	2007-12-04 14:45:32.000000000 -0500
-@@ -315,6 +315,7 @@ nma_show_info_cb (GtkMenuItem *mi, NMApp
- 	gtk_window_present (GTK_WINDOW (dialog));
- }
+diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c.disable-stuff NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c
+--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c.disable-stuff	2008-02-05 17:28:50.000000000 -0500
++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c	2008-02-07 17:29:08.000000000 -0500
+@@ -254,7 +254,9 @@ list_selection_changed_cb (GtkTreeSelect
+ 	GtkTreeModel *model;
  
+ 	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 +#if 0
- static void
- nma_edit_connections_cb (GtkMenuItem *mi, NMApplet *applet)
- {
-@@ -325,6 +326,7 @@ nma_edit_connections_cb (GtkMenuItem *mi
- 
- 	g_object_unref (connection_list);
- }
+ 		gtk_widget_set_sensitive (GTK_WIDGET (list->edit_button), TRUE);
 +#endif
+ 		gtk_widget_set_sensitive (GTK_WIDGET (list->delete_button), TRUE);
+ 	} else {
+ 		gtk_widget_set_sensitive (GTK_WIDGET (list->edit_button), FALSE);
+@@ -331,9 +333,11 @@ nm_connection_list_init (NMConnectionLis
+ 	/* buttons */
+ 	list->add_button = glade_xml_get_widget (list->gui, "add_connection_button");
+ 	g_signal_connect (G_OBJECT (list->add_button), "clicked", G_CALLBACK (add_connection_cb), list);
++	gtk_widget_set_sensitive (list->add_button, FALSE);
  
- static void about_dialog_activate_link_cb (GtkAboutDialog *about,
-                                            const gchar *url,
-@@ -1442,6 +1444,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);
-@@ -2060,6 +2063,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,
-@@ -2067,6 +2071,7 @@ static GtkWidget *nma_context_menu_creat
- 				   G_CALLBACK (nma_edit_connections_cb),
- 				   applet);
- 	gtk_menu_shell_append (menu, applet->connections_menu_item);
-+#endif
+ 	list->edit_button = glade_xml_get_widget (list->gui, "edit_connection_button");
+ 	g_signal_connect (G_OBJECT (list->edit_button), "clicked", G_CALLBACK (edit_connection_cb), list);
++	gtk_widget_set_sensitive (list->edit_button, FALSE);
  
- 	/* Separator */
- 	nma_menu_add_separator_item (menu);
+ 	list->delete_button = glade_xml_get_widget (list->gui, "delete_connection_button");
+ 	g_signal_connect (G_OBJECT (list->delete_button), "clicked", G_CALLBACK (delete_connection_cb), list);


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- sources	11 Jan 2008 05:58:45 -0000	1.95
+++ sources	7 Feb 2008 23:04:59 -0000	1.96
@@ -1,2 +1,2 @@
-e91418fd1afc2df1344d9954b09ad43e  NetworkManager-0.7.0.svn3235.tar.gz
-e74967eb842fc6cab2bd692ce28a6749  nm-applet-0.7.0.svn438.tar.gz
+905dc63ebbcdfed27e0dc14335e4fd68  NetworkManager-0.7.0.svn3302.tar.gz
+84a7d15f0cd095bfc7a3905b3b53097d  nm-applet-0.7.0.svn516.tar.gz