[gnome-control-center] network: Remove virtual method
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] network: Remove virtual method
- Date: Tue, 22 Oct 2019 20:18:33 +0000 (UTC)
commit 87b98346df47678eaa511b4dcb99a884e7ab51cb
Author: Robert Ancell <robert ancell canonical com>
Date: Fri Oct 18 15:23:40 2019 +1300
network: Remove virtual method
Nothing ever overrode it; just convert to a normal method.
panels/network/net-device.c | 11 ++---------
panels/network/net-device.h | 2 --
2 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/panels/network/net-device.c b/panels/network/net-device.c
index d7aecd9bd..638058a45 100644
--- a/panels/network/net-device.c
+++ b/panels/network/net-device.c
@@ -116,8 +116,8 @@ compare_mac_device_with_mac_connection (NMDevice *device,
return g_strcmp0 (mac_dev, mac_conn) == 0;
}
-static NMConnection *
-net_device_real_get_find_connection (NetDevice *self)
+NMConnection *
+net_device_get_find_connection (NetDevice *self)
{
NetDevicePrivate *priv = net_device_get_instance_private (self);
GSList *list, *iterator;
@@ -155,12 +155,6 @@ out:
return connection;
}
-NMConnection *
-net_device_get_find_connection (NetDevice *self)
-{
- return NET_DEVICE_GET_CLASS (self)->get_find_connection (self);
-}
-
static void
state_changed_cb (NetDevice *self)
{
@@ -277,7 +271,6 @@ net_device_class_init (NetDeviceClass *klass)
object_class->get_property = net_device_get_property;
object_class->set_property = net_device_set_property;
parent_class->edit = net_device_edit;
- klass->get_find_connection = net_device_real_get_find_connection;
pspec = g_param_spec_object ("nm-device", NULL, NULL,
NM_TYPE_DEVICE,
diff --git a/panels/network/net-device.h b/panels/network/net-device.h
index c265749b8..3b7652cf8 100644
--- a/panels/network/net-device.h
+++ b/panels/network/net-device.h
@@ -35,8 +35,6 @@ G_DECLARE_DERIVABLE_TYPE (NetDevice, net_device, NET, DEVICE, NetObject)
struct _NetDeviceClass
{
NetObjectClass parent_class;
-
- NMConnection * (*get_find_connection) (NetDevice *device);
};
NetDevice *net_device_new (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]