[gnome-initial-setup] network: Bump the pulse only when we need to
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] network: Bump the pulse only when we need to
- Date: Mon, 30 Jul 2012 23:53:21 +0000 (UTC)
commit 8e220179b22f4f0ef0ee609d4c0d60e817bd37e9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Jul 27 06:03:43 2012 -0300
network: Bump the pulse only when we need to
Rather than bumping the pulse all the time, we should
only bump it when we need to.
.../pages/network/gis-network-page.c | 51 ++++++++++----------
1 files changed, 26 insertions(+), 25 deletions(-)
---
diff --git a/gnome-initial-setup/pages/network/gis-network-page.c b/gnome-initial-setup/pages/network/gis-network-page.c
index 2ec59b1..987d46c 100644
--- a/gnome-initial-setup/pages/network/gis-network-page.c
+++ b/gnome-initial-setup/pages/network/gis-network-page.c
@@ -165,6 +165,30 @@ get_access_point_security (NMAccessPoint *ap)
return type;
}
+static gboolean
+bump_pulse (gpointer user_data)
+{
+ NetworkData *data = user_data;
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GtkTreeModel *model;
+
+ data->pulse++;
+
+ if (data->refreshing || !gtk_tree_row_reference_valid (data->row))
+ return FALSE;
+
+ model = (GtkTreeModel *)data->ap_list;
+ path = gtk_tree_row_reference_get_path (data->row);
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_tree_path_free (path);
+ gtk_list_store_set (data->ap_list, &iter,
+ PANEL_WIRELESS_COLUMN_PULSE, data->pulse,
+ -1);
+
+ return TRUE;
+}
+
static void
add_access_point (NetworkData *data, NMAccessPoint *ap, NMAccessPoint *active)
{
@@ -227,6 +251,8 @@ add_access_point (NetworkData *data, NMAccessPoint *ap, NMAccessPoint *active)
path = gtk_tree_model_get_path (model, &iter);
data->row = gtk_tree_row_reference_new (model, path);
gtk_tree_path_free (path);
+
+ g_timeout_add (80, bump_pulse, data);
}
}
@@ -596,30 +622,6 @@ active_connections_changed (NMClient *client, GParamSpec *pspec, NetworkData *da
refresh_wireless_list (data);
}
-static gboolean
-bump_pulse (gpointer user_data)
-{
- NetworkData *data = user_data;
- GtkTreeIter iter;
- GtkTreePath *path;
- GtkTreeModel *model;
-
- data->pulse++;
-
- if (!data->refreshing &&
- gtk_tree_row_reference_valid (data->row)) {
- model = (GtkTreeModel *)data->ap_list;
- path = gtk_tree_row_reference_get_path (data->row);
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_tree_path_free (path);
- gtk_list_store_set (data->ap_list, &iter,
- PANEL_WIRELESS_COLUMN_PULSE, data->pulse,
- -1);
- }
-
- return TRUE;
-}
-
void
gis_prepare_network_page (SetupData *setup)
{
@@ -655,7 +657,6 @@ gis_prepare_network_page (SetupData *setup)
"visible", PANEL_WIRELESS_COLUMN_ACTIVATING,
"pulse", PANEL_WIRELESS_COLUMN_PULSE,
NULL);
- g_timeout_add (80, bump_pulse, data);
cell = gtk_cell_renderer_text_new ();
g_object_set (cell, "width", 400, "width-chars", 45, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]