
Implement GKeyFile system settings plugin. Implement writing system settings (currently supported only by GKeyFile plugin). * system-settings/src/main.c: * system-settings/src/dbus-settings.c: Move the communication with plugins from main.c to dbus-settings.c. Makes it possible to talk to all registered plugins for adding/updating/removing connections. * system-settings/src/nm-system-config-interface.c (nm_system_config_interface_add_connection): Implement (nm_system_config_interface_update_connection): Implement. (nm_system_config_interface_remove_connection): Implement. * system-settings/plugins/keyfile/Makefile.am: * system-settings/plugins/keyfile/plugin.[ch]: * system-settings/plugins/keyfile/writer.[ch]: * system-settings/plugins/keyfile/reader.[ch]: Implement. * system-settings/plugins/Makefile.am: Add GKeyFile plugin. * configure.in: Generate GKeyFile Makefile. * libnm-glib/nm-settings.c (impl_exported_connection_get_id): Fix a memory corruption, need to duplicate the returned string. (impl_exported_connection_update): Implement. (impl_exported_connection_delete): Implement. * introspection/nm-settings-system.xml: Add "AddConnection" method. * introspection/nm-exported-connection.xml: Add "Update" and "Delete" methods. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3587 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
196 lines
5.8 KiB
C
196 lines
5.8 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
/* NetworkManager -- Network link manager
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2007 Red Hat, Inc.
|
|
*/
|
|
|
|
#include "nm-system-config-interface.h"
|
|
|
|
static void
|
|
interface_init (gpointer g_iface)
|
|
{
|
|
GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
|
|
static gboolean initialized = FALSE;
|
|
|
|
if (initialized)
|
|
return;
|
|
|
|
/* Properties */
|
|
g_object_interface_install_property
|
|
(g_iface,
|
|
g_param_spec_string (NM_SYSTEM_CONFIG_INTERFACE_NAME,
|
|
"Name",
|
|
"Plugin name",
|
|
NULL,
|
|
G_PARAM_READABLE));
|
|
|
|
g_object_interface_install_property
|
|
(g_iface,
|
|
g_param_spec_string (NM_SYSTEM_CONFIG_INTERFACE_INFO,
|
|
"Info",
|
|
"Plugin information",
|
|
NULL,
|
|
G_PARAM_READABLE));
|
|
|
|
/* Signals */
|
|
g_signal_new ("connection-added",
|
|
iface_type,
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMSystemConfigInterface, connection_added),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__OBJECT,
|
|
G_TYPE_NONE, 1,
|
|
G_TYPE_OBJECT);
|
|
|
|
g_signal_new ("connection-removed",
|
|
iface_type,
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMSystemConfigInterface, connection_removed),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__OBJECT,
|
|
G_TYPE_NONE, 1,
|
|
G_TYPE_OBJECT);
|
|
|
|
g_signal_new ("connection-updated",
|
|
iface_type,
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMSystemConfigInterface, connection_updated),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__OBJECT,
|
|
G_TYPE_NONE, 1,
|
|
G_TYPE_OBJECT);
|
|
|
|
g_signal_new ("unmanaged-devices-changed",
|
|
iface_type,
|
|
G_SIGNAL_RUN_FIRST,
|
|
G_STRUCT_OFFSET (NMSystemConfigInterface, unmanaged_devices_changed),
|
|
NULL, NULL,
|
|
g_cclosure_marshal_VOID__VOID,
|
|
G_TYPE_NONE, 0);
|
|
|
|
initialized = TRUE;
|
|
}
|
|
|
|
|
|
GType
|
|
nm_system_config_interface_get_type (void)
|
|
{
|
|
static GType system_config_interface_type = 0;
|
|
|
|
if (!system_config_interface_type) {
|
|
const GTypeInfo system_config_interface_info = {
|
|
sizeof (NMSystemConfigInterface), /* class_size */
|
|
interface_init, /* base_init */
|
|
NULL, /* base_finalize */
|
|
NULL,
|
|
NULL, /* class_finalize */
|
|
NULL, /* class_data */
|
|
0,
|
|
0, /* n_preallocs */
|
|
NULL
|
|
};
|
|
|
|
system_config_interface_type = g_type_register_static (G_TYPE_INTERFACE,
|
|
"NMSystemConfigInterface",
|
|
&system_config_interface_info,
|
|
0);
|
|
|
|
g_type_interface_add_prerequisite (system_config_interface_type, G_TYPE_OBJECT);
|
|
}
|
|
|
|
return system_config_interface_type;
|
|
}
|
|
|
|
void
|
|
nm_system_config_interface_init (NMSystemConfigInterface *config,
|
|
NMSystemConfigHalManager *hal_manager)
|
|
{
|
|
g_return_if_fail (config != NULL);
|
|
|
|
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->init)
|
|
NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->init (config, hal_manager);
|
|
}
|
|
|
|
GSList *
|
|
nm_system_config_interface_get_connections (NMSystemConfigInterface *config)
|
|
{
|
|
g_return_val_if_fail (config != NULL, NULL);
|
|
|
|
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->get_connections)
|
|
return NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->get_connections (config);
|
|
return NULL;
|
|
}
|
|
|
|
GHashTable *
|
|
nm_system_config_interface_get_secrets (NMSystemConfigInterface *config,
|
|
NMConnection *connection,
|
|
NMSetting *setting)
|
|
{
|
|
g_return_val_if_fail (config != NULL, NULL);
|
|
g_return_val_if_fail (connection != NULL, NULL);
|
|
g_return_val_if_fail (setting != NULL, NULL);
|
|
|
|
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->get_secrets)
|
|
return NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->get_secrets (config, connection, setting);
|
|
return NULL;
|
|
}
|
|
|
|
GSList *
|
|
nm_system_config_interface_get_unmanaged_devices (NMSystemConfigInterface *config)
|
|
{
|
|
g_return_val_if_fail (config != NULL, NULL);
|
|
|
|
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->get_unmanaged_devices)
|
|
return NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->get_unmanaged_devices (config);
|
|
return NULL;
|
|
}
|
|
|
|
void
|
|
nm_system_config_interface_add_connection (NMSystemConfigInterface *config,
|
|
NMConnection *connection)
|
|
{
|
|
g_return_if_fail (config != NULL);
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
|
|
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->add_connection)
|
|
NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->add_connection (config, connection);
|
|
}
|
|
|
|
void
|
|
nm_system_config_interface_update_connection (NMSystemConfigInterface *config,
|
|
NMConnection *connection)
|
|
{
|
|
g_return_if_fail (config != NULL);
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
|
|
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->update_connection)
|
|
NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->update_connection (config, connection);
|
|
}
|
|
|
|
void
|
|
nm_system_config_interface_remove_connection (NMSystemConfigInterface *config,
|
|
NMConnection *connection)
|
|
{
|
|
g_return_if_fail (config != NULL);
|
|
g_return_if_fail (NM_IS_CONNECTION (connection));
|
|
|
|
if (NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->remove_connection)
|
|
NM_SYSTEM_CONFIG_INTERFACE_GET_INTERFACE (config)->remove_connection (config, connection);
|
|
}
|