summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-01-08 15:58:49 +0100
committerThomas Haller <thaller@redhat.com>2018-01-08 16:02:07 +0100
commit29e566cc7199568597c5c24c9f190db7e097307d (patch)
treea6983e4ae9f5eff58ad5239f5133fdae38fbbb36
parent876de69e08140ff34ede23fe457117f5d815ab48 (diff)
downloadNetworkManager-29e566cc7199568597c5c24c9f190db7e097307d.tar.gz
libnm: drop libnm-util/nm-setting-template.[hc]
These files are a template how to add a new nm-setting-* implementation. We are not going to add new files to the deprecated libnm-util library, hence a template for libnm-util is pointless. libnm-core doesn't have a corresponding template file. Personally, I don't think such a template are a great idea either, because - People are not aware that it exists. Hence, it's unused, badly maintained and quite possibly does not follow current best practice. - Just copy an actual settings implementation and start from there. That seems better to me than having a template.
-rw-r--r--docs/libnm-util/Makefile.am1
-rw-r--r--docs/libnm-util/meson.build1
-rw-r--r--libnm-util/nm-setting-template.c107
-rw-r--r--libnm-util/nm-setting-template.h66
4 files changed, 0 insertions, 175 deletions
diff --git a/docs/libnm-util/Makefile.am b/docs/libnm-util/Makefile.am
index b1386e601c..5218cc40bf 100644
--- a/docs/libnm-util/Makefile.am
+++ b/docs/libnm-util/Makefile.am
@@ -33,7 +33,6 @@ CFILE_GLOB=$(top_srcdir)/libnm-util/*.c
# Header files to ignore when scanning.
IGNORE_HFILES= \
crypto.h \
- nm-setting-template.h \
nm-utils-private.h \
nm-setting-private.h \
nm-param-spec-specialized.h \
diff --git a/docs/libnm-util/meson.build b/docs/libnm-util/meson.build
index 53425d6d03..47f53b0a8a 100644
--- a/docs/libnm-util/meson.build
+++ b/docs/libnm-util/meson.build
@@ -2,7 +2,6 @@ doc_module = 'libnm-util'
private_headers = [
'crypto.h',
- 'nm-setting-template.h',
'nm-utils-private.h',
'nm-setting-private.h',
'nm-param-spec-specialized.h',
diff --git a/libnm-util/nm-setting-template.c b/libnm-util/nm-setting-template.c
deleted file mode 100644
index 8ddc565ef5..0000000000
--- a/libnm-util/nm-setting-template.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/*
- * Tambet Ingo <tambet@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2007 - 2008 Novell, Inc.
- */
-
-/* This file is just a template - it's not built nor included in the tarball.
- It's sole purpose is to make the process of creating new settings easier.
- Just replace 'template' with new setting name (preserving the case),
- remove this comment, and you're almost done.
-*/
-
-#include "nm-default.h"
-
-#include "nm-setting-template.h"
-
-G_DEFINE_TYPE (NMSettingTemplate, nm_setting_template, NM_TYPE_SETTING)
-
-enum {
- PROP_0,
-
- LAST_PROP
-};
-
-NMSetting *
-nm_setting_template_new (void)
-{
- return (NMSetting *) g_object_new (NM_TYPE_SETTING_TEMPLATE, NULL);
-}
-
-static gboolean
-verify (NMSetting *setting, GSList *all_settings)
-{
- NMSettingTemplate *self = NM_SETTING_TEMPLATE (setting);
- return TRUE;
-}
-
-static void
-nm_setting_template_init (NMSettingTemplate *setting)
-{
-}
-
-static void
-finalize (GObject *object)
-{
- NMSettingTemplate *self = NM_SETTING_TEMPLATE (object);
-
- G_OBJECT_CLASS (nm_setting_template_parent_class)->finalize (object);
-}
-
-static void
-set_property (GObject *object, guint prop_id,
- const GValue *value, GParamSpec *pspec)
-{
- NMSettingTemplate *setting = NM_SETTING_TEMPLATE (object);
-
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-get_property (GObject *object, guint prop_id,
- GValue *value, GParamSpec *pspec)
-{
- NMSettingTemplate *setting = NM_SETTING_TEMPLATE (object);
-
- switch (prop_id) {
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
-static void
-nm_setting_template_class_init (NMSettingTemplateClass *setting_class)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (setting_class);
- NMSettingClass *parent_class = NM_SETTING_CLASS (setting_class);
-
- /* virtual methods */
- object_class->set_property = set_property;
- object_class->get_property = get_property;
- object_class->finalize = finalize;
- parent_class->verify = verify;
-
- /* Properties */
-}
diff --git a/libnm-util/nm-setting-template.h b/libnm-util/nm-setting-template.h
deleted file mode 100644
index 8e8a270be5..0000000000
--- a/libnm-util/nm-setting-template.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
-/*
- * Tambet Ingo <tambet@gmail.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA.
- *
- * (C) Copyright 2007 - 2008 Novell, Inc.
- */
-
-/* This file is just a template - it's not built nor included in the tarball.
- It's sole purpose is to make the process of creating new settings easier.
- Just replace 'template' with new setting name (preserving the case),
- remove this comment, and you're almost done.
-*/
-
-#ifndef NM_SETTING_TEMPLATE_H
-#define NM_SETTING_TEMPLATE_H
-
-#include "nm-setting.h"
-
-G_BEGIN_DECLS
-
-#define NM_TYPE_SETTING_TEMPLATE (nm_setting_template_get_type ())
-#define NM_SETTING_TEMPLATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_TEMPLATE, NMSettingTemplate))
-#define NM_SETTING_TEMPLATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_TEMPLATE, NMSettingTemplateClass))
-#define NM_IS_SETTING_TEMPLATE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_TEMPLATE))
-#define NM_IS_SETTING_TEMPLATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_TEMPLATE))
-#define NM_SETTING_TEMPLATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_TEMPLATE, NMSettingTemplateClass))
-
-#define NM_SETTING_TEMPLATE_SETTING_NAME "template"
-
-typedef struct {
- NMSetting parent;
-} NMSettingTemplate;
-
-typedef struct {
- NMSettingClass parent;
-
- /* Padding for future expansion */
- void (*_reserved1) (void);
- void (*_reserved2) (void);
- void (*_reserved3) (void);
- void (*_reserved4) (void);
-} NMSettingTemplateClass;
-
-GType nm_setting_template_get_type (void);
-
-NMSetting *nm_setting_template_new (void);
-
-G_END_DECLS
-
-#endif /* NM_SETTING_TEMPLATE_H */