diff --git a/.cvsignore b/.cvsignore index 62eb60d..ac5307b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -69,3 +69,5 @@ 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.7.0.svn3369.tar.gz +nm-applet-0.7.0.svn568.tar.gz diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/NetworkManager-0.6.5-fixup-internal-applet-build.patch index 39967ec..8109744 100644 --- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch +++ b/NetworkManager-0.6.5-fixup-internal-applet-build.patch @@ -174,15 +174,4 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am. if WITH_NOTIFY nm_applet_LDADD += $(NOTIFY_LIBS) -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/applet-dialogs.c.fix NetworkManager-0.7.0/nm-applet-0.7.0/src/applet-dialogs.c ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/applet-dialogs.c.fix 2008-02-07 18:23:50.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/applet-dialogs.c 2008-02-07 18:23:56.000000000 -0500 -@@ -259,7 +259,7 @@ applet_info_dialog_show (NMApplet *apple - { - GtkWidget *dialog; - NMDevice *device; -- NMConnection *connection; -+ NMConnection *connection = NULL; - - device = applet_get_first_active_device (applet); - if (device) + diff --git a/NetworkManager.spec b/NetworkManager.spec index 4b9be02..f5ba76b 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -8,8 +8,8 @@ ExcludeArch: s390 s390x %define wireless_tools_version 1:28-0pre9 %define libnl_version 1.0-0.15.pre8.git20071218 -%define snapshot svn3302 -%define applet_snapshot svn516 +%define snapshot svn3369 +%define applet_snapshot svn568 Name: NetworkManager Summary: Network connection manager and user applications @@ -276,6 +276,13 @@ fi %changelog +* Fri Feb 29 2008 Dan Williams - 1:0.7.0-0.6.7.svn3369 +- Don't create multiple connections for hidden access points +- Fix scanning behavior +- Rework connection editor connection list +- Better handling of changes in the profile directory by the system settings + serivce + * Thu Feb 7 2008 Dan Williams - 1:0.7.0-0.6.7.svn3302 - Enable system settings service - Enable connection editor for deleting connections diff --git a/nm-applet-0.7.0-disable-stuff.patch b/nm-applet-0.7.0-disable-stuff.patch index ad019e3..e36c341 100644 --- a/nm-applet-0.7.0-disable-stuff.patch +++ b/nm-applet-0.7.0-disable-stuff.patch @@ -1,25 +1,35 @@ 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; +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c.disable-stuff 2008-02-27 11:02:34.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c 2008-02-29 14:13:13.000000000 -0500 +@@ -417,9 +417,11 @@ new_connection_list (NMConnectionList *l + COL_TIMESTAMP, GTK_SORT_DESCENDING); + gtk_tree_view_set_model (GTK_TREE_VIEW (clist), GTK_TREE_MODEL (sort_model)); - if (gtk_tree_selection_get_selected (selection, &model, &iter)) { ++if (FALSE) { + g_signal_connect (G_OBJECT (clist), + "row-activated", G_CALLBACK (connection_double_clicked_cb), + NULL); ++} + + 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_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_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (edit_connection_cb), clist); +#if 0 - gtk_widget_set_sensitive (GTK_WIDGET (list->edit_button), TRUE); + g_signal_connect (G_OBJECT (select), + "changed", G_CALLBACK (list_selection_changed_cb), + button); +#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); - - 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); + g_free (name); ++ gtk_widget_set_sensitive (button, FALSE); - 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); + name = g_strdup_printf ("%s_delete", prefix); + button = glade_xml_get_widget (list->gui, name); diff --git a/sources b/sources index 2355ac3..c678b46 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -905dc63ebbcdfed27e0dc14335e4fd68 NetworkManager-0.7.0.svn3302.tar.gz -84a7d15f0cd095bfc7a3905b3b53097d nm-applet-0.7.0.svn516.tar.gz +c86457760846972edda0b0b6c7df4533 NetworkManager-0.7.0.svn3369.tar.gz +650c9fb2ee5c95cffb9d0429bfd91291 nm-applet-0.7.0.svn568.tar.gz