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

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

Browse Source 
* libnm-util/nm-setting.c
	  libnm-util/nm-setting.h
	  libnm-util/libnm-util.ver
		- (nm_setting_new_from_hash): rename from nm_setting_from_hash() to be
			consistent with nm_connection_new_from_hash()

	* src/nm-activation-request.c
	  libnm-util/nm-connection.c
		- Handle rename



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4312 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2008-11-20 14:47:08 +00:00
parent 7eb455978b
commit 6e40cdb3a5
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -1,3 +1,15 @@
2008-11-20 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting.c
libnm-util/nm-setting.h
libnm-util/libnm-util.ver
- (nm_setting_new_from_hash): rename from nm_setting_from_hash() to be
consistent with nm_connection_new_from_hash()
* src/nm-activation-request.c
libnm-util/nm-connection.c
- Handle rename
2008-11-19 Dan Williams <dcbw@redhat.com> 2008-11-19 Dan Williams <dcbw@redhat.com>
* configure.in * configure.in

2
libnm-util/libnm-util.ver
View File

@@ -84,7 +84,7 @@ global:
nm_setting_connection_get_read_only; nm_setting_connection_get_read_only;
nm_setting_duplicate; nm_setting_duplicate;
nm_setting_enumerate_values; nm_setting_enumerate_values;
nm_setting_from_hash; nm_setting_new_from_hash;
nm_setting_get_name; nm_setting_get_name;
nm_setting_get_type; nm_setting_get_type;
nm_setting_gsm_error_get_type; nm_setting_gsm_error_get_type;

2
libnm-util/nm-connection.c
View File

@@ -332,7 +332,7 @@ parse_one_setting (gpointer key, gpointer value, gpointer user_data)
type = nm_connection_lookup_setting_type ((char *) key); type = nm_connection_lookup_setting_type ((char *) key);
if (type) if (type)
setting = nm_setting_from_hash (type, (GHashTable *) value); setting = nm_setting_new_from_hash (type, (GHashTable *) value);
if (setting) if (setting)
nm_connection_add_setting (connection, setting); nm_connection_add_setting (connection, setting);
} }

4
libnm-util/nm-setting.c
View File

@@ -141,8 +141,8 @@ one_property_cb (gpointer key, gpointer val, gpointer user_data)
} }
NMSetting * NMSetting *
nm_setting_from_hash (GType setting_type, nm_setting_new_from_hash (GType setting_type,
GHashTable *hash) GHashTable *hash)
{ {
NMSetting *setting; NMSetting *setting;
NMSettingFromHashInfo info; NMSettingFromHashInfo info;

4
libnm-util/nm-setting.h
View File

@@ -74,8 +74,8 @@ typedef void (*NMSettingValueIterFn) (NMSetting *setting,
GType nm_setting_get_type (void); GType nm_setting_get_type (void);
GHashTable *nm_setting_to_hash (NMSetting *setting); GHashTable *nm_setting_to_hash (NMSetting *setting);
NMSetting *nm_setting_from_hash (GType setting_type, NMSetting *nm_setting_new_from_hash (GType setting_type,
GHashTable *hash); GHashTable *hash);
NMSetting *nm_setting_duplicate (NMSetting *setting); NMSetting *nm_setting_duplicate (NMSetting *setting);

2
src/nm-activation-request.c
View File

@@ -418,7 +418,7 @@ update_one_setting (const char* key,
if (type == 0) if (type == 0)
return; return;
setting = nm_setting_from_hash (type, setting_hash); setting = nm_setting_new_from_hash (type, setting_hash);
if (setting) { if (setting) {
NMSetting *s_8021x = NULL; NMSetting *s_8021x = NULL;
GSList *all_settings = NULL; GSList *all_settings = NULL;