From 058a15490ed62652dd03e7307e3d5db7bf05dea5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 17 Jun 2005 00:36:08 +0000 Subject: [PATCH] 2005-06-16 Dan Williams * Clean up wording in Wireless Scan Methods menu items and constants git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@693 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 4 ++++ NetworkManager.h | 6 +++--- gnome/applet/applet-dbus-info.c | 2 +- gnome/applet/applet.c | 35 ++++++++++++++++++--------------- src/NetworkManager.c | 2 +- src/NetworkManagerDbus.c | 3 ++- src/NetworkManagerDevice.c | 4 ++-- 7 files changed, 32 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index ae7a5800cc..5546415e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-06-16 Dan Williams + + * Clean up wording in Wireless Scan Methods menu items and constants + 2005-06-16 Robert Love * po/POTFILES.in diff --git a/NetworkManager.h b/NetworkManager.h index 907a6f3516..c68b8c4f10 100644 --- a/NetworkManager.h +++ b/NetworkManager.h @@ -216,9 +216,9 @@ typedef enum NMActStage typedef enum NMWirelessScanMethod { NM_SCAN_METHOD_UNKNOWN = 0, - NM_SCAN_METHOD_ON, - NM_SCAN_METHOD_OFF, - NM_SCAN_METHOD_AUTO + NM_SCAN_METHOD_ALWAYS, + NM_SCAN_METHOD_WHEN_UNASSOCIATED, + NM_SCAN_METHOD_NEVER } NMWirelessScanMethod; #endif diff --git a/gnome/applet/applet-dbus-info.c b/gnome/applet/applet-dbus-info.c index aed1c881c9..1025930d55 100644 --- a/gnome/applet/applet-dbus-info.c +++ b/gnome/applet/applet-dbus-info.c @@ -149,7 +149,7 @@ void nmi_dbus_signal_update_scan_method (DBusConnection *connection) static DBusMessage *nmi_dbus_get_wireless_scan_method (NMWirelessApplet *applet, DBusMessage *message) { DBusMessage * reply = NULL; - NMWirelessScanMethod method = NM_SCAN_METHOD_ON; + NMWirelessScanMethod method = NM_SCAN_METHOD_ALWAYS; GConfEntry * entry; g_return_val_if_fail (applet != NULL, NULL); diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index 3e8fd73c84..b1c3a5126a 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -1217,7 +1217,8 @@ static void nmwa_menu_scanning_item_activate (GtkMenuItem *item, gpointer user_d { NMWirelessScanMethod method = GPOINTER_TO_UINT (tag); - if ((method == NM_SCAN_METHOD_ON) || (method == NM_SCAN_METHOD_OFF) || (method == NM_SCAN_METHOD_AUTO)) + if ((method == NM_SCAN_METHOD_ALWAYS) || (method == NM_SCAN_METHOD_NEVER) + || (method == NM_SCAN_METHOD_WHEN_UNASSOCIATED)) gconf_client_set_int (applet->gconf_client, GCONF_PATH_WIRELESS "/scan_method", method, NULL); } @@ -1801,26 +1802,26 @@ static GtkWidget *nmwa_context_menu_create (NMWirelessApplet *applet) /* Construct the wireless scanning submenu */ applet->scan_method = nmwa_gconf_get_wireless_scan_method (applet); - applet->scanning_item = gtk_menu_item_new_with_label (_("Wireless Scanning")); + applet->scanning_item = gtk_menu_item_new_with_label (_("Wireless Network Discovery")); applet->scanning_menu = gtk_menu_new (); - scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("On"))); - g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GUINT_TO_POINTER (NM_SCAN_METHOD_ON)); - if (applet->scan_method == NM_SCAN_METHOD_ON) + scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("Always Search"))); + g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GUINT_TO_POINTER (NM_SCAN_METHOD_ALWAYS)); + if (applet->scan_method == NM_SCAN_METHOD_ALWAYS) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scanning_subitem), TRUE); g_signal_connect (G_OBJECT (scanning_subitem), "activate", G_CALLBACK (nmwa_menu_scanning_item_activate), applet); gtk_menu_shell_append (GTK_MENU_SHELL (applet->scanning_menu), GTK_WIDGET (scanning_subitem)); - scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("Off"))); - g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GINT_TO_POINTER (NM_SCAN_METHOD_OFF)); - if (applet->scan_method == NM_SCAN_METHOD_OFF) + scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("Search Only When Disconnected"))); + g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GINT_TO_POINTER (NM_SCAN_METHOD_WHEN_UNASSOCIATED)); + if (applet->scan_method == NM_SCAN_METHOD_WHEN_UNASSOCIATED) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scanning_subitem), TRUE); g_signal_connect (G_OBJECT (scanning_subitem), "activate", G_CALLBACK (nmwa_menu_scanning_item_activate), applet); gtk_menu_shell_append (GTK_MENU_SHELL (applet->scanning_menu), GTK_WIDGET (scanning_subitem)); - scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("Automatic"))); - g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GINT_TO_POINTER (NM_SCAN_METHOD_AUTO)); - if (applet->scan_method == NM_SCAN_METHOD_AUTO) + scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("Never Search"))); + g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GINT_TO_POINTER (NM_SCAN_METHOD_NEVER)); + if (applet->scan_method == NM_SCAN_METHOD_NEVER) gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scanning_subitem), TRUE); g_signal_connect (G_OBJECT (scanning_subitem), "activate", G_CALLBACK (nmwa_menu_scanning_item_activate), applet); gtk_menu_shell_append (GTK_MENU_SHELL (applet->scanning_menu), GTK_WIDGET (scanning_subitem)); @@ -1955,11 +1956,11 @@ static void nmwa_setup_widgets (NMWirelessApplet *applet) */ NMWirelessScanMethod nmwa_gconf_get_wireless_scan_method (NMWirelessApplet *applet) { - NMWirelessScanMethod method = NM_SCAN_METHOD_ON; + NMWirelessScanMethod method = NM_SCAN_METHOD_ALWAYS; GConfEntry * entry; - g_return_val_if_fail (applet, NM_SCAN_METHOD_ON); - g_return_val_if_fail (applet->gconf_client, NM_SCAN_METHOD_ON); + g_return_val_if_fail (applet, NM_SCAN_METHOD_ALWAYS); + g_return_val_if_fail (applet->gconf_client, NM_SCAN_METHOD_ALWAYS); if ((entry = gconf_client_get_entry (applet->gconf_client, GCONF_PATH_WIRELESS "/scan_method", NULL, TRUE, NULL))) { @@ -1969,7 +1970,8 @@ NMWirelessScanMethod nmwa_gconf_get_wireless_scan_method (NMWirelessApplet *appl { NMWirelessScanMethod temp_method = gconf_value_get_int (value); - if ((method == NM_SCAN_METHOD_ON) || (method == NM_SCAN_METHOD_OFF) || (method == NM_SCAN_METHOD_AUTO)) + if ((method == NM_SCAN_METHOD_ALWAYS) || (method == NM_SCAN_METHOD_NEVER) + || (method == NM_SCAN_METHOD_WHEN_UNASSOCIATED)) method = temp_method; } } @@ -2005,7 +2007,8 @@ static void nmwa_gconf_info_notify_callback (GConfClient *client, guint connecti { NMWirelessScanMethod method = gconf_value_get_int (value); - if ((method == NM_SCAN_METHOD_ON) || (method == NM_SCAN_METHOD_OFF) || (method == NM_SCAN_METHOD_AUTO)) + if ((method == NM_SCAN_METHOD_ALWAYS) || (method == NM_SCAN_METHOD_NEVER) + || (method == NM_SCAN_METHOD_WHEN_UNASSOCIATED)) nmi_dbus_signal_update_scan_method (applet->connection); } } diff --git a/src/NetworkManager.c b/src/NetworkManager.c index d366b3f3d9..bd2b21ae30 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.c @@ -437,7 +437,7 @@ static NMData *nm_data_new (gboolean enable_test_devices) data->enable_test_devices = enable_test_devices; - data->scanning_method = NM_SCAN_METHOD_ON; + data->scanning_method = NM_SCAN_METHOD_ALWAYS; data->wireless_enabled = TRUE; nm_policy_schedule_device_change_check (data); diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c index 5be05e380c..809e091a3b 100644 --- a/src/NetworkManagerDbus.c +++ b/src/NetworkManagerDbus.c @@ -585,7 +585,8 @@ static void nm_dbus_update_wireless_scan_method_cb (DBusPendingCall *pcall, NMDa if (dbus_message_get_args (reply, NULL, DBUS_TYPE_UINT32, &method, DBUS_TYPE_INVALID)) { - if ((method == NM_SCAN_METHOD_ON) || (method == NM_SCAN_METHOD_OFF) || (method == NM_SCAN_METHOD_AUTO)) + if ((method == NM_SCAN_METHOD_ALWAYS) || (method == NM_SCAN_METHOD_NEVER) + || (method == NM_SCAN_METHOD_WHEN_UNASSOCIATED)) data->scanning_method = method; } dbus_message_unref (reply); diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index 7c78fa3a22..45d35ed972 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -3944,8 +3944,8 @@ static gboolean nm_device_wireless_scan (gpointer user_data) /* Reschedule if scanning is off, or if scanning is AUTO and we are * associated to an access point. */ - if ( (dev->app_data->scanning_method == NM_SCAN_METHOD_OFF) - || ( (dev->app_data->scanning_method == NM_SCAN_METHOD_AUTO) + if ( (dev->app_data->scanning_method == NM_SCAN_METHOD_NEVER) + || ( (dev->app_data->scanning_method == NM_SCAN_METHOD_WHEN_UNASSOCIATED) && nm_device_is_activated (dev))) { dev->options.wireless.scan_interval = 10;