[gnome-control-center/wifi-refinements] network: Don't override cell renderer properties

[Matthias Clasen <matthiasc src gnome org>]

commit 2eb8d9c0842b0e8631691dd470bc206523674e57
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Sep 8 23:32:21 2012 -0400

    network: Don't override cell renderer properties
    
    The mode cell renderer had a property named 'mode', which
    clashed with the GtkCellRenderer property of that name, which
    confused the treeview keynav.
    
    Rename the new property to ap-mode.

 panels/network/net-device-wifi.c          |    2 +-
 panels/network/panel-cell-renderer-mode.c |   10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 43cfeec..803c5df 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -2077,7 +2077,7 @@ net_device_wifi_init (NetDeviceWifi *device_wifi)
                                     FALSE);
         g_object_set (renderer, "follow-state", TRUE, NULL);
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (column), renderer,
-                                        "mode", COLUMN_MODE,
+                                        "ap-mode", COLUMN_MODE,
                                         NULL);
 
         renderer = gtk_cell_renderer_text_new ();
diff --git a/panels/network/panel-cell-renderer-mode.c b/panels/network/panel-cell-renderer-mode.c
index 38fbd14..7bc443d 100644
--- a/panels/network/panel-cell-renderer-mode.c
+++ b/panels/network/panel-cell-renderer-mode.c
@@ -29,7 +29,7 @@
 
 enum {
         PROP_0,
-        PROP_MODE,
+        PROP_AP_MODE,
         PROP_LAST
 };
 
@@ -47,7 +47,7 @@ panel_cell_renderer_mode_get_property (GObject *object, guint param_id,
         PanelCellRendererMode *renderer = PANEL_CELL_RENDERER_MODE (object);
 
         switch (param_id) {
-        case PROP_MODE:
+        case PROP_AP_MODE:
                 g_value_set_uint (value, renderer->mode);
                 break;
         default:
@@ -80,7 +80,7 @@ panel_cell_renderer_mode_set_property (GObject *object, guint param_id,
         PanelCellRendererMode *renderer = PANEL_CELL_RENDERER_MODE (object);
 
         switch (param_id) {
-        case PROP_MODE:
+        case PROP_AP_MODE:
                 renderer->mode = g_value_get_uint (value);
                 panel_cell_renderer_set_name (renderer);
                 break;
@@ -116,8 +116,8 @@ panel_cell_renderer_mode_class_init (PanelCellRendererModeClass *class)
         object_class->get_property = panel_cell_renderer_mode_get_property;
         object_class->set_property = panel_cell_renderer_mode_set_property;
 
-        g_object_class_install_property (object_class, PROP_MODE,
-                                         g_param_spec_uint ("mode", NULL,
+        g_object_class_install_property (object_class, PROP_AP_MODE,
+                                         g_param_spec_uint ("ap-mode", NULL,
                                                             NULL,
                                                             0, G_MAXUINT, 0,
                                                             G_PARAM_READWRITE));