[gnome-control-center] network: Return success from panel_set_notebook_page_for_object()
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Return success from panel_set_notebook_page_for_object()
- Date: Tue, 17 Jul 2012 09:24:49 +0000 (UTC)
commit 96f7cbae9064592eb4717a9ae2bd913750ce6c9d
Author: Richard Hughes <richard hughsie com>
Date: Mon Jul 16 17:37:18 2012 +0100
network: Return success from panel_set_notebook_page_for_object()
This is so we can run the panel with both old-style and new-style NetDevices
whilst we are migrating the device kinds.
panels/network/cc-network-panel.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index de29926..cc3ab4a 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -1920,7 +1920,7 @@ nm_device_refresh_device_ui (CcNetworkPanel *panel, NetDevice *device)
out: ;
}
-static void
+static gboolean
panel_set_notebook_page_for_object (CcNetworkPanel *panel, NetObject *object)
{
CcNetworkPanelPrivate *priv = panel->priv;
@@ -1930,6 +1930,7 @@ panel_set_notebook_page_for_object (CcNetworkPanel *panel, NetObject *object)
GList *panels;
GtkNotebook *notebook;
GtkWidget *widget;
+ gboolean success = FALSE;
guint i = 0;
/* find the widget in the notebook that matches the object ID */
@@ -1948,11 +1949,13 @@ panel_set_notebook_page_for_object (CcNetworkPanel *panel, NetObject *object)
"remove_toolbutton"));
gtk_widget_set_sensitive (widget,
net_object_get_removable (object));
+ success = TRUE;
break;
}
i++;
}
g_list_free (panels);
+ return success;
}
static gboolean
@@ -1963,6 +1966,7 @@ refresh_ui_idle (gpointer data)
GtkTreeIter iter;
GtkTreeModel *model;
GtkWidget *widget;
+ gboolean ret;
NetObject *object = NULL;
CcNetworkPanelPrivate *priv = panel->priv;
@@ -1979,10 +1983,10 @@ refresh_ui_idle (gpointer data)
object = get_selected_object (panel);
/* do we have a new-style NetObject-style panel widget */
- panel_set_notebook_page_for_object (panel, object);
+ ret = panel_set_notebook_page_for_object (panel, object);
/* device */
- if (NET_IS_DEVICE (object)) {
+ if (!ret && NET_IS_DEVICE (object)) {
/* we're not yet able to remove the connection */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]