[gnome-control-center] Use symbolic icons for network devices

[Bastien Nocera <hadess src gnome org>]

commit e2094d8075cf6ad6586162285fbf4e7fac5f1bbc
Author: William Jon McCann <jmccann redhat com>
Date:   Tue Dec 4 11:00:31 2012 -0500

    Use symbolic icons for network devices
    
    This is consistent with the guideline to use symbolic icons for
    classes and reserve full color icons for "things" like apps, people,
    documents, pages, etc.
    
    It is also consistent with how these devices are displayed in the
    network menu, notifications, and dialogs.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=689638

 panels/network/cc-network-panel.c |   13 +++++++++----
 panels/network/net-proxy.c        |    2 +-
 panels/network/network-proxy.ui   |    2 +-
 panels/network/network-vpn.ui     |    2 +-
 panels/network/panel-common.c     |   10 +++++-----
 5 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
index ace0b0f..ebaee3d 100644
--- a/panels/network/cc-network-panel.c
+++ b/panels/network/cc-network-panel.c
@@ -764,8 +764,13 @@ panel_add_devices_columns (CcNetworkPanel *panel, GtkTreeView *treeview)
 
         /* image */
         renderer = gtk_cell_renderer_pixbuf_new ();
-        g_object_set (renderer, "stock-size", gtk_icon_size_from_name ("cc-sidebar-list"), NULL);
-        gtk_cell_renderer_set_padding (renderer, 4, 4);
+        g_object_set (renderer,
+                      "width", 32,
+                      "xalign", 1.0,
+                      "stock-size", GTK_ICON_SIZE_MENU,
+                      "follow-state", TRUE,
+                      NULL);
+        gtk_cell_renderer_set_padding (renderer, 4, 10);
 
         column = gtk_tree_view_column_new_with_attributes ("icon", renderer,
                                                            "icon-name", PANEL_DEVICES_COLUMN_ICON,
@@ -866,7 +871,7 @@ panel_add_proxy_device (CcNetworkPanel *panel)
         gtk_list_store_append (liststore_devices, &iter);
         gtk_list_store_set (liststore_devices,
                             &iter,
-                            PANEL_DEVICES_COLUMN_ICON, "preferences-system-network",
+                            PANEL_DEVICES_COLUMN_ICON, "preferences-system-network-symbolic",
                             PANEL_DEVICES_COLUMN_SORT, "9",
                             PANEL_DEVICES_COLUMN_OBJECT, proxy,
                             -1);
@@ -1046,7 +1051,7 @@ panel_add_vpn_device (CcNetworkPanel *panel, NMConnection *connection)
         gtk_list_store_append (liststore_devices, &iter);
         gtk_list_store_set (liststore_devices,
                             &iter,
-                            PANEL_DEVICES_COLUMN_ICON, "network-vpn",
+                            PANEL_DEVICES_COLUMN_ICON, "network-vpn-symbolic",
                             PANEL_DEVICES_COLUMN_SORT, "5",
                             PANEL_DEVICES_COLUMN_OBJECT, net_vpn,
                             -1);
diff --git a/panels/network/net-proxy.c b/panels/network/net-proxy.c
index 5e8505b..28898a1 100644
--- a/panels/network/net-proxy.c
+++ b/panels/network/net-proxy.c
@@ -398,7 +398,7 @@ net_proxy_init (NetProxy *proxy)
         widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder,
                                                      "image_proxy_device"));
         gtk_image_set_from_icon_name (GTK_IMAGE (widget),
-                                      "preferences-system-network",
+                                      "preferences-system-network-symbolic",
                                       GTK_ICON_SIZE_DIALOG);
         widget = GTK_WIDGET (gtk_builder_get_object (proxy->priv->builder,
                                                      "label_proxy_device"));
diff --git a/panels/network/network-proxy.ui b/panels/network/network-proxy.ui
index be4aa75..4e5a722 100644
--- a/panels/network/network-proxy.ui
+++ b/panels/network/network-proxy.ui
@@ -57,7 +57,7 @@
             <property name="valign">start</property>
             <property name="xalign">1</property>
             <property name="pixel_size">48</property>
-            <property name="icon_name">preferences-system-network</property>
+            <property name="icon_name">preferences-system-network-symbolic</property>
             <property name="icon-size">6</property>
           </object>
           <packing>
diff --git a/panels/network/network-vpn.ui b/panels/network/network-vpn.ui
index 565461c..66f30bf 100644
--- a/panels/network/network-vpn.ui
+++ b/panels/network/network-vpn.ui
@@ -38,7 +38,7 @@
                 <property name="valign">start</property>
                 <property name="xalign">1</property>
                 <property name="pixel_size">48</property>
-                <property name="icon_name">network-vpn</property>
+                <property name="icon_name">network-vpn-symbolic</property>
                 <property name="icon-size">6</property>
               </object>
               <packing>
diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c
index 8fd2fc8..584172a 100644
--- a/panels/network/panel-common.c
+++ b/panels/network/panel-common.c
@@ -45,25 +45,25 @@ panel_device_to_icon_name (NMDevice *device)
         case NM_DEVICE_TYPE_ETHERNET:
                 state = nm_device_get_state (device);
                 if (state == NM_DEVICE_STATE_UNAVAILABLE) {
-                        value = "network-wired-disconnected";
+                        value = "network-wired-disconnected-symbolic";
                 } else {
-                        value = "network-wired";
+                        value = "network-wired-symbolic";
                 }
                 break;
         case NM_DEVICE_TYPE_WIFI:
         case NM_DEVICE_TYPE_BT:
         case NM_DEVICE_TYPE_OLPC_MESH:
-                value = "network-wireless";
+                value = "network-wireless-signal-excellent-symbolic";
                 break;
         case NM_DEVICE_TYPE_MODEM:
                 caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
                 if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) ||
                     (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
-                        value = "network-wireless";
+                        value = "network-wireless-signal-excellent-symbolic";
                 }
                 break;
         default:
-                value = "network-idle";
+                value = "network-idle-symbolic";
                 break;
         }
         return value;