[gnome-control-center/gbsneto/cleanup-network-panel: 16/23] net-proxy: 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: 16/23] net-proxy: Remove macro to get private field
- Date: Mon, 5 Nov 2018 10:36:14 +0000 (UTC)
commit 75f57d38fc83db61662468539c2e5c5539f82ac3
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Oct 31 21:49:15 2018 -0300
net-proxy: 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-proxy.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/panels/network/net-proxy.c b/panels/network/net-proxy.c
index 9bf164dd1..f3f17865a 100644
--- a/panels/network/net-proxy.c
+++ b/panels/network/net-proxy.c
@@ -27,8 +27,6 @@
#include "net-proxy.h"
-#define NET_PROXY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NET_TYPE_PROXY, NetProxyPrivate))
-
typedef enum
{
MODE_DISABLED,
@@ -44,7 +42,7 @@ struct _NetProxyPrivate
GtkToggleButton *mode_radios[3];
};
-G_DEFINE_TYPE (NetProxy, net_proxy, NET_TYPE_OBJECT)
+G_DEFINE_TYPE_WITH_PRIVATE (NetProxy, net_proxy, NET_TYPE_OBJECT)
static const gchar *
panel_get_string_for_value (ProxyMode mode)
@@ -235,7 +233,6 @@ net_proxy_class_init (NetProxyClass *klass)
object_class->finalize = net_proxy_finalize;
parent_class->add_to_stack = net_proxy_add_to_stack;
- g_type_class_add_private (klass, sizeof (NetProxyPrivate));
}
static gboolean
@@ -296,7 +293,7 @@ net_proxy_init (NetProxy *proxy)
GError *error = NULL;
guint i;
- proxy->priv = NET_PROXY_GET_PRIVATE (proxy);
+ proxy->priv = net_proxy_get_instance_private (proxy);
proxy->priv->builder = gtk_builder_new ();
gtk_builder_add_from_resource (proxy->priv->builder,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]