[gnome-control-center/gbsneto/cleanup-network-panel: 6/21] net-device-wifi: Remove macro to get private field
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/gbsneto/cleanup-network-panel: 6/21] net-device-wifi: Remove macro to get private field
- Date: Thu, 1 Nov 2018 03:15:06 +0000 (UTC)
commit 3b426625b5745f72de2adda3d343a7505a23e328
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Oct 31 20:22:49 2018 -0300
net-device-wifi: Remove macro to get private field
We can just use the standard, non-deprecated G_DEFINE_TYPE_WITH_PRIVATE
and avoid g_type_class_add_private(), which is deprecated now.
panels/network/net-device-wifi.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 4290ac79a..d61976402 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -39,8 +39,6 @@
#define PERIODIC_WIFI_SCAN_TIMEOUT 15
-#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,
@@ -67,7 +65,7 @@ struct _NetDeviceWifiPrivate
GCancellable *cancellable;
};
-G_DEFINE_TYPE (NetDeviceWifi, net_device_wifi, NET_TYPE_DEVICE)
+G_DEFINE_TYPE_WITH_PRIVATE (NetDeviceWifi, net_device_wifi, NET_TYPE_DEVICE)
enum {
COLUMN_CONNECTION_ID,
@@ -1667,8 +1665,6 @@ net_device_wifi_class_init (NetDeviceWifiClass *klass)
parent_class->add_to_stack = device_wifi_proxy_add_to_stack;
parent_class->refresh = device_wifi_refresh;
parent_class->edit = device_wifi_edit;
-
- g_type_class_add_private (klass, sizeof (NetDeviceWifiPrivate));
}
static void
@@ -2269,7 +2265,7 @@ net_device_wifi_init (NetDeviceWifi *device_wifi)
GtkSizeGroup *rows;
GtkSizeGroup *icons;
- device_wifi->priv = NET_DEVICE_WIFI_GET_PRIVATE (device_wifi);
+ device_wifi->priv = net_device_wifi_get_instance_private (device_wifi);
device_wifi->priv->builder = gtk_builder_new ();
gtk_builder_add_from_resource (device_wifi->priv->builder,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]