- Don't create multiple connections for hidden access points

- Fix scanning behavior
This commit is contained in:
Daniel Williams 2008-02-29 19:46:34 +00:00
parent d02fe96e33
commit 086b92d340
3 changed files with 18 additions and 27 deletions

View File

@ -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 svn3319
%define applet_snapshot svn526
%define snapshot svn3369
%define applet_snapshot svn568
Name: NetworkManager
Summary: Network connection manager and user applications
@ -278,6 +278,10 @@ fi
%changelog
* Fri Feb 29 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3369
- Don't create multiple connections for hidden access points
- Fix scanning behavior
* Thu Feb 14 2008 Dan Williams <dcbw@redhat.com> - 1:0.7.0-0.8.svn3319
- Rework connection editor connection list

View File

@ -1,20 +1,11 @@
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-14 12:23:13.000000000 -0500
+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connection-list.c 2008-02-14 14:47:23.000000000 -0500
@@ -218,6 +218,8 @@ list_selection_changed_cb (GtkTreeSelect
GtkTreeIter iter;
GtkTreeModel *model;
+return;
+
if (gtk_tree_selection_get_selected (selection, &model, &iter))
gtk_widget_set_sensitive (GTK_WIDGET (button), TRUE);
else
@@ -413,9 +415,11 @@ new_connection_list (NMConnectionList *l
--- 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 (0) {
+if (FALSE) {
g_signal_connect (G_OBJECT (clist),
"row-activated", G_CALLBACK (connection_double_clicked_cb),
NULL);
@ -22,7 +13,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connectio
gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (clist),
-1, "Name", gtk_cell_renderer_text_new (),
@@ -440,6 +444,7 @@ new_connection_list (NMConnectionList *l
@@ -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);
@ -30,19 +21,15 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/nm-connectio
name = g_strdup_printf ("%s_edit", prefix);
button = glade_xml_get_widget (list->gui, name);
@@ -449,6 +454,7 @@ 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 (edit_connection_cb), clist);
+#if 0
g_signal_connect (G_OBJECT (select),
"changed", G_CALLBACK (list_selection_changed_cb),
button);
+#endif
g_free (name);
+ gtk_widget_set_sensitive (button, FALSE);
name = g_strdup_printf ("%s_delete", prefix);
button = glade_xml_get_widget (list->gui, name);
@@ -458,6 +464,7 @@ new_connection_list (NMConnectionList *l
"changed", G_CALLBACK (list_selection_changed_cb),
button);
g_free (name);
+ gtk_widget_set_sensitive (button, FALSE);
return clist;
}

View File

@ -1,2 +1,2 @@
6799e4be42bddf3ba88689e3e86e2f4f NetworkManager-0.7.0.svn3319.tar.gz
f52c6b62c62e45b3147cb778e2fe127c nm-applet-0.7.0.svn526.tar.gz
c86457760846972edda0b0b6c7df4533 NetworkManager-0.7.0.svn3369.tar.gz
650c9fb2ee5c95cffb9d0429bfd91291 nm-applet-0.7.0.svn568.tar.gz