From 8baa1aca8dfd35e3190d7d5655eb83b5b901e263 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 21 Apr 2011 10:42:53 +0200 Subject: Imported Upstream version 0.8.4.0 --- src/NetworkManagerUtils.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/NetworkManagerUtils.h') diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 6f48a788..72c0e532 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -78,11 +78,4 @@ gboolean nm_utils_get_proc_sys_net_value (const char *path, const char *iface, guint32 *out_value); -void nm_utils_complete_generic (NMConnection *connection, - const char *ctype, - const GSList *existing, - const char *format, - const char *preferred, - gboolean default_enable_ipv6); - #endif /* NETWORK_MANAGER_UTILS_H */ -- cgit 1.3.0-6-gf8a5 From 9f806e97a24bba61417ae312fcc0da40914266fb Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 4 May 2011 21:35:41 +0200 Subject: Imported Upstream version 0.8.999 --- src/NetworkManagerUtils.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/NetworkManagerUtils.h') diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 72c0e532..aaa267fb 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -45,7 +45,9 @@ void nm_utils_merge_ip6_config (NMIP6Config *ip6_config, NMSettingIP6Config *set void nm_utils_call_dispatcher (const char *action, NMConnection *connection, NMDevice *device, - const char *vpn_iface); + const char *vpn_iface, + NMIP4Config *vpn_ip4_config, + NMIP6Config *vpn_ip6_config); gboolean nm_match_spec_hwaddr (const GSList *specs, const char *hwaddr); gboolean nm_match_spec_s390_subchannels (const GSList *specs, const char *subchannels); @@ -72,10 +74,23 @@ void value_hash_add_bool (GHashTable *hash, const char *key, gboolean val); +void value_hash_add_object_property (GHashTable *hash, + const char *key, + GObject *object, + const char *prop, + GType val_type); + gboolean nm_utils_do_sysctl (const char *path, const char *value); gboolean nm_utils_get_proc_sys_net_value (const char *path, const char *iface, guint32 *out_value); +void nm_utils_complete_generic (NMConnection *connection, + const char *ctype, + const GSList *existing, + const char *format, + const char *preferred, + gboolean default_enable_ipv6); + #endif /* NETWORK_MANAGER_UTILS_H */ -- cgit 1.3.0-6-gf8a5