[gnome-control-center] network: Put the ssid in the detail page header
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Put the ssid in the detail page header
- Date: Wed, 8 Aug 2012 04:49:12 +0000 (UTC)
commit 96682e13684d7b0e3fd17a63635006b86bb9b53e
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Aug 8 00:32:34 2012 -0400
network: Put the ssid in the detail page header
panels/network/net-device-wifi.c | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index e6f283b..5e6cded 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -677,6 +677,7 @@ nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi)
NMDeviceState state;
NMClient *client;
NetDeviceWifiPrivate *priv = device_wifi->priv;
+ gchar *title;
nm_device = net_device_get_nm_device (NET_DEVICE (device_wifi));
state = nm_device_get_state (nm_device);
@@ -684,11 +685,6 @@ nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi)
if (is_hotspot)
nm_device_wifi_refresh_hotspot (device_wifi);
- /* set device kind */
- widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, "label_device"));
- gtk_label_set_label (GTK_LABEL (widget),
- panel_device_to_localized_string (nm_device));
-
/* set up the device on/off switch */
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, "device_off_switch"));
gtk_widget_show (widget);
@@ -748,6 +744,22 @@ nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi)
"strength",
str);
+ title = NULL;
+ if (active_ap != NULL) {
+ const GByteArray *ssid;
+ ssid = nm_access_point_get_ssid (active_ap);
+ if (ssid) {
+ const gchar *ssid_text;
+ ssid_text = nm_utils_escape_ssid (ssid->data, ssid->len);
+ title = g_markup_escape_text (ssid_text, -1);
+ }
+ }
+
+ widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder, "label_device"));
+ gtk_label_set_label (GTK_LABEL (widget),
+ title ? title : panel_device_to_localized_string (nm_device));
+ g_free (title);
+
/* only disconnect when connection active */
widget = GTK_WIDGET (gtk_builder_get_object (device_wifi->priv->builder,
"button_disconnect"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]