From e90ed2df8a54e6684d91b3674c461c17c97ff19e Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Wed, 23 Oct 2019 11:02:55 +1300 Subject: [PATCH] network: Stop NetDeviceEthernet deriving from NetDeviceSimple It overrode everything anyway. --- panels/network/cc-network-panel.c | 1 + panels/network/net-device-ethernet.c | 4 +- panels/network/net-device-ethernet.h | 4 +- panels/network/net-device-simple.c | 59 ++++++++++++---------------- panels/network/net-device-simple.h | 7 +--- 5 files changed, 31 insertions(+), 44 deletions(-) diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c index 80ecb7f0a..6354b3456 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c @@ -32,6 +32,7 @@ #include "net-device.h" #include "net-device-mobile.h" +#include "net-device-simple.h" #include "net-device-wifi.h" #include "net-device-ethernet.h" #include "net-object.h" diff --git a/panels/network/net-device-ethernet.c b/panels/network/net-device-ethernet.c index 15a5ae2ce..55eab37cd 100644 --- a/panels/network/net-device-ethernet.c +++ b/panels/network/net-device-ethernet.c @@ -37,7 +37,7 @@ struct _NetDeviceEthernet { - NetDeviceSimple parent; + NetDevice parent; GtkBuilder *builder; GtkButton *add_profile_button; @@ -55,7 +55,7 @@ struct _NetDeviceEthernet GHashTable *connections; }; -G_DEFINE_TYPE (NetDeviceEthernet, net_device_ethernet, NET_TYPE_DEVICE_SIMPLE) +G_DEFINE_TYPE (NetDeviceEthernet, net_device_ethernet, NET_TYPE_DEVICE) static GtkWidget * device_ethernet_add_to_stack (NetObject *object, diff --git a/panels/network/net-device-ethernet.h b/panels/network/net-device-ethernet.h index 7d1190839..3190dc9ad 100644 --- a/panels/network/net-device-ethernet.h +++ b/panels/network/net-device-ethernet.h @@ -23,12 +23,12 @@ #include -#include "net-device-simple.h" +#include "net-device.h" G_BEGIN_DECLS #define NET_TYPE_DEVICE_ETHERNET (net_device_ethernet_get_type ()) -G_DECLARE_FINAL_TYPE (NetDeviceEthernet, net_device_ethernet, NET, DEVICE_ETHERNET, NetDeviceSimple) +G_DECLARE_FINAL_TYPE (NetDeviceEthernet, net_device_ethernet, NET, DEVICE_ETHERNET, NetDevice) NetDeviceEthernet *net_device_ethernet_new (CcPanel *panel, GCancellable *cancellable, diff --git a/panels/network/net-device-simple.c b/panels/network/net-device-simple.c index 0b1e70d32..fa4e46288 100644 --- a/panels/network/net-device-simple.c +++ b/panels/network/net-device-simple.c @@ -31,7 +31,7 @@ #include "net-device-simple.h" -typedef struct +struct _NetDeviceSimple { GtkBuilder *builder; GtkBox *box; @@ -41,18 +41,16 @@ typedef struct GtkSeparator *separator; gboolean updating_device; -} NetDeviceSimplePrivate; +}; -G_DEFINE_TYPE_WITH_PRIVATE (NetDeviceSimple, net_device_simple, NET_TYPE_DEVICE) +G_DEFINE_TYPE (NetDeviceSimple, net_device_simple, NET_TYPE_DEVICE) void net_device_simple_set_show_separator (NetDeviceSimple *self, gboolean show_separator) { - NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); - /* add widgets to size group */ - gtk_widget_set_visible (GTK_WIDGET (priv->separator), show_separator); + gtk_widget_set_visible (GTK_WIDGET (self->separator), show_separator); } static GtkWidget * @@ -61,11 +59,10 @@ device_simple_proxy_add_to_stack (NetObject *object, GtkSizeGroup *heading_size_group) { NetDeviceSimple *self = NET_DEVICE_SIMPLE (object); - NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); /* add widgets to size group */ - gtk_stack_add_named (stack, GTK_WIDGET (priv->box), net_object_get_id (object)); - return GTK_WIDGET (priv->box); + gtk_stack_add_named (stack, GTK_WIDGET (self->box), net_object_get_id (object)); + return GTK_WIDGET (self->box); } static void @@ -73,9 +70,7 @@ update_off_switch_from_device_state (GtkSwitch *sw, NMDeviceState state, NetDeviceSimple *self) { - NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); - - priv->updating_device = TRUE; + self->updating_device = TRUE; switch (state) { case NM_DEVICE_STATE_UNMANAGED: case NM_DEVICE_STATE_UNAVAILABLE: @@ -88,30 +83,29 @@ update_off_switch_from_device_state (GtkSwitch *sw, gtk_switch_set_active (sw, TRUE); break; } - priv->updating_device = FALSE; + self->updating_device = FALSE; } static void nm_device_simple_refresh_ui (NetDeviceSimple *self) { - NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); NMDevice *nm_device; NMDeviceState state; nm_device = net_device_get_nm_device (NET_DEVICE (self)); /* set device kind */ - g_object_bind_property (self, "title", priv->device_label, "label", 0); + g_object_bind_property (self, "title", self->device_label, "label", 0); /* set up the device on/off switch */ state = nm_device_get_state (nm_device); - gtk_widget_set_visible (GTK_WIDGET (priv->device_off_switch), + gtk_widget_set_visible (GTK_WIDGET (self->device_off_switch), state != NM_DEVICE_STATE_UNAVAILABLE && state != NM_DEVICE_STATE_UNMANAGED); - update_off_switch_from_device_state (priv->device_off_switch, state, self); + update_off_switch_from_device_state (self->device_off_switch, state, self); /* set up the Options button */ - gtk_widget_set_visible (GTK_WIDGET (priv->options_button), state != NM_DEVICE_STATE_UNMANAGED && g_find_program_in_path ("nm-connection-editor") != NULL); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && g_find_program_in_path ("nm-connection-editor") != NULL); } static void @@ -124,7 +118,6 @@ device_simple_refresh (NetObject *object) static void device_off_toggled (NetDeviceSimple *self) { - NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); const GPtrArray *acs; gboolean active; gint i; @@ -132,10 +125,10 @@ device_off_toggled (NetDeviceSimple *self) NMConnection *connection; NMClient *client; - if (priv->updating_device) + if (self->updating_device) return; - active = gtk_switch_get_active (priv->device_off_switch); + active = gtk_switch_get_active (self->device_off_switch); if (active) { client = net_object_get_client (NET_OBJECT (self)); connection = net_device_get_find_connection (NET_DEVICE (self)); @@ -194,9 +187,8 @@ static void net_device_simple_finalize (GObject *object) { NetDeviceSimple *self = NET_DEVICE_SIMPLE (object); - NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); - g_clear_object (&priv->builder); + g_clear_object (&self->builder); G_OBJECT_CLASS (net_device_simple_parent_class)->finalize (object); } @@ -216,11 +208,10 @@ net_device_simple_class_init (NetDeviceSimpleClass *klass) static void net_device_simple_init (NetDeviceSimple *self) { - NetDeviceSimplePrivate *priv = net_device_simple_get_instance_private (self); g_autoptr(GError) error = NULL; - priv->builder = gtk_builder_new (); - gtk_builder_add_from_resource (priv->builder, + self->builder = gtk_builder_new (); + gtk_builder_add_from_resource (self->builder, "/org/gnome/control-center/network/network-simple.ui", &error); if (error != NULL) { @@ -228,19 +219,19 @@ net_device_simple_init (NetDeviceSimple *self) return; } - priv->box = GTK_BOX (gtk_builder_get_object (priv->builder, "box")); - priv->device_label = GTK_LABEL (gtk_builder_get_object (priv->builder, "device_label")); - priv->device_off_switch = GTK_SWITCH (gtk_builder_get_object (priv->builder, "device_off_switch")); - priv->options_button = GTK_BUTTON (gtk_builder_get_object (priv->builder, "options_button")); - priv->separator = GTK_SEPARATOR (gtk_builder_get_object (priv->builder, "separator")); + self->box = GTK_BOX (gtk_builder_get_object (self->builder, "box")); + self->device_label = GTK_LABEL (gtk_builder_get_object (self->builder, "device_label")); + self->device_off_switch = GTK_SWITCH (gtk_builder_get_object (self->builder, "device_off_switch")); + self->options_button = GTK_BUTTON (gtk_builder_get_object (self->builder, "options_button")); + self->separator = GTK_SEPARATOR (gtk_builder_get_object (self->builder, "separator")); /* setup simple combobox model */ - g_signal_connect_swapped (priv->device_off_switch, "notify::active", + g_signal_connect_swapped (self->device_off_switch, "notify::active", G_CALLBACK (device_off_toggled), self); - g_signal_connect_swapped (priv->options_button, "clicked", + g_signal_connect_swapped (self->options_button, "clicked", G_CALLBACK (edit_connection), self); - gtk_widget_set_visible (GTK_WIDGET (priv->options_button), g_find_program_in_path ("nm-connection-editor") != NULL); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), g_find_program_in_path ("nm-connection-editor") != NULL); } NetDeviceSimple * diff --git a/panels/network/net-device-simple.h b/panels/network/net-device-simple.h index 277474dd8..c4d9017a0 100644 --- a/panels/network/net-device-simple.h +++ b/panels/network/net-device-simple.h @@ -29,12 +29,7 @@ G_BEGIN_DECLS #define NET_TYPE_DEVICE_SIMPLE (net_device_simple_get_type ()) -G_DECLARE_DERIVABLE_TYPE (NetDeviceSimple, net_device_simple, NET, DEVICE_SIMPLE, NetDevice) - -struct _NetDeviceSimpleClass -{ - NetDeviceClass parent_class; -}; +G_DECLARE_FINAL_TYPE (NetDeviceSimple, net_device_simple, NET, DEVICE_SIMPLE, NetDevice) NetDeviceSimple *net_device_simple_new (CcPanel *panel, GCancellable *cancellable,