libnm: add libnm/libnm-core (part 1)
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/ ]
This commit is contained in:
Dan Winship
247
libnm/nm-vpn-plugin-ui-interface.c
Normal file
247
libnm/nm-vpn-plugin-ui-interface.c
Normal file
@@ -0,0 +1,247 @@
|
||||
/* -*- 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 2008 - 2010 Red Hat, Inc.
|
||||
* Copyright 2008 Novell, Inc.
|
||||
*/
|
||||
|
||||
#include "nm-vpn-plugin-ui-interface.h"
|
||||
|
||||
static void
|
||||
interface_init (gpointer g_iface)
|
||||
{
|
||||
static gboolean initialized = FALSE;
|
||||
|
||||
if (initialized)
|
||||
return;
|
||||
|
||||
/* Properties */
|
||||
|
||||
/**
|
||||
* NMVPNPluginUiInterface:name:
|
||||
*
|
||||
* Short display name of the VPN plugin.
|
||||
*/
|
||||
g_object_interface_install_property (g_iface,
|
||||
g_param_spec_string (NM_VPN_PLUGIN_UI_INTERFACE_NAME, "", "",
|
||||
NULL,
|
||||
G_PARAM_READABLE |
|
||||
G_PARAM_STATIC_STRINGS));
|
||||
|
||||
/**
|
||||
* NMVPNPluginUiInterface:desc:
|
||||
*
|
||||
* Longer description of the VPN plugin.
|
||||
*/
|
||||
g_object_interface_install_property (g_iface,
|
||||
g_param_spec_string (NM_VPN_PLUGIN_UI_INTERFACE_DESC, "", "",
|
||||
NULL,
|
||||
G_PARAM_READABLE |
|
||||
G_PARAM_STATIC_STRINGS));
|
||||
|
||||
/**
|
||||
* NMVPNPluginUiInterface:service:
|
||||
*
|
||||
* D-Bus service name of the plugin's VPN service.
|
||||
*/
|
||||
g_object_interface_install_property (g_iface,
|
||||
g_param_spec_string (NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, "", "",
|
||||
NULL,
|
||||
G_PARAM_READABLE |
|
||||
G_PARAM_STATIC_STRINGS));
|
||||
|
||||
initialized = TRUE;
|
||||
}
|
||||
|
||||
|
||||
GType
|
||||
nm_vpn_plugin_ui_interface_get_type (void)
|
||||
{
|
||||
static GType vpn_plugin_ui_interface_type = 0;
|
||||
|
||||
if (!vpn_plugin_ui_interface_type) {
|
||||
const GTypeInfo vpn_plugin_ui_interface_info = {
|
||||
sizeof (NMVpnPluginUiInterface), /* class_size */
|
||||
interface_init, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
NULL,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
0,
|
||||
0, /* n_preallocs */
|
||||
NULL
|
||||
};
|
||||
|
||||
vpn_plugin_ui_interface_type = g_type_register_static (G_TYPE_INTERFACE,
|
||||
"NMVpnPluginUiInterface",
|
||||
&vpn_plugin_ui_interface_info,
|
||||
0);
|
||||
|
||||
g_type_interface_add_prerequisite (vpn_plugin_ui_interface_type, G_TYPE_OBJECT);
|
||||
}
|
||||
|
||||
return vpn_plugin_ui_interface_type;
|
||||
}
|
||||
|
||||
|
||||
NMVpnPluginUiWidgetInterface *
|
||||
nm_vpn_plugin_ui_interface_ui_factory (NMVpnPluginUiInterface *iface,
|
||||
NMConnection *connection,
|
||||
GError **error)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_INTERFACE (iface), NULL);
|
||||
|
||||
return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->ui_factory (iface, connection, error);
|
||||
}
|
||||
|
||||
guint32
|
||||
nm_vpn_plugin_ui_interface_get_capabilities (NMVpnPluginUiInterface *iface)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_INTERFACE (iface), 0);
|
||||
|
||||
return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->get_capabilities (iface);
|
||||
}
|
||||
|
||||
NMConnection *
|
||||
nm_vpn_plugin_ui_interface_import (NMVpnPluginUiInterface *iface,
|
||||
const char *path,
|
||||
GError **error)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_INTERFACE (iface), NULL);
|
||||
|
||||
if (nm_vpn_plugin_ui_interface_get_capabilities (iface) & NM_VPN_PLUGIN_UI_CAPABILITY_IMPORT) {
|
||||
g_return_val_if_fail (NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->import_from_file != NULL, NULL);
|
||||
return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->import_from_file (iface, path, error);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gboolean
|
||||
nm_vpn_plugin_ui_interface_export (NMVpnPluginUiInterface *iface,
|
||||
const char *path,
|
||||
NMConnection *connection,
|
||||
GError **error)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_INTERFACE (iface), FALSE);
|
||||
|
||||
if (nm_vpn_plugin_ui_interface_get_capabilities (iface) & NM_VPN_PLUGIN_UI_CAPABILITY_EXPORT) {
|
||||
g_return_val_if_fail (NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->export_to_file != NULL, FALSE);
|
||||
return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->export_to_file (iface, path, connection, error);
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
char *
|
||||
nm_vpn_plugin_ui_interface_get_suggested_name (NMVpnPluginUiInterface *iface,
|
||||
NMConnection *connection)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_INTERFACE (iface), NULL);
|
||||
|
||||
if (NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->get_suggested_name)
|
||||
return NM_VPN_PLUGIN_UI_INTERFACE_GET_INTERFACE (iface)->get_suggested_name (iface, connection);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gboolean
|
||||
nm_vpn_plugin_ui_interface_delete_connection (NMVpnPluginUiInterface *iface,
|
||||
NMConnection *connection,
|
||||
GError **error)
|
||||
{
|
||||
/* Deprecated and no longer used */
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
widget_interface_init (gpointer g_iface)
|
||||
{
|
||||
GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
|
||||
static gboolean initialized = FALSE;
|
||||
|
||||
if (initialized)
|
||||
return;
|
||||
|
||||
/* Signals */
|
||||
g_signal_new ("changed",
|
||||
iface_type,
|
||||
G_SIGNAL_RUN_FIRST,
|
||||
G_STRUCT_OFFSET (NMVpnPluginUiWidgetInterface, changed),
|
||||
NULL, NULL,
|
||||
g_cclosure_marshal_VOID__VOID,
|
||||
G_TYPE_NONE, 0);
|
||||
|
||||
initialized = TRUE;
|
||||
}
|
||||
|
||||
GType
|
||||
nm_vpn_plugin_ui_widget_interface_get_type (void)
|
||||
{
|
||||
static GType vpn_plugin_ui_widget_interface_type = 0;
|
||||
|
||||
if (!vpn_plugin_ui_widget_interface_type) {
|
||||
const GTypeInfo vpn_plugin_ui_widget_interface_info = {
|
||||
sizeof (NMVpnPluginUiWidgetInterface), /* class_size */
|
||||
widget_interface_init, /* base_init */
|
||||
NULL, /* base_finalize */
|
||||
NULL,
|
||||
NULL, /* class_finalize */
|
||||
NULL, /* class_data */
|
||||
0,
|
||||
0, /* n_preallocs */
|
||||
NULL
|
||||
};
|
||||
|
||||
vpn_plugin_ui_widget_interface_type = g_type_register_static (G_TYPE_INTERFACE,
|
||||
"NMVpnPluginUiWidgetInterface",
|
||||
&vpn_plugin_ui_widget_interface_info,
|
||||
0);
|
||||
|
||||
g_type_interface_add_prerequisite (vpn_plugin_ui_widget_interface_type, G_TYPE_OBJECT);
|
||||
}
|
||||
|
||||
return vpn_plugin_ui_widget_interface_type;
|
||||
}
|
||||
|
||||
GObject *
|
||||
nm_vpn_plugin_ui_widget_interface_get_widget (NMVpnPluginUiWidgetInterface *iface)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE (iface), NULL);
|
||||
|
||||
return NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE (iface)->get_widget (iface);
|
||||
}
|
||||
|
||||
gboolean
|
||||
nm_vpn_plugin_ui_widget_interface_update_connection (NMVpnPluginUiWidgetInterface *iface,
|
||||
NMConnection *connection,
|
||||
GError **error)
|
||||
{
|
||||
g_return_val_if_fail (NM_IS_VPN_PLUGIN_UI_WIDGET_INTERFACE (iface), FALSE);
|
||||
|
||||
if (error)
|
||||
g_return_val_if_fail (*error == NULL, FALSE);
|
||||
|
||||
return NM_VPN_PLUGIN_UI_WIDGET_INTERFACE_GET_INTERFACE (iface)->update_connection (iface, connection, error);
|
||||
}
|
||||
|
||||
gboolean
|
||||
nm_vpn_plugin_ui_widget_interface_save_secrets (NMVpnPluginUiWidgetInterface *iface,
|
||||
NMConnection *connection,
|
||||
GError **error)
|
||||
{
|
||||
/* Deprecated and no longer used */
|
||||
return TRUE;
|
||||
}
|
||||
Reference in New Issue
Block a user