[gnome-control-center/wip/networking2: 2/36] network: no more cell renderers

[Matthias Clasen <matthiasc src gnome org>]

commit c568db56b7d78b04dce942a1ae33602ced6422c2
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Dec 9 01:26:03 2012 -0500

    network: no more cell renderers
    
    Now that the list has been converted to a listbox, we don't
    need any of these anymore.

 panels/network/Makefile.am                     |   12 --
 panels/network/net-device-wifi.c               |   14 ++-
 panels/network/panel-cell-renderer-mode.c      |  144 ---------------------
 panels/network/panel-cell-renderer-mode.h      |   61 ---------
 panels/network/panel-cell-renderer-pixbuf.c    |   82 ------------
 panels/network/panel-cell-renderer-pixbuf.h    |   61 ---------
 panels/network/panel-cell-renderer-security.c  |  153 ----------------------
 panels/network/panel-cell-renderer-security.h  |   69 ----------
 panels/network/panel-cell-renderer-separator.c |  130 -------------------
 panels/network/panel-cell-renderer-separator.h |   62 ---------
 panels/network/panel-cell-renderer-signal.c    |  161 ------------------------
 panels/network/panel-cell-renderer-signal.h    |   61 ---------
 panels/network/panel-cell-renderer-text.c      |   82 ------------
 panels/network/panel-cell-renderer-text.h      |   61 ---------
 14 files changed, 8 insertions(+), 1145 deletions(-)
---
diff --git a/panels/network/Makefile.am b/panels/network/Makefile.am
index 3ee94bf..d4ef2f6 100644
--- a/panels/network/Makefile.am
+++ b/panels/network/Makefile.am
@@ -32,18 +32,6 @@ libnetwork_la_SOURCES =					\
 	net-vpn.h					\
 	net-proxy.c					\
 	net-proxy.h					\
-	panel-cell-renderer-mode.c			\
-	panel-cell-renderer-mode.h			\
-	panel-cell-renderer-security.c			\
-	panel-cell-renderer-security.h			\
-	panel-cell-renderer-signal.c			\
-	panel-cell-renderer-signal.h			\
-	panel-cell-renderer-separator.c			\
-	panel-cell-renderer-separator.h			\
-	panel-cell-renderer-text.c			\
-	panel-cell-renderer-text.h			\
-	panel-cell-renderer-pixbuf.c			\
-	panel-cell-renderer-pixbuf.h			\
 	network-dialogs.c				\
 	network-dialogs.h				\
 	cc-network-panel.c				\
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 16d3d1a..dd0ac52 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -38,12 +38,6 @@
 
 #include "network-dialogs.h"
 #include "panel-common.h"
-#include "panel-cell-renderer-mode.h"
-#include "panel-cell-renderer-signal.h"
-#include "panel-cell-renderer-security.h"
-#include "panel-cell-renderer-separator.h"
-#include "panel-cell-renderer-text.h"
-#include "panel-cell-renderer-pixbuf.h"
 
 #include "egg-list-box/egg-list-box.h"
 
@@ -51,6 +45,14 @@
 
 #define NET_DEVICE_WIFI_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_DEVICE_WIFI, NetDeviceWifiPrivate))
 
+typedef enum {
+  NM_AP_SEC_UNKNOWN,
+  NM_AP_SEC_NONE,
+  NM_AP_SEC_WEP,
+  NM_AP_SEC_WPA,
+  NM_AP_SEC_WPA2
+} NMAccessPointSecurity;
+
 static void nm_device_wifi_refresh_ui (NetDeviceWifi *device_wifi);
 static void show_wifi_list (NetDeviceWifi *device_wifi);
 static void populate_ap_list (NetDeviceWifi *device_wifi);