From ed2353bf1281e001a0d22e34ae253af4d8ba8a49 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Wed, 15 Dec 2010 19:59:26 +0000 Subject: [PATCH] network: populate some of the data for mobile broadband connections --- panels/network/cc-network-panel.c | 33 +++++++++++++++++++++++++++++++ panels/network/network.ui | 10 +++++----- 2 files changed, 38 insertions(+), 5 deletions(-) diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c index 2c2edeeb7..ea640de6c 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c @@ -842,6 +842,35 @@ panel_populate_wireless_device (CcNetworkPanel *panel, PanelDeviceItem *item) g_variant_unref (bitrate); } +/** + * panel_populate_mobilebb_device: + **/ +static void +panel_populate_mobilebb_device (CcNetworkPanel *panel, PanelDeviceItem *item) +{ + GtkWidget *widget; + GVariant *ip4; + + /* set IP */ + ip4 = g_dbus_proxy_get_cached_property (item->proxy, "Ip4Address"); + widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, + "label_wireless_ip")); + panel_set_label_for_variant_ipv4 (widget, ip4); + + /* hide until we get data from ModemManager */ + widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, + "hbox_mobilebb_provider")); + gtk_widget_set_visible (widget, FALSE); + widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, + "hbox_mobilebb_speed")); + gtk_widget_set_visible (widget, FALSE); + widget = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, + "hbox_mobilebb_mac")); + gtk_widget_set_visible (widget, FALSE); + + g_variant_unref (ip4); +} + /** * panel_devices_treeview_clicked_cb: **/ @@ -921,6 +950,10 @@ panel_devices_treeview_clicked_cb (GtkTreeSelection *selection, CcNetworkPanel * } else if (item->type == NM_DEVICE_TYPE_WIFI) { gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 1); panel_populate_wireless_device (panel, item); + } else if (item->type == NM_DEVICE_TYPE_GSM || + item->type == NM_DEVICE_TYPE_CDMA) { + gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 4); + panel_populate_mobilebb_device (panel, item); } out: diff --git a/panels/network/network.ui b/panels/network/network.ui index 8dc60ea1f..1d754b025 100644 --- a/panels/network/network.ui +++ b/panels/network/network.ui @@ -576,7 +576,7 @@ 12 6 - + True 9 @@ -602,7 +602,7 @@ - + True AA:BB:CC:DD:55:66:77:88 @@ -620,7 +620,7 @@ - + True 9 @@ -664,7 +664,7 @@ - + True 9 @@ -708,7 +708,7 @@ - + True 9