[network-manager-applet] applet: rename "wired" and "wireless" in files/classes/functions
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] applet: rename "wired" and "wireless" in files/classes/functions
- Date: Thu, 9 Aug 2012 16:01:13 +0000 (UTC)
commit 3a18b5a92f774680336758834f0b7f71968f469e
Author: Dan Winship <danw gnome org>
Date: Thu Aug 9 09:22:51 2012 -0400
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.)
src/{wired-8021x.ui => 8021x.ui} | 2 +-
src/Makefile.am | 10 +-
src/ap-menu-item.c | 10 +-
src/applet-device-bt.c | 1 -
...let-device-wired.c => applet-device-ethernet.c} | 96 +++++-----
...let-device-wired.h => applet-device-ethernet.h} | 8 +-
src/applet-device-wifi.c | 188 ++++++++++----------
src/applet-dialogs.c | 4 +-
src/applet.c | 72 ++++----
src/applet.h | 16 +-
src/{wired-dialog.c => ethernet-dialog.c} | 10 +-
src/{wired-dialog.h => ethernet-dialog.h} | 10 +-
src/libnm-gtk/Makefile.am | 4 +-
.../{nm-wireless-dialog.c => nm-wifi-dialog.c} | 144 ++++++++--------
src/libnm-gtk/nm-wifi-dialog.h | 80 +++++++++
src/libnm-gtk/nm-wireless-dialog.h | 80 ---------
src/mobile-helpers.c | 10 +-
17 files changed, 372 insertions(+), 373 deletions(-)
---
diff --git a/src/wired-8021x.ui b/src/8021x.ui
similarity index 99%
rename from src/wired-8021x.ui
rename to src/8021x.ui
index 3171980..f034218 100644
--- a/src/wired-8021x.ui
+++ b/src/8021x.ui
@@ -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>
diff --git a/src/Makefile.am b/src/Makefile.am
index 7f7c07f..6d5ecee 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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)
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index f3287e5..c757ec7 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -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);
diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c
index ce75a27..6ff43af 100644
--- a/src/applet-device-bt.c
+++ b/src/applet-device-bt.c
@@ -39,7 +39,6 @@
#include "applet.h"
#include "applet-device-bt.h"
-#include "wired-dialog.h"
#include "utils.h"
#include "applet-dialogs.h"
diff --git a/src/applet-device-wired.c b/src/applet-device-ethernet.c
similarity index 87%
rename from src/applet-device-wired.c
rename to src/applet-device-ethernet.c
index b053d30..5e58764 100644
--- a/src/applet-device-wired.c
+++ b/src/applet-device-ethernet.c
@@ -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;
diff --git a/src/applet-device-wired.h b/src/applet-device-ethernet.h
similarity index 84%
rename from src/applet-device-wired.h
rename to src/applet-device-ethernet.h
index 7aaadea..19d4859 100644
--- a/src/applet-device-wired.h
+++ b/src/applet-device-ethernet.h
@@ -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__ */
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 8805fa7..dbf59f6 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -45,11 +45,11 @@
#include "applet-device-wifi.h"
#include "ap-menu-item.h"
#include "utils.h"
-#include "nm-wireless-dialog.h"
+#include "nm-wifi-dialog.h"
#define ACTIVE_AP_TAG "active-ap"
-static void wireless_dialog_response_cb (GtkDialog *dialog, gint response, gpointer user_data);
+static void wifi_dialog_response_cb (GtkDialog *dialog, gint response, gpointer user_data);
static void nag_dialog_response_cb (GtkDialog *nag_dialog, gint response, gpointer user_data);
@@ -77,10 +77,10 @@ applet_wifi_connect_to_hidden_network (NMApplet *applet)
{
GtkWidget *dialog;
- dialog = nma_wireless_dialog_new_for_other (applet->nm_client, applet->settings);
+ dialog = nma_wifi_dialog_new_for_other (applet->nm_client, applet->settings);
if (dialog) {
g_signal_connect (dialog, "response",
- G_CALLBACK (wireless_dialog_response_cb),
+ G_CALLBACK (wifi_dialog_response_cb),
applet);
show_ignore_focus_stealing_prevention (dialog);
}
@@ -110,7 +110,7 @@ applet_wifi_can_create_wifi_network (NMApplet *applet)
gboolean disabled, allowed = FALSE;
NMClientPermissionResult perm;
- /* FIXME: check WIFI_SHARE_PROTECTED too, and make the wireless dialog
+ /* FIXME: check WIFI_SHARE_PROTECTED too, and make the wifi dialog
* handle the permissions as well so that admins can restrict open network
* creation separately from protected network creation.
*/
@@ -128,10 +128,10 @@ applet_wifi_create_wifi_network (NMApplet *applet)
{
GtkWidget *dialog;
- dialog = nma_wireless_dialog_new_for_create (applet->nm_client, applet->settings);
+ dialog = nma_wifi_dialog_new_for_create (applet->nm_client, applet->settings);
if (dialog) {
g_signal_connect (dialog, "response",
- G_CALLBACK (wireless_dialog_response_cb),
+ G_CALLBACK (wifi_dialog_response_cb),
applet);
show_ignore_focus_stealing_prevention (dialog);
}
@@ -225,12 +225,12 @@ typedef struct {
NMDeviceWifi *device;
NMAccessPoint *ap;
NMConnection *connection;
-} WirelessMenuItemInfo;
+} WifiMenuItemInfo;
static void
-wireless_menu_item_info_destroy (gpointer data)
+wifi_menu_item_info_destroy (gpointer data)
{
- WirelessMenuItemInfo *info = (WirelessMenuItemInfo *) data;
+ WifiMenuItemInfo *info = (WifiMenuItemInfo *) data;
g_object_unref (G_OBJECT (info->device));
g_object_unref (G_OBJECT (info->ap));
@@ -238,7 +238,7 @@ wireless_menu_item_info_destroy (gpointer data)
if (info->connection)
g_object_unref (G_OBJECT (info->connection));
- g_slice_free (WirelessMenuItemInfo, data);
+ g_slice_free (WifiMenuItemInfo, data);
}
/*
@@ -345,7 +345,7 @@ more_info_wifi_dialog_response_cb (GtkDialog *foo,
gint response,
gpointer user_data)
{
- NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo);
+ NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo);
MoreInfo *info = user_data;
NMConnection *connection = NULL;
NMDevice *device = NULL;
@@ -356,13 +356,13 @@ more_info_wifi_dialog_response_cb (GtkDialog *foo,
goto done;
}
- if (!nma_wireless_dialog_get_nag_ignored (dialog)) {
+ if (!nma_wifi_dialog_get_nag_ignored (dialog)) {
GtkWidget *nag_dialog;
/* Nag the user about certificates or whatever. Only destroy the dialog
* if no nagging was done.
*/
- nag_dialog = nma_wireless_dialog_nag_user (dialog);
+ nag_dialog = nma_wifi_dialog_nag_user (dialog);
if (nag_dialog) {
gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog));
g_signal_connect (nag_dialog, "response",
@@ -372,16 +372,16 @@ more_info_wifi_dialog_response_cb (GtkDialog *foo,
}
}
- /* nma_wireless_dialog_get_connection() returns a connection with the
+ /* nma_wifi_dialog_get_connection() returns a connection with the
* refcount incremented, so the caller must remember to unref it.
*/
- connection = nma_wireless_dialog_get_connection (dialog, &device, &ap);
+ connection = nma_wifi_dialog_get_connection (dialog, &device, &ap);
g_assert (connection);
g_assert (device);
info->callback (connection, TRUE, FALSE, info->callback_data);
- /* Balance nma_wireless_dialog_get_connection() */
+ /* Balance nma_wifi_dialog_get_connection() */
g_object_unref (connection);
done:
@@ -469,7 +469,7 @@ _do_new_auto_connection (NMApplet *applet,
more_info->callback = callback;
more_info->callback_data = callback_data;
- dialog = nma_wireless_dialog_new (applet->nm_client, applet->settings, connection, device, ap, FALSE);
+ dialog = nma_wifi_dialog_new (applet->nm_client, applet->settings, connection, device, ap, FALSE);
if (dialog) {
g_signal_connect (dialog, "response",
G_CALLBACK (more_info_wifi_dialog_response_cb),
@@ -483,12 +483,12 @@ _do_new_auto_connection (NMApplet *applet,
}
static gboolean
-wireless_new_auto_connection (NMDevice *device,
- gpointer dclass_data,
- AppletNewAutoConnectionCallback callback,
- gpointer callback_data)
+wifi_new_auto_connection (NMDevice *device,
+ gpointer dclass_data,
+ AppletNewAutoConnectionCallback callback,
+ gpointer callback_data)
{
- WirelessMenuItemInfo *info = (WirelessMenuItemInfo *) dclass_data;
+ WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
g_return_val_if_fail (device != NULL, FALSE);
g_return_val_if_fail (info->ap != NULL, FALSE);
@@ -499,9 +499,9 @@ wireless_new_auto_connection (NMDevice *device,
static void
-wireless_menu_item_activate (GtkMenuItem *item, gpointer user_data)
+wifi_menu_item_activate (GtkMenuItem *item, gpointer user_data)
{
- WirelessMenuItemInfo *info = (WirelessMenuItemInfo *) user_data;
+ WifiMenuItemInfo *info = (WifiMenuItemInfo *) user_data;
const char *specific_object = NULL;
if (info->ap)
@@ -550,7 +550,7 @@ create_new_ap_item (NMDeviceWifi *device,
GSList *connections,
NMApplet *applet)
{
- WirelessMenuItemInfo *info;
+ WifiMenuItemInfo *info;
GSList *iter;
NMNetworkMenuItem *item = NULL;
GSList *dev_connections = NULL;
@@ -592,16 +592,16 @@ create_new_ap_item (NMDeviceWifi *device,
s_con = nm_connection_get_setting_connection (connection);
subitem = gtk_menu_item_new_with_label (nm_setting_connection_get_id (s_con));
- info = g_slice_new0 (WirelessMenuItemInfo);
+ info = g_slice_new0 (WifiMenuItemInfo);
info->applet = applet;
info->device = g_object_ref (G_OBJECT (device));
info->ap = g_object_ref (G_OBJECT (ap));
info->connection = g_object_ref (G_OBJECT (connection));
g_signal_connect_data (subitem, "activate",
- G_CALLBACK (wireless_menu_item_activate),
+ G_CALLBACK (wifi_menu_item_activate),
info,
- (GClosureNotify) wireless_menu_item_info_destroy, 0);
+ (GClosureNotify) wifi_menu_item_info_destroy, 0);
gtk_menu_shell_append (GTK_MENU_SHELL (submenu), GTK_WIDGET (subitem));
}
@@ -610,7 +610,7 @@ create_new_ap_item (NMDeviceWifi *device,
} else {
NMConnection *connection;
- info = g_slice_new0 (WirelessMenuItemInfo);
+ info = g_slice_new0 (WifiMenuItemInfo);
info->applet = applet;
info->device = g_object_ref (G_OBJECT (device));
info->ap = g_object_ref (G_OBJECT (ap));
@@ -622,9 +622,9 @@ create_new_ap_item (NMDeviceWifi *device,
g_signal_connect_data (GTK_WIDGET (item),
"activate",
- G_CALLBACK (wireless_menu_item_activate),
+ G_CALLBACK (wifi_menu_item_activate),
info,
- (GClosureNotify) wireless_menu_item_info_destroy,
+ (GClosureNotify) wifi_menu_item_info_destroy,
0);
}
@@ -757,11 +757,11 @@ sort_toplevel (gconstpointer tmpa, gconstpointer tmpb)
}
static void
-wireless_add_menu_item (NMDevice *device,
- guint32 n_devices,
- NMConnection *active,
- GtkWidget *menu,
- NMApplet *applet)
+wifi_add_menu_item (NMDevice *device,
+ guint32 n_devices,
+ NMConnection *active,
+ GtkWidget *menu,
+ NMApplet *applet)
{
NMDeviceWifi *wdev;
char *text;
@@ -769,8 +769,8 @@ wireless_add_menu_item (NMDevice *device,
int i;
NMAccessPoint *active_ap = NULL;
GSList *connections = NULL, *all, *iter;
- gboolean wireless_enabled = TRUE;
- gboolean wireless_hw_enabled = TRUE;
+ gboolean wifi_enabled = TRUE;
+ gboolean wifi_hw_enabled = TRUE;
GSList *menu_items = NULL; /* All menu items we'll be adding */
NMNetworkMenuItem *item, *active_item = NULL;
GtkWidget *widget;
@@ -820,12 +820,12 @@ wireless_add_menu_item (NMDevice *device,
}
/* Notify user of unmanaged or unavailable device */
- wireless_enabled = nm_client_wireless_get_enabled (applet->nm_client);
- wireless_hw_enabled = nm_client_wireless_hardware_get_enabled (applet->nm_client);
+ wifi_enabled = nm_client_wireless_get_enabled (applet->nm_client);
+ wifi_hw_enabled = nm_client_wireless_hardware_get_enabled (applet->nm_client);
widget = nma_menu_device_get_menu_item (device, applet,
- wireless_hw_enabled ?
- (wireless_enabled ? NULL : _("wireless is disabled")) :
- _("wireless is disabled by hardware switch"));
+ wifi_hw_enabled ?
+ (wifi_enabled ? NULL : _("Wi-Fi is disabled")) :
+ _("Wi-Fi is disabled by hardware switch"));
if (widget) {
gtk_menu_shell_append (GTK_MENU_SHELL (menu), widget);
gtk_widget_show (widget);
@@ -982,7 +982,7 @@ wifi_available_dont_show_cb (NotifyNotification *notify,
return;
g_settings_set_boolean (applet->gsettings,
- PREF_SUPPRESS_WIRELESS_NETWORKS_AVAILABLE,
+ PREF_SUPPRESS_WIFI_NETWORKS_AVAILABLE,
TRUE);
}
@@ -1080,12 +1080,12 @@ queue_avail_access_point_notification (NMDevice *device)
{
struct ap_notification_data *data;
- data = g_object_get_data (G_OBJECT (device), "notify-wireless-avail-data");
+ data = g_object_get_data (G_OBJECT (device), "notify-wifi-avail-data");
if (data->id != 0)
return;
if (g_settings_get_boolean (data->applet->gsettings,
- PREF_SUPPRESS_WIRELESS_NETWORKS_AVAILABLE))
+ PREF_SUPPRESS_WIFI_NETWORKS_AVAILABLE))
return;
data->id = g_timeout_add_seconds (3, idle_check_avail_access_point_notification, data);
@@ -1150,7 +1150,7 @@ free_ap_notification_data (gpointer user_data)
}
static void
-wireless_device_added (NMDevice *device, NMApplet *applet)
+wifi_device_added (NMDevice *device, NMApplet *applet)
{
NMDeviceWifi *wdev = NM_DEVICE_WIFI (device);
const GPtrArray *aps;
@@ -1173,7 +1173,7 @@ wireless_device_added (NMDevice *device, NMApplet *applet)
G_CALLBACK (access_point_removed_cb),
applet);
- /* Now create the per-device hooks for watching for available wireless
+ /* Now create the per-device hooks for watching for available wifi
* connections.
*/
data = g_new0 (struct ap_notification_data, 1);
@@ -1188,7 +1188,7 @@ wireless_device_added (NMDevice *device, NMApplet *applet)
G_CALLBACK (on_new_connection),
data);
data->new_con_id = id;
- g_object_set_data_full (G_OBJECT (wdev), "notify-wireless-avail-data",
+ g_object_set_data_full (G_OBJECT (wdev), "notify-wifi-avail-data",
data, free_ap_notification_data);
queue_avail_access_point_notification (device);
@@ -1241,11 +1241,11 @@ update_active_ap (NMDevice *device, NMDeviceState state, NMApplet *applet)
}
static void
-wireless_device_state_changed (NMDevice *device,
- NMDeviceState new_state,
- NMDeviceState old_state,
- NMDeviceStateReason reason,
- NMApplet *applet)
+wifi_device_state_changed (NMDevice *device,
+ NMDeviceState new_state,
+ NMDeviceState old_state,
+ NMDeviceStateReason reason,
+ NMApplet *applet)
{
NMAccessPoint *new = NULL;
char *msg;
@@ -1269,11 +1269,11 @@ wireless_device_state_changed (NMDevice *device,
}
static GdkPixbuf *
-wireless_get_icon (NMDevice *device,
- NMDeviceState state,
- NMConnection *connection,
- char **tip,
- NMApplet *applet)
+wifi_get_icon (NMDevice *device,
+ NMDeviceState state,
+ NMConnection *connection,
+ char **tip,
+ NMApplet *applet)
{
NMSettingConnection *s_con;
NMAccessPoint *ap;
@@ -1310,22 +1310,22 @@ wireless_get_icon (NMDevice *device,
strength = CLAMP (strength, 0, 100);
if (strength > 80)
- pixbuf = nma_icon_check_and_load ("nm-signal-100", &applet->wireless_100_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-100", &applet->wifi_100_icon, applet);
else if (strength > 55)
- pixbuf = nma_icon_check_and_load ("nm-signal-75", &applet->wireless_75_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-75", &applet->wifi_75_icon, applet);
else if (strength > 30)
- pixbuf = nma_icon_check_and_load ("nm-signal-50", &applet->wireless_50_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-50", &applet->wifi_50_icon, applet);
else if (strength > 5)
- pixbuf = nma_icon_check_and_load ("nm-signal-25", &applet->wireless_25_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-25", &applet->wifi_25_icon, applet);
else
- pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon, applet);
ssid = get_ssid_utf8 (ap);
*tip = g_strdup_printf (_("Wi-Fi network connection '%s' active: %s (%d%%)"),
id, ssid, strength);
g_free (ssid);
} else {
- pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet);
+ pixbuf = nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon, applet);
*tip = g_strdup_printf (_("Wi-Fi network connection '%s' active"), id);
}
break;
@@ -1337,7 +1337,7 @@ wireless_get_icon (NMDevice *device,
}
static gboolean
-wireless_dialog_close (gpointer user_data)
+wifi_dialog_close (gpointer user_data)
{
GtkWidget *dialog = GTK_WIDGET (user_data);
@@ -1346,9 +1346,9 @@ wireless_dialog_close (gpointer user_data)
}
static void
-wireless_dialog_destroyed (gpointer data, GObject *dialog_ptr)
+wifi_dialog_destroyed (gpointer data, GObject *dialog_ptr)
{
- /* remove the idle function; for not to call wireless_dialog_close() on invalid pointer */
+ /* remove the idle function; for not to call wifi_dialog_close() on invalid pointer */
g_idle_remove_by_data (dialog_ptr);
}
@@ -1357,12 +1357,12 @@ nag_dialog_response_cb (GtkDialog *nag_dialog,
gint response,
gpointer user_data)
{
- NMAWirelessDialog *wireless_dialog = NMA_WIRELESS_DIALOG (user_data);
+ NMAWifiDialog *wifi_dialog = NMA_WIFI_DIALOG (user_data);
if (response == GTK_RESPONSE_NO) { /* user opted not to correct the warning */
- nma_wireless_dialog_set_nag_ignored (wireless_dialog, TRUE);
- g_idle_add (wireless_dialog_close, wireless_dialog);
- g_object_weak_ref (G_OBJECT (wireless_dialog), wireless_dialog_destroyed, NULL);
+ nma_wifi_dialog_set_nag_ignored (wifi_dialog, TRUE);
+ g_idle_add (wifi_dialog_close, wifi_dialog);
+ g_object_weak_ref (G_OBJECT (wifi_dialog), wifi_dialog_destroyed, NULL);
}
}
@@ -1405,11 +1405,11 @@ activate_new_cb (NMClient *client,
}
static void
-wireless_dialog_response_cb (GtkDialog *foo,
- gint response,
- gpointer user_data)
+wifi_dialog_response_cb (GtkDialog *foo,
+ gint response,
+ gpointer user_data)
{
- NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (foo);
+ NMAWifiDialog *dialog = NMA_WIFI_DIALOG (foo);
NMApplet *applet = NM_APPLET (user_data);
NMConnection *connection = NULL, *fuzzy_match = NULL;
NMDevice *device = NULL;
@@ -1419,13 +1419,13 @@ wireless_dialog_response_cb (GtkDialog *foo,
if (response != GTK_RESPONSE_OK)
goto done;
- if (!nma_wireless_dialog_get_nag_ignored (dialog)) {
+ if (!nma_wifi_dialog_get_nag_ignored (dialog)) {
GtkWidget *nag_dialog;
/* Nag the user about certificates or whatever. Only destroy the dialog
* if no nagging was done.
*/
- nag_dialog = nma_wireless_dialog_nag_user (dialog);
+ nag_dialog = nma_wifi_dialog_nag_user (dialog);
if (nag_dialog) {
gtk_window_set_transient_for (GTK_WINDOW (nag_dialog), GTK_WINDOW (dialog));
g_signal_connect (nag_dialog, "response",
@@ -1435,10 +1435,10 @@ wireless_dialog_response_cb (GtkDialog *foo,
}
}
- /* nma_wireless_dialog_get_connection() returns a connection with the
+ /* nma_wifi_dialog_get_connection() returns a connection with the
* refcount incremented, so the caller must remember to unref it.
*/
- connection = nma_wireless_dialog_get_connection (dialog, &device, &ap);
+ connection = nma_wifi_dialog_get_connection (dialog, &device, &ap);
g_assert (connection);
g_assert (device);
@@ -1489,7 +1489,7 @@ wireless_dialog_response_cb (GtkDialog *foo,
applet);
}
- /* Balance nma_wireless_dialog_get_connection() */
+ /* Balance nma_wifi_dialog_get_connection() */
g_object_unref (connection);
done:
@@ -1550,7 +1550,7 @@ get_secrets_dialog_response_cb (GtkDialog *foo,
{
SecretsRequest *req = user_data;
NMWifiInfo *info = (NMWifiInfo *) req;
- NMAWirelessDialog *dialog = NMA_WIRELESS_DIALOG (info->dialog);
+ NMAWifiDialog *dialog = NMA_WIFI_DIALOG (info->dialog);
NMConnection *connection = NULL;
NMSettingWirelessSecurity *s_wireless_sec;
GHashTable *settings = NULL;
@@ -1560,13 +1560,13 @@ get_secrets_dialog_response_cb (GtkDialog *foo,
/* Handle the nag dialog specially; don't want to clear the NMActiveConnection
* destroy handler yet if the main dialog isn't going away.
*/
- if ((response == GTK_RESPONSE_OK) && !nma_wireless_dialog_get_nag_ignored (dialog)) {
+ if ((response == GTK_RESPONSE_OK) && !nma_wifi_dialog_get_nag_ignored (dialog)) {
GtkWidget *widget;
/* Nag the user about certificates or whatever. Only destroy the dialog
* if no nagging was done.
*/
- widget = nma_wireless_dialog_nag_user (dialog);
+ widget = nma_wifi_dialog_nag_user (dialog);
if (widget) {
gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (dialog));
g_signal_connect (widget, "response",
@@ -1585,7 +1585,7 @@ get_secrets_dialog_response_cb (GtkDialog *foo,
goto done;
}
- connection = nma_wireless_dialog_get_connection (dialog, NULL, NULL);
+ connection = nma_wifi_dialog_get_connection (dialog, NULL, NULL);
if (!connection) {
g_set_error (&error,
NM_SECRET_AGENT_ERROR,
@@ -1665,13 +1665,13 @@ done:
}
static gboolean
-wireless_get_secrets (SecretsRequest *req, GError **error)
+wifi_get_secrets (SecretsRequest *req, GError **error)
{
NMWifiInfo *info = (NMWifiInfo *) req;
applet_secrets_request_set_free_func (req, free_wifi_info);
- info->dialog = nma_wireless_dialog_new (req->applet->nm_client, req->applet->settings, req->connection, NULL, NULL, TRUE);
+ info->dialog = nma_wifi_dialog_new (req->applet->nm_client, req->applet->settings, req->connection, NULL, NULL, TRUE);
if (info->dialog) {
g_signal_connect (info->dialog, "response",
G_CALLBACK (get_secrets_dialog_response_cb),
@@ -1696,12 +1696,12 @@ applet_device_wifi_get_class (NMApplet *applet)
if (!dclass)
return NULL;
- dclass->new_auto_connection = wireless_new_auto_connection;
- dclass->add_menu_item = wireless_add_menu_item;
- dclass->device_added = wireless_device_added;
- dclass->device_state_changed = wireless_device_state_changed;
- dclass->get_icon = wireless_get_icon;
- dclass->get_secrets = wireless_get_secrets;
+ dclass->new_auto_connection = wifi_new_auto_connection;
+ dclass->add_menu_item = wifi_add_menu_item;
+ dclass->device_added = wifi_device_added;
+ dclass->device_state_changed = wifi_device_state_changed;
+ dclass->get_icon = wifi_get_icon;
+ dclass->get_secrets = wifi_get_secrets;
dclass->secrets_request_size = sizeof (NMWifiInfo);
return dclass;
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index 649bde6..cd411c0 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -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,
diff --git a/src/applet.c b/src/applet.c
index 4290692..91072c5 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -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);
diff --git a/src/applet.h b/src/applet.h
index cb0c994..685191a 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -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
diff --git a/src/wired-dialog.c b/src/ethernet-dialog.c
similarity index 94%
rename from src/wired-dialog.c
rename to src/ethernet-dialog.c
index 2ebf051..1779935 100644
--- a/src/wired-dialog.c
+++ b/src/ethernet-dialog.c
@@ -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)
{
GtkBuilder *builder;
GtkWidget *dialog;
@@ -85,7 +85,7 @@ nma_wired_dialog_new (NMConnection *connection)
builder = gtk_builder_new ();
- if (!gtk_builder_add_from_file (builder, UIDIR "/wired-8021x.ui", &error)) {
+ if (!gtk_builder_add_from_file (builder, UIDIR "/8021x.ui", &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
g_error_free (error);
applet_warning_dialog_show (_("The NetworkManager Applet could not find some required resources (the .ui file was not found)."));
@@ -93,7 +93,7 @@ nma_wired_dialog_new (NMConnection *connection)
return NULL;
}
- dialog = (GtkWidget *) gtk_builder_get_object (builder, "wired_8021x_dialog");
+ dialog = (GtkWidget *) gtk_builder_get_object (builder, "8021x_dialog");
if (!dialog) {
g_warning ("Couldn't find wireless_dialog widget.");
applet_warning_dialog_show (_("The NetworkManager Applet could not find some required resources (the .ui file was not found)."));
@@ -124,7 +124,7 @@ nma_wired_dialog_new (NMConnection *connection)
}
NMConnection *
-nma_wired_dialog_get_connection (GtkWidget *dialog)
+nma_ethernet_dialog_get_connection (GtkWidget *dialog)
{
NMConnection *connection, *tmp_connection;
WirelessSecurity *security;
diff --git a/src/wired-dialog.h b/src/ethernet-dialog.h
similarity index 82%
rename from src/wired-dialog.h
rename to src/ethernet-dialog.h
index b678a3c..8e2f198 100644
--- a/src/wired-dialog.h
+++ b/src/ethernet-dialog.h
@@ -21,14 +21,14 @@
* (C) Copyright 2008 - 2011 Red Hat, Inc.
*/
-#ifndef WIRED_DIALOG_H
-#define WIRED_DIALOG_H
+#ifndef ETHERNET_DIALOG_H
+#define ETHERNET_DIALOG_H
#include <gtk/gtk.h>
#include <nm-connection.h>
-GtkWidget *nma_wired_dialog_new (NMConnection *connection);
+GtkWidget *nma_ethernet_dialog_new (NMConnection *connection);
-NMConnection *nma_wired_dialog_get_connection (GtkWidget *dialog);
+NMConnection *nma_ethernet_dialog_get_connection (GtkWidget *dialog);
-#endif /* WIRED_DIALOG_H */
+#endif /* ETHERNET_DIALOG_H */
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index 89b643b..ac7a561 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -4,13 +4,13 @@ ui_DATA = wifi.ui
libnmgtkdir = $(includedir)/libnm-gtk
libnmgtk_HEADERS = \
- nm-wireless-dialog.h \
+ nm-wifi-dialog.h \
nm-mobile-wizard.h
lib_LTLIBRARIES = libnm-gtk.la
libnm_gtk_la_SOURCES = \
- nm-wireless-dialog.c \
+ nm-wifi-dialog.c \
nm-mobile-wizard.c
libnm_gtk_la_CFLAGS = \
diff --git a/src/libnm-gtk/nm-wireless-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
similarity index 90%
rename from src/libnm-gtk/nm-wireless-dialog.c
rename to src/libnm-gtk/nm-wifi-dialog.c
index 11e7098..58373d7 100644
--- a/src/libnm-gtk/nm-wireless-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -37,18 +37,18 @@
#include <nm-setting-wireless.h>
#include <nm-setting-ip4-config.h>
-#include "nm-wireless-dialog.h"
+#include "nm-wifi-dialog.h"
#include "wireless-security.h"
#include "utils.h"
-G_DEFINE_TYPE (NMAWirelessDialog, nma_wireless_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (NMAWifiDialog, nma_wifi_dialog, GTK_TYPE_DIALOG)
-#define NMA_WIRELESS_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
- NMA_TYPE_WIRELESS_DIALOG, \
- NMAWirelessDialogPrivate))
+#define NMA_WIFI_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \
+ NMA_TYPE_WIFI_DIALOG, \
+ NMAWifiDialogPrivate))
typedef struct {
- NMAWirelessDialog *self;
+ NMAWifiDialog *self;
NMConnection *connection;
gboolean canceled;
} GetSecretsInfo;
@@ -79,7 +79,7 @@ typedef struct {
GetSecretsInfo *secrets_info;
gboolean disposed;
-} NMAWirelessDialogPrivate;
+} NMAWifiDialogPrivate;
#define D_NAME_COLUMN 0
#define D_DEV_COLUMN 1
@@ -92,23 +92,23 @@ typedef struct {
#define C_SEP_COLUMN 2
#define C_NEW_COLUMN 3
-static gboolean security_combo_init (NMAWirelessDialog *self, gboolean secrets_only);
+static gboolean security_combo_init (NMAWifiDialog *self, gboolean secrets_only);
static void ssid_entry_changed (GtkWidget *entry, gpointer user_data);
void
-nma_wireless_dialog_set_nag_ignored (NMAWirelessDialog *self, gboolean ignored)
+nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self, gboolean ignored)
{
g_return_if_fail (self != NULL);
- NMA_WIRELESS_DIALOG_GET_PRIVATE (self)->nag_ignored = ignored;
+ NMA_WIFI_DIALOG_GET_PRIVATE (self)->nag_ignored = ignored;
}
gboolean
-nma_wireless_dialog_get_nag_ignored (NMAWirelessDialog *self)
+nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self)
{
g_return_val_if_fail (self != NULL, FALSE);
- return NMA_WIRELESS_DIALOG_GET_PRIVATE (self)->nag_ignored;
+ return NMA_WIFI_DIALOG_GET_PRIVATE (self)->nag_ignored;
}
static void
@@ -148,8 +148,8 @@ static void
security_combo_changed (GtkWidget *combo,
gpointer user_data)
{
- NMAWirelessDialog *self = NMA_WIRELESS_DIALOG (user_data);
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkWidget *vbox, *sec_widget, *def_widget;
GList *elt, *children;
GtkTreeIter iter;
@@ -210,8 +210,8 @@ static void
security_combo_changed_manually (GtkWidget *combo,
gpointer user_data)
{
- NMAWirelessDialog *self = NMA_WIRELESS_DIALOG (user_data);
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
/* Flag that the combo was changed manually to allow focus to move
* to the security method's default widget instead of the network name.
@@ -221,9 +221,9 @@ security_combo_changed_manually (GtkWidget *combo,
}
static GByteArray *
-validate_dialog_ssid (NMAWirelessDialog *self)
+validate_dialog_ssid (NMAWifiDialog *self)
{
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkWidget *widget;
const char *ssid;
guint32 ssid_len;
@@ -245,8 +245,8 @@ validate_dialog_ssid (NMAWirelessDialog *self)
static void
stuff_changed_cb (WirelessSecurity *sec, gpointer user_data)
{
- NMAWirelessDialog *self = NMA_WIRELESS_DIALOG (user_data);
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GByteArray *ssid = NULL;
gboolean free_ssid = TRUE;
gboolean valid = FALSE;
@@ -280,8 +280,8 @@ stuff_changed_cb (WirelessSecurity *sec, gpointer user_data)
static void
ssid_entry_changed (GtkWidget *entry, gpointer user_data)
{
- NMAWirelessDialog *self = NMA_WIRELESS_DIALOG (user_data);
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkTreeIter iter;
WirelessSecurity *sec = NULL;
GtkTreeModel *model;
@@ -323,8 +323,8 @@ static void
connection_combo_changed (GtkWidget *combo,
gpointer user_data)
{
- NMAWirelessDialog *self = NMA_WIRELESS_DIALOG (user_data);
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkTreeIter iter;
GtkTreeModel *model;
gboolean is_new = FALSE;
@@ -394,9 +394,9 @@ alphabetize_connections (NMConnection *a, NMConnection *b)
}
static gboolean
-connection_combo_init (NMAWirelessDialog *self, NMConnection *connection)
+connection_combo_init (NMAWifiDialog *self, NMConnection *connection)
{
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkListStore *store;
int num_added = 0;
GtkTreeIter tree_iter;
@@ -546,8 +546,8 @@ static void
device_combo_changed (GtkWidget *combo,
gpointer user_data)
{
- NMAWirelessDialog *self = NMA_WIRELESS_DIALOG (user_data);
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkTreeIter iter;
GtkTreeModel *model;
@@ -605,9 +605,9 @@ can_use_device (NMDevice *device)
}
static gboolean
-device_combo_init (NMAWirelessDialog *self, NMDevice *device)
+device_combo_init (NMAWifiDialog *self, NMDevice *device)
{
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
const GPtrArray *devices;
GtkListStore *store;
int i, num_added = 0;
@@ -718,7 +718,7 @@ get_default_type_for_security (NMSettingWirelessSecurity *sec,
}
static void
-add_security_item (NMAWirelessDialog *self,
+add_security_item (NMAWifiDialog *self,
WirelessSecurity *sec,
GtkListStore *model,
GtkTreeIter *iter,
@@ -737,7 +737,7 @@ get_secrets_cb (NMRemoteConnection *connection,
gpointer user_data)
{
GetSecretsInfo *info = user_data;
- NMAWirelessDialogPrivate *priv;
+ NMAWifiDialogPrivate *priv;
GHashTableIter hash_iter;
gpointer key, value;
GtkTreeModel *model;
@@ -746,7 +746,7 @@ get_secrets_cb (NMRemoteConnection *connection,
if (info->canceled)
goto out;
- priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (info->self);
+ priv = NMA_WIFI_DIALOG_GET_PRIVATE (info->self);
if (priv->secrets_info == info) {
priv->secrets_info = NULL;
@@ -813,9 +813,9 @@ out:
}
static gboolean
-security_combo_init (NMAWirelessDialog *self, gboolean secrets_only)
+security_combo_init (NMAWifiDialog *self, gboolean secrets_only)
{
- NMAWirelessDialogPrivate *priv;
+ NMAWifiDialogPrivate *priv;
GtkListStore *sec_model;
GtkTreeIter iter;
guint32 ap_flags = 0;
@@ -833,7 +833,7 @@ security_combo_init (NMAWirelessDialog *self, gboolean secrets_only)
g_return_val_if_fail (self != NULL, FALSE);
- priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
g_return_val_if_fail (priv->device != NULL, FALSE);
g_return_val_if_fail (priv->sec_combo != NULL, FALSE);
@@ -1009,8 +1009,8 @@ security_combo_init (NMAWirelessDialog *self, gboolean secrets_only)
static gboolean
revalidate (gpointer user_data)
{
- NMAWirelessDialog *self = NMA_WIRELESS_DIALOG (user_data);
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialog *self = NMA_WIFI_DIALOG (user_data);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
priv->revalidate_id = 0;
security_combo_changed (priv->sec_combo, self);
@@ -1018,13 +1018,13 @@ revalidate (gpointer user_data)
}
static gboolean
-internal_init (NMAWirelessDialog *self,
+internal_init (NMAWifiDialog *self,
NMConnection *specific_connection,
NMDevice *specific_device,
gboolean secrets_only,
gboolean create)
{
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GtkWidget *widget;
char *label, *icon_name = "network-wireless";
gboolean security_combo_focus = FALSE;
@@ -1070,7 +1070,7 @@ internal_init (NMAWirelessDialog *self,
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox1"));
if (!widget) {
- g_warning ("Couldn't find wireless_dialog widget.");
+ g_warning ("Couldn't find Wi-Fi_dialog widget.");
return FALSE;
}
gtk_widget_unparent (widget);
@@ -1171,11 +1171,11 @@ internal_init (NMAWirelessDialog *self,
}
NMConnection *
-nma_wireless_dialog_get_connection (NMAWirelessDialog *self,
- NMDevice **out_device,
- NMAccessPoint **ap)
+nma_wifi_dialog_get_connection (NMAWifiDialog *self,
+ NMDevice **out_device,
+ NMAccessPoint **ap)
{
- NMAWirelessDialogPrivate *priv;
+ NMAWifiDialogPrivate *priv;
GtkWidget *combo;
GtkTreeModel *model;
WirelessSecurity *sec = NULL;
@@ -1185,7 +1185,7 @@ nma_wireless_dialog_get_connection (NMAWirelessDialog *self,
g_return_val_if_fail (self != NULL, NULL);
- priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
if (!priv->connection) {
NMSettingConnection *s_con;
@@ -1249,15 +1249,15 @@ nma_wireless_dialog_get_connection (NMAWirelessDialog *self,
}
GtkWidget *
-nma_wireless_dialog_new (NMClient *client,
- NMRemoteSettings *settings,
- NMConnection *connection,
- NMDevice *device,
- NMAccessPoint *ap,
- gboolean secrets_only)
+nma_wifi_dialog_new (NMClient *client,
+ NMRemoteSettings *settings,
+ NMConnection *connection,
+ NMDevice *device,
+ NMAccessPoint *ap,
+ gboolean secrets_only)
{
- NMAWirelessDialog *self;
- NMAWirelessDialogPrivate *priv;
+ NMAWifiDialog *self;
+ NMAWifiDialogPrivate *priv;
guint32 dev_caps;
g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
@@ -1271,9 +1271,9 @@ nma_wireless_dialog_new (NMClient *client,
g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), NULL);
}
- self = NMA_WIRELESS_DIALOG (g_object_new (NMA_TYPE_WIRELESS_DIALOG, NULL));
+ self = NMA_WIFI_DIALOG (g_object_new (NMA_TYPE_WIFI_DIALOG, NULL));
if (self) {
- priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
priv->client = g_object_ref (client);
priv->settings = g_object_ref (settings);
@@ -1296,17 +1296,17 @@ nma_wireless_dialog_new (NMClient *client,
static GtkWidget *
internal_new_other (NMClient *client, NMRemoteSettings *settings, gboolean create)
{
- NMAWirelessDialog *self;
- NMAWirelessDialogPrivate *priv;
+ NMAWifiDialog *self;
+ NMAWifiDialogPrivate *priv;
g_return_val_if_fail (NM_IS_CLIENT (client), NULL);
g_return_val_if_fail (NM_IS_REMOTE_SETTINGS (settings), NULL);
- self = NMA_WIRELESS_DIALOG (g_object_new (NMA_TYPE_WIRELESS_DIALOG, NULL));
+ self = NMA_WIFI_DIALOG (g_object_new (NMA_TYPE_WIFI_DIALOG, NULL));
if (!self)
return NULL;
- priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
priv->client = g_object_ref (client);
priv->settings = g_object_ref (settings);
@@ -1324,21 +1324,21 @@ internal_new_other (NMClient *client, NMRemoteSettings *settings, gboolean creat
}
GtkWidget *
-nma_wireless_dialog_new_for_other (NMClient *client, NMRemoteSettings *settings)
+nma_wifi_dialog_new_for_other (NMClient *client, NMRemoteSettings *settings)
{
return internal_new_other (client, settings, FALSE);
}
GtkWidget *
-nma_wireless_dialog_new_for_create (NMClient *client, NMRemoteSettings *settings)
+nma_wifi_dialog_new_for_create (NMClient *client, NMRemoteSettings *settings)
{
return internal_new_other (client, settings, TRUE);
}
GtkWidget *
-nma_wireless_dialog_nag_user (NMAWirelessDialog *self)
+nma_wifi_dialog_nag_user (NMAWifiDialog *self)
{
- NMAWirelessDialogPrivate *priv;
+ NMAWifiDialogPrivate *priv;
GtkWidget *combo, *nag;
GtkTreeModel *model;
GtkTreeIter iter;
@@ -1346,7 +1346,7 @@ nma_wireless_dialog_nag_user (NMAWirelessDialog *self)
g_return_val_if_fail (self != NULL, NULL);
- priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
combo = GTK_WIDGET (gtk_builder_get_object (priv->builder, "security_combo"));
g_return_val_if_fail (combo != NULL, NULL);
@@ -1369,9 +1369,9 @@ nma_wireless_dialog_nag_user (NMAWirelessDialog *self)
}
static void
-nma_wireless_dialog_init (NMAWirelessDialog *self)
+nma_wifi_dialog_init (NMAWifiDialog *self)
{
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (self);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (self);
GError *error = NULL;
priv->builder = gtk_builder_new ();
@@ -1385,10 +1385,10 @@ nma_wireless_dialog_init (NMAWirelessDialog *self)
static void
dispose (GObject *object)
{
- NMAWirelessDialogPrivate *priv = NMA_WIRELESS_DIALOG_GET_PRIVATE (object);
+ NMAWifiDialogPrivate *priv = NMA_WIFI_DIALOG_GET_PRIVATE (object);
if (priv->disposed) {
- G_OBJECT_CLASS (nma_wireless_dialog_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nma_wifi_dialog_parent_class)->dispose (object);
return;
}
@@ -1419,15 +1419,15 @@ dispose (GObject *object)
if (priv->revalidate_id)
g_source_remove (priv->revalidate_id);
- G_OBJECT_CLASS (nma_wireless_dialog_parent_class)->dispose (object);
+ G_OBJECT_CLASS (nma_wifi_dialog_parent_class)->dispose (object);
}
static void
-nma_wireless_dialog_class_init (NMAWirelessDialogClass *nmad_class)
+nma_wifi_dialog_class_init (NMAWifiDialogClass *nmad_class)
{
GObjectClass *object_class = G_OBJECT_CLASS (nmad_class);
- g_type_class_add_private (nmad_class, sizeof (NMAWirelessDialogPrivate));
+ g_type_class_add_private (nmad_class, sizeof (NMAWifiDialogPrivate));
/* virtual methods */
object_class->dispose = dispose;
diff --git a/src/libnm-gtk/nm-wifi-dialog.h b/src/libnm-gtk/nm-wifi-dialog.h
new file mode 100644
index 0000000..fc17848
--- /dev/null
+++ b/src/libnm-gtk/nm-wifi-dialog.h
@@ -0,0 +1,80 @@
+/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
+ *
+ * Dan Williams <dcbw redhat com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * (C) Copyright 2007 - 2012 Red Hat, Inc.
+ */
+
+
+/* WARNING: this file is private API between nm-applet and various GNOME
+ * bits; it may change without notice and is not guaranteed to be stable.
+ */
+
+#ifndef NMA_WIFI_DIALOG_H
+#define NMA_WIFI_DIALOG_H
+
+#include <gtk/gtk.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#include <nm-connection.h>
+#include <nm-device.h>
+#include <nm-access-point.h>
+#include <nm-remote-settings.h>
+
+#define NMA_TYPE_WIFI_DIALOG (nma_wifi_dialog_get_type ())
+#define NMA_WIFI_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMA_TYPE_WIFI_DIALOG, NMAWifiDialog))
+#define NMA_WIFI_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NMA_TYPE_WIFI_DIALOG, NMAWifiDialogClass))
+#define NMA_IS_WIFI_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NMA_TYPE_WIFI_DIALOG))
+#define NMA_IS_WIFI_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NMA_TYPE_WIFI_DIALOG))
+#define NMA_WIFI_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NMA_TYPE_WIFI_DIALOG, NMAWifiDialogClass))
+
+typedef struct {
+ GtkDialog parent;
+} NMAWifiDialog;
+
+typedef struct {
+ GtkDialogClass parent;
+} NMAWifiDialogClass;
+
+GType nma_wifi_dialog_get_type (void);
+
+GtkWidget *nma_wifi_dialog_new (NMClient *client,
+ NMRemoteSettings *settings,
+ NMConnection *connection,
+ NMDevice *device,
+ NMAccessPoint *ap,
+ gboolean secrets_only);
+
+GtkWidget *nma_wifi_dialog_new_for_other (NMClient *client,
+ NMRemoteSettings *settings);
+
+GtkWidget *nma_wifi_dialog_new_for_create (NMClient *client,
+ NMRemoteSettings *settings);
+
+NMConnection * nma_wifi_dialog_get_connection (NMAWifiDialog *dialog,
+ NMDevice **device,
+ NMAccessPoint **ap);
+
+GtkWidget * nma_wifi_dialog_nag_user (NMAWifiDialog *dialog);
+
+void nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *dialog, gboolean ignored);
+
+gboolean nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *dialog);
+
+#endif /* NMA_WIFI_DIALOG_H */
+
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 958ab33..ab5c505 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -87,15 +87,15 @@ GdkPixbuf *
mobile_helper_get_quality_icon (guint32 quality, NMApplet *applet)
{
if (quality > 80)
- return nma_icon_check_and_load ("nm-signal-100", &applet->wireless_100_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-100", &applet->wifi_100_icon, applet);
else if (quality > 55)
- return nma_icon_check_and_load ("nm-signal-75", &applet->wireless_75_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-75", &applet->wifi_75_icon, applet);
else if (quality > 30)
- return nma_icon_check_and_load ("nm-signal-50", &applet->wireless_50_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-50", &applet->wifi_50_icon, applet);
else if (quality > 5)
- return nma_icon_check_and_load ("nm-signal-25", &applet->wireless_25_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-25", &applet->wifi_25_icon, applet);
- return nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet);
+ return nma_icon_check_and_load ("nm-signal-00", &applet->wifi_00_icon, applet);
}
GdkPixbuf *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
