summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/settings/nm-settings-plugin.c24
-rw-r--r--src/settings/nm-settings-plugin.h21
-rw-r--r--src/settings/plugins/ibft/nms-ibft-plugin.c35
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h3
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c35
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-plugin.c38
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-plugin.c35
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-utils.h3
8 files changed, 0 insertions, 194 deletions
diff --git a/src/settings/nm-settings-plugin.c b/src/settings/nm-settings-plugin.c
index 234e345f3c..f6dd2cfbf0 100644
--- a/src/settings/nm-settings-plugin.c
+++ b/src/settings/nm-settings-plugin.c
@@ -35,30 +35,6 @@ nm_settings_plugin_default_init (NMSettingsPluginInterface *g_iface)
if (initialized)
return;
- /* Properties */
- g_object_interface_install_property
- (g_iface,
- g_param_spec_string (NM_SETTINGS_PLUGIN_NAME, "", "",
- NULL,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
-
- g_object_interface_install_property
- (g_iface,
- g_param_spec_string (NM_SETTINGS_PLUGIN_INFO, "", "",
- NULL,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
-
- g_object_interface_install_property
- (g_iface,
- g_param_spec_uint (NM_SETTINGS_PLUGIN_CAPABILITIES, "", "",
- NM_SETTINGS_PLUGIN_CAP_NONE,
- NM_SETTINGS_PLUGIN_CAP_MODIFY_CONNECTIONS,
- NM_SETTINGS_PLUGIN_CAP_NONE,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
-
/* Signals */
g_signal_new (NM_SETTINGS_PLUGIN_CONNECTION_ADDED,
iface_type,
diff --git a/src/settings/nm-settings-plugin.h b/src/settings/nm-settings-plugin.h
index 8f5e3b3b27..6fba25e7ab 100644
--- a/src/settings/nm-settings-plugin.h
+++ b/src/settings/nm-settings-plugin.h
@@ -34,31 +34,10 @@ GObject * nm_settings_plugin_factory (void);
#define NM_IS_SETTINGS_PLUGIN(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTINGS_PLUGIN))
#define NM_SETTINGS_PLUGIN_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), NM_TYPE_SETTINGS_PLUGIN, NMSettingsPluginInterface))
-#define NM_SETTINGS_PLUGIN_NAME "name"
-#define NM_SETTINGS_PLUGIN_INFO "info"
-#define NM_SETTINGS_PLUGIN_CAPABILITIES "capabilities"
-
#define NM_SETTINGS_PLUGIN_UNMANAGED_SPECS_CHANGED "unmanaged-specs-changed"
#define NM_SETTINGS_PLUGIN_UNRECOGNIZED_SPECS_CHANGED "unrecognized-specs-changed"
#define NM_SETTINGS_PLUGIN_CONNECTION_ADDED "connection-added"
-typedef enum {
- NM_SETTINGS_PLUGIN_CAP_NONE = 0x00000000,
- NM_SETTINGS_PLUGIN_CAP_MODIFY_CONNECTIONS = 0x00000001,
-
- /* When adding more capabilities, be sure to update the "Capabilities"
- * property max value in nm-settings-plugin.c.
- */
-} NMSettingsPluginCapabilities;
-
-typedef enum {
- NM_SETTINGS_PLUGIN_PROP_FIRST = 0x1000,
-
- NM_SETTINGS_PLUGIN_PROP_NAME = NM_SETTINGS_PLUGIN_PROP_FIRST,
- NM_SETTINGS_PLUGIN_PROP_INFO,
- NM_SETTINGS_PLUGIN_PROP_CAPABILITIES,
-} NMSettingsPluginProp;
-
typedef struct _NMSettingsPlugin NMSettingsPlugin;
typedef struct {
diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
index ea4d15241a..77ce208f41 100644
--- a/src/settings/plugins/ibft/nms-ibft-plugin.c
+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
@@ -121,28 +121,6 @@ get_connections (NMSettingsPlugin *config)
/*****************************************************************************/
static void
-get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
- switch (prop_id) {
- case NM_SETTINGS_PLUGIN_PROP_NAME:
- g_value_set_string (value, "iBFT");
- break;
- case NM_SETTINGS_PLUGIN_PROP_INFO:
- g_value_set_string (value, "(c) 2014 Red Hat, Inc. To report bugs please use the NetworkManager mailing list.");
- break;
- case NM_SETTINGS_PLUGIN_PROP_CAPABILITIES:
- g_value_set_uint (value, NM_SETTINGS_PLUGIN_CAP_NONE);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-/*****************************************************************************/
-
-static void
init (NMSettingsPlugin *config)
{
}
@@ -175,19 +153,6 @@ nms_ibft_plugin_class_init (NMSIbftPluginClass *req_class)
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
object_class->dispose = dispose;
- object_class->get_property = get_property;
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_NAME,
- NM_SETTINGS_PLUGIN_NAME);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_INFO,
- NM_SETTINGS_PLUGIN_INFO);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_CAPABILITIES,
- NM_SETTINGS_PLUGIN_CAPABILITIES);
}
static void
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
index d850ac4e75..eaff2db4b6 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h
@@ -38,9 +38,6 @@
#define IFCFG_DIR SYSCONFDIR "/sysconfig/network-scripts"
-#define IFCFG_PLUGIN_NAME "ifcfg-rh"
-#define IFCFG_PLUGIN_INFO "(c) 2007 - 2015 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
-
#define TYPE_ETHERNET "Ethernet"
#define TYPE_WIRELESS "Wireless"
#define TYPE_INFINIBAND "InfiniBand"
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index c1e00981af..0fb77b9d20 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -998,28 +998,6 @@ config_changed_cb (NMConfig *config,
/*****************************************************************************/
static void
-get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
- switch (prop_id) {
- case NM_SETTINGS_PLUGIN_PROP_NAME:
- g_value_set_string (value, IFCFG_PLUGIN_NAME);
- break;
- case NM_SETTINGS_PLUGIN_PROP_INFO:
- g_value_set_string (value, IFCFG_PLUGIN_INFO);
- break;
- case NM_SETTINGS_PLUGIN_PROP_CAPABILITIES:
- g_value_set_uint (value, NM_SETTINGS_PLUGIN_CAP_MODIFY_CONNECTIONS);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-/*****************************************************************************/
-
-static void
init (NMSettingsPlugin *config)
{
}
@@ -1087,19 +1065,6 @@ settings_plugin_ifcfg_class_init (SettingsPluginIfcfgClass *req_class)
object_class->constructed = constructed;
object_class->dispose = dispose;
- object_class->get_property = get_property;
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_NAME,
- NM_SETTINGS_PLUGIN_NAME);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_INFO,
- NM_SETTINGS_PLUGIN_INFO);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_CAPABILITIES,
- NM_SETTINGS_PLUGIN_CAPABILITIES);
}
static void
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index bfad9d1592..8bd72d0268 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -50,9 +50,6 @@
#define ENI_INTERFACES_FILE "/etc/network/interfaces"
-#define IFUPDOWN_PLUGIN_NAME "ifupdown"
-#define IFUPDOWN_PLUGIN_INFO "(C) 2008 Canonical Ltd. To report bugs please use the NetworkManager mailing list."
-
#define IFUPDOWN_UNMANAGE_WELL_KNOWN_DEFAULT TRUE
/* #define ALWAYS_UNMANAGE TRUE */
@@ -303,28 +300,6 @@ get_unmanaged_specs (NMSettingsPlugin *config)
/*****************************************************************************/
static void
-get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
- switch (prop_id) {
- case NM_SETTINGS_PLUGIN_PROP_NAME:
- g_value_set_string (value, IFUPDOWN_PLUGIN_NAME);
- break;
- case NM_SETTINGS_PLUGIN_PROP_INFO:
- g_value_set_string (value, IFUPDOWN_PLUGIN_INFO);
- break;
- case NM_SETTINGS_PLUGIN_PROP_CAPABILITIES:
- g_value_set_uint (value, NM_SETTINGS_PLUGIN_CAP_NONE);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-/*****************************************************************************/
-
-static void
_udev_device_unref (gpointer ptr)
{
udev_device_unref (ptr);
@@ -513,19 +488,6 @@ settings_plugin_ifupdown_class_init (SettingsPluginIfupdownClass *req_class)
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
object_class->dispose = dispose;
- object_class->get_property = get_property;
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_NAME,
- NM_SETTINGS_PLUGIN_NAME);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_INFO,
- NM_SETTINGS_PLUGIN_INFO);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_CAPABILITIES,
- NM_SETTINGS_PLUGIN_CAPABILITIES);
}
static void
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
index df2c05b7cc..3723db945c 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -562,28 +562,6 @@ get_unmanaged_specs (NMSettingsPlugin *config)
/*****************************************************************************/
static void
-get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
- switch (prop_id) {
- case NM_SETTINGS_PLUGIN_PROP_NAME:
- g_value_set_string (value, NMS_KEYFILE_PLUGIN_NAME);
- break;
- case NM_SETTINGS_PLUGIN_PROP_INFO:
- g_value_set_string (value, NMS_KEYFILE_PLUGIN_INFO);
- break;
- case NM_SETTINGS_PLUGIN_PROP_CAPABILITIES:
- g_value_set_uint (value, NM_SETTINGS_PLUGIN_CAP_MODIFY_CONNECTIONS);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-/*****************************************************************************/
-
-static void
nms_keyfile_plugin_init (NMSKeyfilePlugin *plugin)
{
NMSKeyfilePluginPrivate *priv = NMS_KEYFILE_PLUGIN_GET_PRIVATE (plugin);
@@ -644,19 +622,6 @@ nms_keyfile_plugin_class_init (NMSKeyfilePluginClass *req_class)
object_class->constructed = constructed;
object_class->dispose = dispose;
- object_class->get_property = get_property;
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_NAME,
- NM_SETTINGS_PLUGIN_NAME);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_INFO,
- NM_SETTINGS_PLUGIN_INFO);
-
- g_object_class_override_property (object_class,
- NM_SETTINGS_PLUGIN_PROP_CAPABILITIES,
- NM_SETTINGS_PLUGIN_CAPABILITIES);
}
static void
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.h b/src/settings/plugins/keyfile/nms-keyfile-utils.h
index be7d668acc..cd3f42b9f9 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.h
@@ -23,9 +23,6 @@
#include "NetworkManagerUtils.h"
-#define NMS_KEYFILE_PLUGIN_NAME "keyfile"
-#define NMS_KEYFILE_PLUGIN_INFO "(c) 2007 - 2016 Red Hat, Inc. To report bugs please use the NetworkManager mailing list."
-
#define NMS_KEYFILE_CONNECTION_LOG_PATH(path) ((path) ?: "in-memory")
#define NMS_KEYFILE_CONNECTION_LOG_FMT "%s (%s,\"%s\")"
#define NMS_KEYFILE_CONNECTION_LOG_ARG(con) NMS_KEYFILE_CONNECTION_LOG_PATH (nm_settings_connection_get_filename ((NMSettingsConnection *) (con))), nm_connection_get_uuid ((NMConnection *) (con)), nm_connection_get_id ((NMConnection *) (con))
View Lorry Controller Status