colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2008-04-20 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManagerUtils.c
	  src/NetworkManagerUtils.h
		- (nm_utils_merge_ip4_config): new function; merge settings from an
			NMSettingIP4Config to an NMIP4Config object

	* src/nm-device.c
		- (merge_ip4_config): move to NetworkManagerUtils.c

	* src/vpn-manager/nm-vpn-connection.c
		- (nm_vpn_connection_ip4_config_get): merge in user-specified settings
			too



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3580 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-04-21 03:02:32 +00:00
parent 05bf3516ba
commit 78e86f91fe
5 changed files with 95 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/NetworkManagerUtils.h
View File

@@ -31,6 +31,8 @@
#include "NetworkManager.h"
#include "nm-device.h"
#include "nm-ip4-config.h"
#include "nm-setting-ip4-config.h"
int nm_null_safe_strcmp (const char *s1, const char *s2);
@@ -51,5 +53,7 @@ char * nm_utils_hexstr2bin (const char *hex, size_t len);
char *nm_ether_ntop (const struct ether_addr *mac);
void nm_utils_merge_ip4_config (NMIP4Config *ip4_config, NMSettingIP4Config *setting);
#endif