Commit 3a18b5a9 authored by Dan Winship's avatar Dan Winship
Browse files

applet: rename "wired" and "wireless" in files/classes/functions

Update internal names to match the UI (except for the "wireless
security" stuff, which is already a misnomer since it's used for both
Wi-Fi and 802.1x, and can be revisited later.)
parent 89bf7c0a
......@@ -2,7 +2,7 @@
<interface>
<!-- interface-requires gtk+ 2.6 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="wired_8021x_dialog">
<object class="GtkDialog" id="8021x_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">802.1X authentication</property>
<property name="resizable">False</property>
......
......@@ -35,12 +35,12 @@ nm_applet_SOURCES = \
applet-agent.h \
applet-vpn-request.c \
applet-vpn-request.h \
wired-dialog.h \
wired-dialog.c \
ethernet-dialog.h \
ethernet-dialog.c \
applet-dialogs.h \
applet-dialogs.c \
applet-device-wired.h \
applet-device-wired.c \
applet-device-ethernet.h \
applet-device-ethernet.c \
applet-device-wifi.h \
applet-device-wifi.c \
ap-menu-item.h \
......@@ -94,7 +94,7 @@ nm_applet_migration_tool_LDADD = \
uidir = $(datadir)/nm-applet
ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png
ui_DATA = gsm-unlock.ui info.ui 8021x.ui keyring.png
CLEANFILES = *.bak $(BUILT_SOURCES)
......
......@@ -164,15 +164,15 @@ nm_network_menu_item_best_strength (NMNetworkMenuItem * item,
item->int_strength = strength;
if (strength > 80)
icon = nma_icon_check_and_load ("nm-signal-100", &applet->wireless_100_icon, applet);
icon = nma_icon_check_and_load ("nm-signal-100", &applet->wifi_100_icon, applet);
else if (strength > 55)
icon = nma_icon_check_and_load ("nm-signal-75", &applet->wireless_75_icon, applet);
icon = nma_icon_check_and_load ("nm-signal-75", &applet->wifi_75_icon, applet);
else if (strength > 30)
icon = nma_icon_check_and_load ("nm-signal-50", &applet->wireless_50_icon, applet);
icon = nma_icon_check_and_load ("nm-signal-50", &applet->wifi_50_icon, applet);
else if (strength > 5)
icon = nma_icon_check_and_load ("nm-signal-25", &applet->wireless_25_icon, applet);
icon = nma_icon_check_and_load ("nm-signal-25", &applet->wifi_25_icon, applet);
else
icon = nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet);
icon = nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon, applet);
pixbuf = gdk_pixbuf_copy (icon);
......
......@@ -39,7 +39,6 @@
#include "applet.h"
#include "applet-device-bt.h"
#include "wired-dialog.h"
#include "utils.h"
#include "applet-dialogs.h"
......
......@@ -37,35 +37,35 @@
#include <nm-utils.h>
#include "applet.h"
#include "applet-device-wired.h"
#include "wired-dialog.h"
#include "applet-device-ethernet.h"
#include "ethernet-dialog.h"
#include "utils.h"
typedef struct {
NMApplet *applet;
NMDevice *device;
NMConnection *connection;
} WiredMenuItemInfo;
} EthernetMenuItemInfo;
static void
wired_menu_item_info_destroy (gpointer data)
ethernet_menu_item_info_destroy (gpointer data)
{
WiredMenuItemInfo *info = (WiredMenuItemInfo *) data;
EthernetMenuItemInfo *info = (EthernetMenuItemInfo *) data;
g_object_unref (G_OBJECT (info->device));
if (info->connection)
g_object_unref (G_OBJECT (info->connection));
g_slice_free (WiredMenuItemInfo, data);
g_slice_free (EthernetMenuItemInfo, data);
}
#define DEFAULT_WIRED_NAME _("Auto Ethernet")
#define DEFAULT_ETHERNET_NAME _("Auto Ethernet")
static gboolean
wired_new_auto_connection (NMDevice *device,
gpointer dclass_data,
AppletNewAutoConnectionCallback callback,
gpointer callback_data)
ethernet_new_auto_connection (NMDevice *device,
gpointer dclass_data,
AppletNewAutoConnectionCallback callback,
gpointer callback_data)
{
NMConnection *connection;
NMSettingWired *s_wired = NULL;
......@@ -80,7 +80,7 @@ wired_new_auto_connection (NMDevice *device,
s_con = NM_SETTING_CONNECTION (nm_setting_connection_new ());
uuid = nm_utils_uuid_generate ();
g_object_set (s_con,
NM_SETTING_CONNECTION_ID, DEFAULT_WIRED_NAME,
NM_SETTING_CONNECTION_ID, DEFAULT_ETHERNET_NAME,
NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME,
NM_SETTING_CONNECTION_AUTOCONNECT, TRUE,
NM_SETTING_CONNECTION_UUID, uuid,
......@@ -94,9 +94,9 @@ wired_new_auto_connection (NMDevice *device,
}
static void
wired_menu_item_activate (GtkMenuItem *item, gpointer user_data)
ethernet_menu_item_activate (GtkMenuItem *item, gpointer user_data)
{
WiredMenuItemInfo *info = (WiredMenuItemInfo *) user_data;
EthernetMenuItemInfo *info = (EthernetMenuItemInfo *) user_data;
applet_menu_item_activate_helper (info->device,
info->connection,
......@@ -121,7 +121,7 @@ add_connection_items (NMDevice *device,
NMApplet *applet)
{
GSList *iter;
WiredMenuItemInfo *info;
EthernetMenuItemInfo *info;
for (iter = connections; iter; iter = g_slist_next (iter)) {
NMConnection *connection = NM_CONNECTION (iter->data);
......@@ -138,15 +138,15 @@ add_connection_items (NMDevice *device,
item = applet_new_menu_item_helper (connection, active, (flag & ADD_ACTIVE));
gtk_widget_set_sensitive (item, carrier);
info = g_slice_new0 (WiredMenuItemInfo);
info = g_slice_new0 (EthernetMenuItemInfo);
info->applet = applet;
info->device = g_object_ref (G_OBJECT (device));
info->connection = g_object_ref (connection);
g_signal_connect_data (item, "activate",
G_CALLBACK (wired_menu_item_activate),
G_CALLBACK (ethernet_menu_item_activate),
info,
(GClosureNotify) wired_menu_item_info_destroy, 0);
(GClosureNotify) ethernet_menu_item_info_destroy, 0);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
}
......@@ -158,31 +158,31 @@ add_default_connection_item (NMDevice *device,
GtkWidget *menu,
NMApplet *applet)
{
WiredMenuItemInfo *info;
EthernetMenuItemInfo *info;
GtkWidget *item;
item = gtk_check_menu_item_new_with_label (DEFAULT_WIRED_NAME);
item = gtk_check_menu_item_new_with_label (DEFAULT_ETHERNET_NAME);
gtk_widget_set_sensitive (GTK_WIDGET (item), carrier);
gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), TRUE);
info = g_slice_new0 (WiredMenuItemInfo);
info = g_slice_new0 (EthernetMenuItemInfo);
info->applet = applet;
info->device = g_object_ref (G_OBJECT (device));
g_signal_connect_data (item, "activate",
G_CALLBACK (wired_menu_item_activate),
G_CALLBACK (ethernet_menu_item_activate),
info,
(GClosureNotify) wired_menu_item_info_destroy, 0);
(GClosureNotify) ethernet_menu_item_info_destroy, 0);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
}
static void
wired_add_menu_item (NMDevice *device,
guint32 n_devices,
NMConnection *active,
GtkWidget *menu,
NMApplet *applet)
ethernet_add_menu_item (NMDevice *device,
guint32 n_devices,
NMConnection *active,
GtkWidget *menu,
NMApplet *applet)
{
char *text;
GtkWidget *item;
......@@ -249,11 +249,11 @@ wired_add_menu_item (NMDevice *device,
}
static void
wired_device_state_changed (NMDevice *device,
NMDeviceState new_state,
NMDeviceState old_state,
NMDeviceStateReason reason,
NMApplet *applet)
ethernet_device_state_changed (NMDevice *device,
NMDeviceState new_state,
NMDeviceState old_state,
NMDeviceStateReason reason,
NMApplet *applet)
{
if (new_state == NM_DEVICE_STATE_ACTIVATED) {
NMConnection *connection;
......@@ -279,11 +279,11 @@ wired_device_state_changed (NMDevice *device,
}
static GdkPixbuf *
wired_get_icon (NMDevice *device,
NMDeviceState state,
NMConnection *connection,
char **tip,
NMApplet *applet)
ethernet_get_icon (NMDevice *device,
NMDeviceState state,
NMConnection *connection,
char **tip,
NMApplet *applet)
{
NMSettingConnection *s_con;
GdkPixbuf *pixbuf = NULL;
......@@ -309,7 +309,7 @@ wired_get_icon (NMDevice *device,
*tip = g_strdup_printf (_("Requesting an ethernet network address for '%s'..."), id);
break;
case NM_DEVICE_STATE_ACTIVATED:
pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->wired_icon, applet);
pixbuf = nma_icon_check_and_load ("nm-device-wired", &applet->ethernet_icon, applet);
*tip = g_strdup_printf (_("Ethernet network connection '%s' active"), id);
break;
default:
......@@ -552,7 +552,7 @@ get_8021x_secrets_cb (GtkDialog *dialog, gint response, gpointer user_data)
goto done;
}
connection = nma_wired_dialog_get_connection (info->dialog);
connection = nma_ethernet_dialog_get_connection (info->dialog);
if (!connection) {
g_set_error (&error,
NM_SECRET_AGENT_ERROR,
......@@ -587,7 +587,7 @@ nm_8021x_get_secrets (SecretsRequest *req, GError **error)
applet_secrets_request_set_free_func (req, free_8021x_info);
info->dialog = nma_wired_dialog_new (g_object_ref (req->connection));
info->dialog = nma_ethernet_dialog_new (g_object_ref (req->connection));
if (!info->dialog) {
g_set_error (error,
NM_SECRET_AGENT_ERROR,
......@@ -607,7 +607,7 @@ nm_8021x_get_secrets (SecretsRequest *req, GError **error)
}
static gboolean
wired_get_secrets (SecretsRequest *req, GError **error)
ethernet_get_secrets (SecretsRequest *req, GError **error)
{
NMSettingConnection *s_con;
const char *ctype;
......@@ -639,7 +639,7 @@ wired_get_secrets (SecretsRequest *req, GError **error)
}
NMADeviceClass *
applet_device_wired_get_class (NMApplet *applet)
applet_device_ethernet_get_class (NMApplet *applet)
{
NMADeviceClass *dclass;
......@@ -647,11 +647,11 @@ applet_device_wired_get_class (NMApplet *applet)
if (!dclass)
return NULL;
dclass->new_auto_connection = wired_new_auto_connection;
dclass->add_menu_item = wired_add_menu_item;
dclass->device_state_changed = wired_device_state_changed;
dclass->get_icon = wired_get_icon;
dclass->get_secrets = wired_get_secrets;
dclass->new_auto_connection = ethernet_new_auto_connection;
dclass->add_menu_item = ethernet_add_menu_item;
dclass->device_state_changed = ethernet_device_state_changed;
dclass->get_icon = ethernet_get_icon;
dclass->get_secrets = ethernet_get_secrets;
dclass->secrets_request_size = MAX (sizeof (NM8021xInfo), sizeof (NMPppoeInfo));
return dclass;
......
......@@ -21,11 +21,11 @@
* (C) Copyright 2008 Novell, Inc.
*/
#ifndef __APPLET_DEVICE_WIRED_H__
#define __APPLET_DEVICE_WIRED_H__
#ifndef __APPLET_DEVICE_ETHERNET_H__
#define __APPLET_DEVICE_ETHERNET_H__
#include "applet.h"
NMADeviceClass *applet_device_wired_get_class (NMApplet *applet);
NMADeviceClass *applet_device_ethernet_get_class (NMApplet *applet);
#endif /* __APPLET_DEVICE_WIRED_H__ */
#endif /* __APPLET_DEVICE_ETHERNET_H__ */
This diff is collapsed.
......@@ -468,10 +468,10 @@ info_dialog_add_page (GtkNotebook *notebook,
/* Speed */
str = NULL;
if (NM_IS_DEVICE_ETHERNET (device)) {
/* Wired speed in Mb/s */
/* Ethernet speed in Mb/s */
speed = nm_device_ethernet_get_speed (NM_DEVICE_ETHERNET (device));
} else if (NM_IS_DEVICE_WIFI (device)) {
/* Wireless speed in Kb/s */
/* Wi-Fi speed in Kb/s */
speed = nm_device_wifi_get_bitrate (NM_DEVICE_WIFI (device)) / 1000;
label_info_new (device,
......
......@@ -67,14 +67,14 @@
#include <libnotify/notify.h>
#include "applet.h"
#include "applet-device-wired.h"
#include "applet-device-ethernet.h"
#include "applet-device-wifi.h"
#include "applet-device-gsm.h"
#include "applet-device-cdma.h"
#include "applet-device-bt.h"
#include "applet-device-wimax.h"
#include "applet-dialogs.h"
#include "nm-wireless-dialog.h"
#include "nm-wifi-dialog.h"
#include "applet-vpn-request.h"
#include "utils.h"
#include "shell-watcher.h"
......@@ -404,7 +404,7 @@ get_device_class (NMDevice *device, NMApplet *applet)
g_return_val_if_fail (applet != NULL, NULL);
if (NM_IS_DEVICE_ETHERNET (device))
return applet->wired_class;
return applet->ethernet_class;
else if (NM_IS_DEVICE_WIFI (device))
return applet->wifi_class;
else if (NM_IS_DEVICE_MODEM (device)) {
......@@ -442,7 +442,7 @@ get_device_class_from_connection (NMConnection *connection, NMApplet *applet)
g_return_val_if_fail (ctype != NULL, NULL);
if (!strcmp (ctype, NM_SETTING_WIRED_SETTING_NAME) || !strcmp (ctype, NM_SETTING_PPPOE_SETTING_NAME))
return applet->wired_class;
return applet->ethernet_class;
else if (!strcmp (ctype, NM_SETTING_WIRELESS_SETTING_NAME))
return applet->wifi_class;
else if (!strcmp (ctype, NM_SETTING_GSM_SETTING_NAME))
......@@ -1549,7 +1549,7 @@ nma_menu_add_devices (GtkWidget *menu, NMApplet *applet)
GSList *devices = NULL, *iter = NULL;
gint n_wifi_devices = 0;
gint n_usable_wifi_devices = 0;
gint n_wired_devices = 0;
gint n_ethernet_devices = 0;
gint n_mb_devices = 0;
gint n_bt_devices = 0;
int i;
......@@ -1571,14 +1571,14 @@ nma_menu_add_devices (GtkWidget *menu, NMApplet *applet)
&& (nm_device_get_state (device) >= NM_DEVICE_STATE_DISCONNECTED))
n_usable_wifi_devices++;
} else if (NM_IS_DEVICE_ETHERNET (device))
n_wired_devices++;
n_ethernet_devices++;
else if (NM_IS_DEVICE_MODEM (device))
n_mb_devices++;
else if (NM_IS_DEVICE_BT (device))
n_bt_devices++;
}
if (!n_wired_devices && !n_wifi_devices && !n_mb_devices && !n_bt_devices) {
if (!n_ethernet_devices && !n_wifi_devices && !n_mb_devices && !n_bt_devices) {
nma_menu_add_text_item (menu, _("No network devices available"));
goto out;
}
......@@ -1597,7 +1597,7 @@ nma_menu_add_devices (GtkWidget *menu, NMApplet *applet)
if (NM_IS_DEVICE_WIFI (device))
n_devices = n_wifi_devices;
else if (NM_IS_DEVICE_ETHERNET (device))
n_devices = n_wired_devices;
n_devices = n_ethernet_devices;
else if (NM_IS_DEVICE_MODEM (device))
n_devices = n_mb_devices;
......@@ -1612,7 +1612,7 @@ nma_menu_add_devices (GtkWidget *menu, NMApplet *applet)
g_slist_free (devices);
/* Return # of usable wifi devices here for correct enable/disable state
* of things like Enable Wireless, "Connect to other..." and such.
* of things like Enable Wi-Fi, "Connect to other..." and such.
*/
return n_usable_wifi_devices;
}
......@@ -1739,7 +1739,7 @@ nma_menu_add_vpn_submenu (GtkWidget *menu, NMApplet *applet)
static void
nma_set_wireless_enabled_cb (GtkWidget *widget, NMApplet *applet)
nma_set_wifi_enabled_cb (GtkWidget *widget, NMApplet *applet)
{
gboolean state;
......@@ -1802,19 +1802,19 @@ nma_set_notifications_enabled_cb (GtkWidget *widget, NMApplet *applet)
PREF_DISABLE_VPN_NOTIFICATIONS,
!state);
g_settings_set_boolean (applet->gsettings,
PREF_SUPPRESS_WIRELESS_NETWORKS_AVAILABLE,
PREF_SUPPRESS_WIFI_NETWORKS_AVAILABLE,
!state);
}
/*
* nma_menu_show_cb
*
* Pop up the wireless networks menu
* Pop up the wifi networks menu
*
*/
static void nma_menu_show_cb (GtkWidget *menu, NMApplet *applet)
{
guint32 n_wireless;
guint32 n_wifi;
g_return_if_fail (menu != NULL);
g_return_if_fail (applet != NULL);
......@@ -1831,11 +1831,11 @@ static void nma_menu_show_cb (GtkWidget *menu, NMApplet *applet)
return;
}
n_wireless = nma_menu_add_devices (menu, applet);
n_wifi = nma_menu_add_devices (menu, applet);
nma_menu_add_vpn_submenu (menu, applet);
if (n_wireless > 0 && nm_client_wireless_get_enabled (applet->nm_client)) {
if (n_wifi > 0 && nm_client_wireless_get_enabled (applet->nm_client)) {
/* Add the "Hidden Wi-Fi network..." entry */
nma_menu_add_separator_item (menu);
nma_menu_add_hidden_network_item (menu, applet);
......@@ -1887,10 +1887,10 @@ nma_context_menu_update (NMApplet *applet)
{
NMState state;
gboolean net_enabled = TRUE;
gboolean have_wireless = FALSE;
gboolean have_wifi = FALSE;
gboolean have_wwan = FALSE;
gboolean have_wimax = FALSE;
gboolean wireless_hw_enabled;
gboolean wifi_hw_enabled;
gboolean wwan_hw_enabled;
gboolean wimax_hw_enabled;
gboolean notifications_enabled = TRUE;
......@@ -1917,7 +1917,7 @@ nma_context_menu_update (NMApplet *applet)
gtk_widget_set_sensitive (applet->networking_enabled_item,
is_permission_yes (applet, NM_CLIENT_PERMISSION_ENABLE_DISABLE_NETWORK));
/* Enabled Wireless */
/* Enabled Wi-Fi */
g_signal_handler_block (G_OBJECT (applet->wifi_enabled_item),
applet->wifi_enabled_toggled_id);
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (applet->wifi_enabled_item),
......@@ -1925,9 +1925,9 @@ nma_context_menu_update (NMApplet *applet)
g_signal_handler_unblock (G_OBJECT (applet->wifi_enabled_item),
applet->wifi_enabled_toggled_id);
wireless_hw_enabled = nm_client_wireless_hardware_get_enabled (applet->nm_client);
wifi_hw_enabled = nm_client_wireless_hardware_get_enabled (applet->nm_client);
gtk_widget_set_sensitive (GTK_WIDGET (applet->wifi_enabled_item),
wireless_hw_enabled && is_permission_yes (applet, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI));
wifi_hw_enabled && is_permission_yes (applet, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIFI));
/* Enabled Mobile Broadband */
g_signal_handler_block (G_OBJECT (applet->wwan_enabled_item),
......@@ -1959,13 +1959,13 @@ nma_context_menu_update (NMApplet *applet)
if ( g_settings_get_boolean (applet->gsettings, PREF_DISABLE_CONNECTED_NOTIFICATIONS)
&& g_settings_get_boolean (applet->gsettings, PREF_DISABLE_DISCONNECTED_NOTIFICATIONS)
&& g_settings_get_boolean (applet->gsettings, PREF_DISABLE_VPN_NOTIFICATIONS)
&& g_settings_get_boolean (applet->gsettings, PREF_SUPPRESS_WIRELESS_NETWORKS_AVAILABLE))
&& g_settings_get_boolean (applet->gsettings, PREF_SUPPRESS_WIFI_NETWORKS_AVAILABLE))
notifications_enabled = FALSE;
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (applet->notifications_enabled_item), notifications_enabled);
g_signal_handler_unblock (G_OBJECT (applet->notifications_enabled_item),
applet->notifications_enabled_toggled_id);
/* Don't show wifi-specific stuff if wireless is off */
/* Don't show wifi-specific stuff if wifi is off */
if (state != NM_STATE_ASLEEP) {
const GPtrArray *devices;
int i;
......@@ -1975,7 +1975,7 @@ nma_context_menu_update (NMApplet *applet)
NMDevice *candidate = g_ptr_array_index (devices, i);
if (NM_IS_DEVICE_WIFI (candidate))
have_wireless = TRUE;
have_wifi = TRUE;
else if (NM_IS_DEVICE_MODEM (candidate))
have_wwan = TRUE;
else if (NM_IS_DEVICE_WIMAX (candidate))
......@@ -1983,7 +1983,7 @@ nma_context_menu_update (NMApplet *applet)
}
}
if (have_wireless)
if (have_wifi)
gtk_widget_show_all (applet->wifi_enabled_item);
else
gtk_widget_hide (applet->wifi_enabled_item);
......@@ -2056,11 +2056,11 @@ static GtkWidget *nma_context_menu_create (NMApplet *applet)
applet->networking_enabled_toggled_id = id;
gtk_menu_shell_append (menu, applet->networking_enabled_item);
/* 'Enable Wireless' item */
applet->wifi_enabled_item = gtk_check_menu_item_new_with_mnemonic (_("Enable _Wireless"));
/* 'Enable Wi-Fi' item */
applet->wifi_enabled_item = gtk_check_menu_item_new_with_mnemonic (_("Enable _Wi-Fi"));
id = g_signal_connect (applet->wifi_enabled_item,
"toggled",
G_CALLBACK (nma_set_wireless_enabled_cb),
G_CALLBACK (nma_set_wifi_enabled_cb),
applet);
applet->wifi_enabled_toggled_id = id;
gtk_menu_shell_append (menu, applet->wifi_enabled_item);
......@@ -2981,16 +2981,16 @@ static void nma_icons_free (NMApplet *applet)
nma_clear_icon (&applet->icon_layers[i], applet);
nma_clear_icon (&applet->no_connection_icon, applet);
nma_clear_icon (&applet->wired_icon, applet);
nma_clear_icon (&applet->ethernet_icon, applet);
nma_clear_icon (&applet->adhoc_icon, applet);
nma_clear_icon (&applet->wwan_icon, applet);
nma_clear_icon (&applet->wwan_tower_icon, applet);
nma_clear_icon (&applet->vpn_lock_icon, applet);
nma_clear_icon (&applet->wireless_00_icon, applet);
nma_clear_icon (&applet->wireless_25_icon, applet);
nma_clear_icon (&applet->wireless_50_icon, applet);
nma_clear_icon (&applet->wireless_75_icon, applet);
nma_clear_icon (&applet->wireless_100_icon, applet);
nma_clear_icon (&applet->wifi_00_icon, applet);
nma_clear_icon (&applet->wifi_25_icon, applet);
nma_clear_icon (&applet->wifi_50_icon, applet);
nma_clear_icon (&applet->wifi_75_icon, applet);
nma_clear_icon (&applet->wifi_100_icon, applet);
nma_clear_icon (&applet->secure_lock_icon, applet);
nma_clear_icon (&applet->mb_tech_1x_icon, applet);
......@@ -3388,8 +3388,8 @@ constructor (GType type,
G_CALLBACK (applet_agent_registered_cb), applet);
/* Initialize device classes */
applet->wired_class = applet_device_wired_get_class (applet);
g_assert (applet->wired_class);
applet->ethernet_class = applet_device_ethernet_get_class (applet);
g_assert (applet->ethernet_class);
applet->wifi_class = applet_device_wifi_get_class (applet);
g_assert (applet->wifi_class);
......@@ -3435,7 +3435,7 @@ static void finalize (GObject *object)
{
NMApplet *applet = NM_APPLET (object);
g_slice_free (NMADeviceClass, applet->wired_class);
g_slice_free (NMADeviceClass, applet->ethernet_class);
g_slice_free (NMADeviceClass, applet->wifi_class);
g_slice_free (NMADeviceClass, applet->gsm_class);
g_slice_free (NMADeviceClass, applet->cdma_class);
......
......@@ -64,7 +64,7 @@ typedef struct
#define PREF_DISABLE_DISCONNECTED_NOTIFICATIONS "disable-disconnected-notifications"
#define PREF_DISABLE_VPN_NOTIFICATIONS "disable-vpn-notifications"
#define PREF_DISABLE_WIFI_CREATE "disable-wifi-create"
#define PREF_SUPPRESS_WIRELESS_NETWORKS_AVAILABLE "suppress-wireless-networks-available"
#define PREF_SUPPRESS_WIFI_NETWORKS_AVAILABLE "suppress-wireless-networks-available"
#define ICON_LAYER_LINK 0
#define ICON_LAYER_VPN 1
......@@ -99,7 +99,7 @@ typedef struct
NMClientPermissionResult permissions[NM_CLIENT_PERMISSION_LAST + 1];
/* Device classes */
NMADeviceClass *wired_class;
NMADeviceClass *ethernet_class;
NMADeviceClass *wifi_class;
NMADeviceClass *gsm_class;
NMADeviceClass *cdma_class;
......@@ -111,14 +111,14 @@ typedef struct
GtkIconTheme * icon_theme;
GdkPixbuf * no_connection_icon;
GdkPixbuf * wired_icon;
GdkPixbuf * ethernet_icon;
GdkPixbuf * adhoc_icon;
GdkPixbuf * wwan_icon;
GdkPixbuf * wireless_00_icon;
GdkPixbuf * wireless_25_icon;
GdkPixbuf * wireless_50_icon;
GdkPixbuf * wireless_75_icon;
GdkPixbuf * wireless_100_icon;
GdkPixbuf * wifi_00_icon;
GdkPixbuf * wifi_25_icon;
GdkPixbuf * wifi_50_icon;
GdkPixbuf * wifi_75_icon;
GdkPixbuf * wifi_100_icon;
GdkPixbuf * secure_lock_icon;
#define NUM_CONNECTING_STAGES 3
#define NUM_CONNECTING_FRAMES 11
......
......@@ -30,7 +30,7 @@
#include <nm-setting-8021x.h>
#include <nm-setting-wireless.h>
#include <nm-utils.h>
#include "wired-dialog.h"
#include "ethernet-dialog.h"
#include "wireless-security.h"
#include "applet-dialogs.h"
......@@ -76,7 +76,7 @@ dialog_set_security (NMConnection *connection,
}
GtkWidget *
nma_wired_dialog_new (NMConnection *connection)
nma_ethernet_dialog_new (NMConnection *connection)