diff options
| author | Tambet Ingo <tambet@gmail.com> | 2007-09-20 06:47:15 +0000 |
|---|---|---|
| committer | Tambet Ingo <tambet@gmail.com> | 2007-09-20 06:47:15 +0000 |
| commit | 67463194955c5f029bbf2366af4b0dd64d80a81c (patch) | |
| tree | 97cf2496797413c94fff99004c993fa4fadb4b7d /src/vpn-manager/nm-vpn-connection.h | |
| parent | d92897393e13fe6e76c33e97269c9373e7d9396c (diff) | |
| download | NetworkManager-67463194955c5f029bbf2366af4b0dd64d80a81c.tar.gz | |
2007-09-20 Tambet Ingo <tambet@gmail.com>
* 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
Diffstat (limited to 'src/vpn-manager/nm-vpn-connection.h')
| -rw-r--r-- | src/vpn-manager/nm-vpn-connection.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/vpn-manager/nm-vpn-connection.h b/src/vpn-manager/nm-vpn-connection.h index 380038bebc..a7b49b396e 100644 --- a/src/vpn-manager/nm-vpn-connection.h +++ b/src/vpn-manager/nm-vpn-connection.h @@ -51,11 +51,8 @@ typedef struct { GType nm_vpn_connection_get_type (void); -NMVPNConnection *nm_vpn_connection_new (const char *name, - const char *dbus_service, - NMDevice *parent_device, - GHashTable *properties, - char **routes); +NMVPNConnection *nm_vpn_connection_new (NMConnection *connection, + NMDevice *parent_device); void nm_vpn_connection_activate (NMVPNConnection *connection); const char *nm_vpn_connection_get_object_path (NMVPNConnection *connection); |