mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-22 10:46:59 +00:00
d595f7843e
This commit begins creating the new "libnm", which will replace libnm-util and libnm-glib. The main reason for the libnm-util/libnm-glib split is that the daemon needs to link to libnm-util (to get NMSettings, NMConnection, etc), but can't link to libnm-glib (because it uses many of the same type names as the NetworkManager daemon. eg, NMDevice). So the daemon links to only libnm-util, but basically all clients link to both. With libnm, there will be only a single client-visible library, and NetworkManager will internally link against a private "libnm-core" containing the parts that used to be in libnm-util. (The "libnm-core" parts still need to be in their own directory so that the daemon can see those header files without also seeing the ones in libnm/ that conflict with its own headers.) [This commit just copies the source code from libnm-util/ to libnm-core/, and libnm-glib/ to libnm/: mkdir -p libnm-core/tests/ mkdir -p libnm/tests/ cp libnm-util/*.[ch] libnm-util/nm-version.h.in libnm-core/ rm -f libnm-core/nm-version.h libnm-core/nm-setting-template.[ch] libnm-core/nm-utils-enum-types.[ch] cp libnm-util/tests/*.[ch] libnm-core/tests/ cp libnm-glib/*.[ch] libnm/ rm -f libnm/libnm_glib.[ch] libnm/libnm-glib-test.c libnm/nm-glib-enum-types.[ch] cp libnm-glib/tests/*.[ch] libnm/tests/ ]
101 lines
3 KiB
C
101 lines
3 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
/*
|
|
* 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.
|
|
*
|
|
* Copyright 2013 Red Hat, Inc.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include "nm-setting-generic.h"
|
|
#include "nm-setting-private.h"
|
|
|
|
/**
|
|
* SECTION:nm-setting-generic
|
|
* @short_description: Describes connection properties for generic devices
|
|
* @include: nm-setting-generic.h
|
|
*
|
|
* The #NMSettingGeneric object is a #NMSetting subclass that describes
|
|
* optional properties that apply to "generic" devices (ie, devices that
|
|
* NetworkManager does not specifically recognize).
|
|
*
|
|
* There are currently no properties on this object; it exists only to be
|
|
* the "connection type" setting on #NMConnections for generic devices.
|
|
*
|
|
* Since: 0.9.10
|
|
**/
|
|
|
|
/**
|
|
* nm_setting_generic_error_quark:
|
|
*
|
|
* Registers an error quark for #NMSettingGeneric if necessary.
|
|
*
|
|
* Returns: the error quark used for #NMSettingGeneric errors.
|
|
*
|
|
* Since: 0.9.10
|
|
**/
|
|
GQuark
|
|
nm_setting_generic_error_quark (void)
|
|
{
|
|
static GQuark quark;
|
|
|
|
if (G_UNLIKELY (!quark))
|
|
quark = g_quark_from_static_string ("nm-setting-generic-error-quark");
|
|
return quark;
|
|
}
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (NMSettingGeneric, nm_setting_generic, NM_TYPE_SETTING,
|
|
_nm_register_setting (NM_SETTING_GENERIC_SETTING_NAME,
|
|
g_define_type_id,
|
|
1,
|
|
NM_SETTING_GENERIC_ERROR))
|
|
NM_SETTING_REGISTER_TYPE (NM_TYPE_SETTING_GENERIC)
|
|
|
|
#define NM_SETTING_GENERIC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_SETTING_GENERIC, NMSettingGenericPrivate))
|
|
|
|
typedef struct {
|
|
int dummy;
|
|
} NMSettingGenericPrivate;
|
|
|
|
/**************************************************************************/
|
|
|
|
/**
|
|
* nm_setting_generic_new:
|
|
*
|
|
* Creates a new #NMSettingGeneric object with default values.
|
|
*
|
|
* Returns: (transfer full): the new empty #NMSettingGeneric object
|
|
*
|
|
* Since: 0.9.10
|
|
**/
|
|
NMSetting *
|
|
nm_setting_generic_new (void)
|
|
{
|
|
return (NMSetting *) g_object_new (NM_TYPE_SETTING_GENERIC, NULL);
|
|
}
|
|
|
|
static void
|
|
nm_setting_generic_init (NMSettingGeneric *setting)
|
|
{
|
|
}
|
|
|
|
static void
|
|
nm_setting_generic_class_init (NMSettingGenericClass *setting_class)
|
|
{
|
|
g_type_class_add_private (setting_class, sizeof (NMSettingGenericPrivate));
|
|
}
|