[gnome-initial-setup] network: Advance to the next page automatically if we don't have a wifi device
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] network: Advance to the next page automatically if we don't have a wifi device
- Date: Thu, 26 Jul 2012 06:41:22 +0000 (UTC)
commit 32287b2522a2f0a0b34ef8c3dc84aedc605cbacb
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jul 25 13:57:07 2012 -0300
network: Advance to the next page automatically if we don't have a wifi device
We don't need to show a blank page telling people to hit "Next"
.../pages/network/gis-network-page.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/gnome-initial-setup/pages/network/gis-network-page.c b/gnome-initial-setup/pages/network/gis-network-page.c
index 4576877..2ec59b1 100644
--- a/gnome-initial-setup/pages/network/gis-network-page.c
+++ b/gnome-initial-setup/pages/network/gis-network-page.c
@@ -26,6 +26,8 @@ typedef struct _NetworkData NetworkData;
#define WID(name) OBJ(GtkWidget*,name)
struct _NetworkData {
+ SetupData *setup;
+
GtkBuilder *builder;
/* network data */
@@ -319,11 +321,12 @@ refresh_without_device (NetworkData *data)
spinner = WID("no-network-spinner");
if (nm_client_get_state (data->nm_client) == NM_STATE_CONNECTED_GLOBAL)
- gtk_label_set_text (GTK_LABEL (label), _("Wireless network is not available, but we are connected anyway."));
- else if (data->nm_device != NULL)
- gtk_label_set_text (GTK_LABEL (label), _("Network is not available, make sure to turn airplane mode off."));
+ /* advance page */
+ gis_assistant_next_page (gis_get_assistant (data->setup));
+ if (data->nm_device != NULL)
+ gtk_label_set_text (GTK_LABEL (label), _("Network is not available."));
else
- gtk_label_set_text (GTK_LABEL (label), _("No network devices found"));
+ gtk_label_set_text (GTK_LABEL (label), _("No network devices found."));
gtk_widget_hide (swin);
gtk_widget_hide (spinner);
@@ -631,6 +634,8 @@ gis_prepare_network_page (SetupData *setup)
GError *error;
NetworkData *data = g_slice_new0 (NetworkData);
GisAssistant *assistant = gis_get_assistant (setup);
+
+ data->setup = setup;
data->builder = gis_builder ("gis-network-page");
col = OBJ(GtkTreeViewColumn*, "network-list-column");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]