mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-22 18:18:15 +02:00
6746319495
* libnm-util/nm-connection.c (register_default_creators): Use
* defined
setting names. Register NMSettingVPN and NMSettingVPNProperties.
* libnm-util/nm-setting.c: Define property name strings, use
* them.
Implement NMSettingVPN and NMSettingVPNProperties settings.
Implement NM_S_TYPE_GVALUE_HASH.
(nm_setting_populate_from_hash): Handle NM_S_TYPE_GVALUE_HASH.
(setting_connection_verify): Rename 'devtype' property to
'type'.
* introspection/nm-vpn-manager.xml: Use NMConnection for VPN
* service
properties.
* src/vpn-manager/nm-vpn-service.c: Ditto.
* src/vpn-manager/nm-vpn-connection.c: Ditto.
* src/vpn-manager/nm-vpn-manager.c (nm_vpn_manager_connect):
* Ditto.
(nm_vpn_manager_new): Remove NMManager argument, it's easy
enough to get.
* src/nm-device-802-11-wireless.c (find_best_connection): Use
* defined setting
names. NMSettingConnection->devtype got renamed to 'type'.
* src/nm-device-802-3-ethernet.c (find_best_connection):
(real_get_best_connection): Ditto.
* src/NetworkManager.c (main): Update the vpn manager creation
* arguments.
* libnm-glib/nm-vpn-manager.[ch]: Update.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2826 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
|
|
|
|
#ifndef NM_VPN_MANAGER_H
|
|
#define NM_VPN_MANAGER_H 1
|
|
|
|
#include <glib/gtypes.h>
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus-glib.h>
|
|
#include <NetworkManager.h>
|
|
#include <NetworkManagerVPN.h>
|
|
#include "nm-object.h"
|
|
#include "nm-device.h"
|
|
#include "nm-connection.h"
|
|
#include "nm-vpn-connection.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_VPN_MANAGER (nm_vpn_manager_get_type ())
|
|
#define NM_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_VPN_MANAGER, NMVPNManager))
|
|
#define NM_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_VPN_MANAGER, NMVPNManagerClass))
|
|
#define NM_IS_VPN_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_VPN_MANAGER))
|
|
#define NM_IS_VPN_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_VPN_MANAGER))
|
|
#define NM_VPN_MANAGER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_VPN_MANAGER, NMVPNManagerClass))
|
|
|
|
typedef struct {
|
|
NMObject parent;
|
|
} NMVPNManager;
|
|
|
|
typedef struct {
|
|
NMObjectClass parent;
|
|
} NMVPNManagerClass;
|
|
|
|
GType nm_vpn_manager_get_type (void);
|
|
|
|
|
|
NMVPNManager *nm_vpn_manager_new (void);
|
|
NMVPNConnection *nm_vpn_manager_connect (NMVPNManager *manager,
|
|
const char *connection_type,
|
|
const char *connection_path,
|
|
NMDevice *device);
|
|
|
|
GSList *nm_vpn_manager_get_connections (NMVPNManager *manager);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* NM_MANAGER_H */
|