settings-plugin: drop all properties
They're not useful and just add extra noise.
This commit is contained in:
@@ -35,30 +35,6 @@ nm_settings_plugin_default_init (NMSettingsPluginInterface *g_iface)
|
|||||||
if (initialized)
|
if (initialized)
|
||||||
return;
|
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 */
|
/* Signals */
|
||||||
g_signal_new (NM_SETTINGS_PLUGIN_CONNECTION_ADDED,
|
g_signal_new (NM_SETTINGS_PLUGIN_CONNECTION_ADDED,
|
||||||
iface_type,
|
iface_type,
|
||||||
|
@@ -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_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_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_UNMANAGED_SPECS_CHANGED "unmanaged-specs-changed"
|
||||||
#define NM_SETTINGS_PLUGIN_UNRECOGNIZED_SPECS_CHANGED "unrecognized-specs-changed"
|
#define NM_SETTINGS_PLUGIN_UNRECOGNIZED_SPECS_CHANGED "unrecognized-specs-changed"
|
||||||
#define NM_SETTINGS_PLUGIN_CONNECTION_ADDED "connection-added"
|
#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 _NMSettingsPlugin NMSettingsPlugin;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@@ -120,28 +120,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
|
static void
|
||||||
init (NMSettingsPlugin *config)
|
init (NMSettingsPlugin *config)
|
||||||
{
|
{
|
||||||
@@ -175,19 +153,6 @@ nms_ibft_plugin_class_init (NMSIbftPluginClass *req_class)
|
|||||||
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
|
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
|
||||||
|
|
||||||
object_class->dispose = dispose;
|
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
|
static void
|
||||||
|
@@ -38,9 +38,6 @@
|
|||||||
|
|
||||||
#define IFCFG_DIR SYSCONFDIR "/sysconfig/network-scripts"
|
#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_ETHERNET "Ethernet"
|
||||||
#define TYPE_WIRELESS "Wireless"
|
#define TYPE_WIRELESS "Wireless"
|
||||||
#define TYPE_INFINIBAND "InfiniBand"
|
#define TYPE_INFINIBAND "InfiniBand"
|
||||||
|
@@ -997,28 +997,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
|
static void
|
||||||
init (NMSettingsPlugin *config)
|
init (NMSettingsPlugin *config)
|
||||||
{
|
{
|
||||||
@@ -1087,19 +1065,6 @@ settings_plugin_ifcfg_class_init (SettingsPluginIfcfgClass *req_class)
|
|||||||
|
|
||||||
object_class->constructed = constructed;
|
object_class->constructed = constructed;
|
||||||
object_class->dispose = dispose;
|
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
|
static void
|
||||||
|
@@ -50,9 +50,6 @@
|
|||||||
|
|
||||||
#define ENI_INTERFACES_FILE "/etc/network/interfaces"
|
#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 IFUPDOWN_UNMANAGE_WELL_KNOWN_DEFAULT TRUE
|
||||||
|
|
||||||
/* #define ALWAYS_UNMANAGE TRUE */
|
/* #define ALWAYS_UNMANAGE TRUE */
|
||||||
@@ -302,28 +299,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
|
static void
|
||||||
_udev_device_unref (gpointer ptr)
|
_udev_device_unref (gpointer ptr)
|
||||||
{
|
{
|
||||||
@@ -513,19 +488,6 @@ settings_plugin_ifupdown_class_init (SettingsPluginIfupdownClass *req_class)
|
|||||||
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
|
GObjectClass *object_class = G_OBJECT_CLASS (req_class);
|
||||||
|
|
||||||
object_class->dispose = dispose;
|
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
|
static void
|
||||||
|
@@ -561,28 +561,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
|
static void
|
||||||
nms_keyfile_plugin_init (NMSKeyfilePlugin *plugin)
|
nms_keyfile_plugin_init (NMSKeyfilePlugin *plugin)
|
||||||
{
|
{
|
||||||
@@ -644,19 +622,6 @@ nms_keyfile_plugin_class_init (NMSKeyfilePluginClass *req_class)
|
|||||||
|
|
||||||
object_class->constructed = constructed;
|
object_class->constructed = constructed;
|
||||||
object_class->dispose = dispose;
|
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
|
static void
|
||||||
|
@@ -23,9 +23,6 @@
|
|||||||
|
|
||||||
#include "NetworkManagerUtils.h"
|
#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_PATH(path) ((path) ?: "in-memory")
|
||||||
#define NMS_KEYFILE_CONNECTION_LOG_FMT "%s (%s,\"%s\")"
|
#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))
|
#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))
|
||||||
|
Reference in New Issue
Block a user