colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-06-16 Dan Williams <dcbw@redhat.com>

Browse Source 
* 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
This commit is contained in:
Dan Williams
2005-06-17 00:36:08 +00:00
parent ad5b6b3838
commit 058a15490e
7 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2005-06-16 Dan Williams <dcbw@redhat.com>
* Clean up wording in Wireless Scan Methods menu items and constants
2005-06-16 Robert Love <rml@novell.com> 2005-06-16 Robert Love <rml@novell.com>
* po/POTFILES.in * po/POTFILES.in

6
NetworkManager.h
View File

@@ -216,9 +216,9 @@ typedef enum NMActStage
typedef enum NMWirelessScanMethod typedef enum NMWirelessScanMethod
{ {
NM_SCAN_METHOD_UNKNOWN = 0, NM_SCAN_METHOD_UNKNOWN = 0,
NM_SCAN_METHOD_ON, NM_SCAN_METHOD_ALWAYS,
NM_SCAN_METHOD_OFF, NM_SCAN_METHOD_WHEN_UNASSOCIATED,
NM_SCAN_METHOD_AUTO NM_SCAN_METHOD_NEVER
} NMWirelessScanMethod; } NMWirelessScanMethod;
#endif #endif

2
gnome/applet/applet-dbus-info.c
View File

@@ -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) static DBusMessage *nmi_dbus_get_wireless_scan_method (NMWirelessApplet *applet, DBusMessage *message)
{ {
DBusMessage * reply = NULL; DBusMessage * reply = NULL;
NMWirelessScanMethod method = NM_SCAN_METHOD_ON; NMWirelessScanMethod method = NM_SCAN_METHOD_ALWAYS;
GConfEntry * entry; GConfEntry * entry;
g_return_val_if_fail (applet != NULL, NULL); g_return_val_if_fail (applet != NULL, NULL);

35
gnome/applet/applet.c
View File

@@ -1217,7 +1217,8 @@ static void nmwa_menu_scanning_item_activate (GtkMenuItem *item, gpointer user_d
{ {
NMWirelessScanMethod method = GPOINTER_TO_UINT (tag); 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); 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 */ /* Construct the wireless scanning submenu */
applet->scan_method = nmwa_gconf_get_wireless_scan_method (applet); 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 (); applet->scanning_menu = gtk_menu_new ();
scanning_subitem = GTK_WIDGET (gtk_check_menu_item_new_with_label (_("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_ON)); g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GUINT_TO_POINTER (NM_SCAN_METHOD_ALWAYS));
if (applet->scan_method == NM_SCAN_METHOD_ON) if (applet->scan_method == NM_SCAN_METHOD_ALWAYS)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scanning_subitem), TRUE); 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); 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)); 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"))); 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_OFF)); 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_OFF) if (applet->scan_method == NM_SCAN_METHOD_WHEN_UNASSOCIATED)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scanning_subitem), TRUE); 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); 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)); 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"))); 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_AUTO)); g_object_set_data (G_OBJECT (scanning_subitem), "scan_method", GINT_TO_POINTER (NM_SCAN_METHOD_NEVER));
if (applet->scan_method == NM_SCAN_METHOD_AUTO) if (applet->scan_method == NM_SCAN_METHOD_NEVER)
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (scanning_subitem), TRUE); 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); 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)); 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 nmwa_gconf_get_wireless_scan_method (NMWirelessApplet *applet)
{ {
NMWirelessScanMethod method = NM_SCAN_METHOD_ON; NMWirelessScanMethod method = NM_SCAN_METHOD_ALWAYS;
GConfEntry * entry; GConfEntry * entry;
g_return_val_if_fail (applet, 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_ON); 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))) 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); 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; 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); 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); nmi_dbus_signal_update_scan_method (applet->connection);
} }
} }

2
src/NetworkManager.c
View File

@@ -437,7 +437,7 @@ static NMData *nm_data_new (gboolean enable_test_devices)
data->enable_test_devices = 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; data->wireless_enabled = TRUE;
nm_policy_schedule_device_change_check (data); nm_policy_schedule_device_change_check (data);

3
src/NetworkManagerDbus.c
View File

@@ -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 (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; data->scanning_method = method;
} }
dbus_message_unref (reply); dbus_message_unref (reply);

4
src/NetworkManagerDevice.c
View File

@@ -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 /* Reschedule if scanning is off, or if scanning is AUTO and we are
* associated to an access point. * associated to an access point.
*/ */
if ( (dev->app_data->scanning_method == NM_SCAN_METHOD_OFF) if ( (dev->app_data->scanning_method == NM_SCAN_METHOD_NEVER)
|| ( (dev->app_data->scanning_method == NM_SCAN_METHOD_AUTO) || ( (dev->app_data->scanning_method == NM_SCAN_METHOD_WHEN_UNASSOCIATED)
&& nm_device_is_activated (dev))) && nm_device_is_activated (dev)))
{ {
dev->options.wireless.scan_interval = 10; dev->options.wireless.scan_interval = 10;