NetworkManager r4312 - in trunk: . libnm-util src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Nov 20 14:47:08 2008
New Revision: 4312
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=4312&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/libnm-util/libnm-util.ver
   trunk/libnm-util/nm-connection.c
   trunk/libnm-util/nm-setting.c
   trunk/libnm-util/nm-setting.h
   trunk/src/nm-activation-request.c

Modified: trunk/libnm-util/libnm-util.ver
==============================================================================
--- trunk/libnm-util/libnm-util.ver	(original)
+++ trunk/libnm-util/libnm-util.ver	Thu Nov 20 14:47:08 2008
@@ -84,7 +84,7 @@
 	nm_setting_connection_get_read_only;
 	nm_setting_duplicate;
 	nm_setting_enumerate_values;
-	nm_setting_from_hash;
+	nm_setting_new_from_hash;
 	nm_setting_get_name;
 	nm_setting_get_type;
 	nm_setting_gsm_error_get_type;

Modified: trunk/libnm-util/nm-connection.c
==============================================================================
--- trunk/libnm-util/nm-connection.c	(original)
+++ trunk/libnm-util/nm-connection.c	Thu Nov 20 14:47:08 2008
@@ -332,7 +332,7 @@
 
 	type = nm_connection_lookup_setting_type ((char *) key);
 	if (type)
-		setting = nm_setting_from_hash (type, (GHashTable *) value);
+		setting = nm_setting_new_from_hash (type, (GHashTable *) value);
 	if (setting)
 		nm_connection_add_setting (connection, setting);
 }

Modified: trunk/libnm-util/nm-setting.c
==============================================================================
--- trunk/libnm-util/nm-setting.c	(original)
+++ trunk/libnm-util/nm-setting.c	Thu Nov 20 14:47:08 2008
@@ -141,8 +141,8 @@
 }
 
 NMSetting *
-nm_setting_from_hash (GType setting_type,
-				  GHashTable *hash)
+nm_setting_new_from_hash (GType setting_type,
+                          GHashTable *hash)
 {
 	NMSetting *setting;
 	NMSettingFromHashInfo info;

Modified: trunk/libnm-util/nm-setting.h
==============================================================================
--- trunk/libnm-util/nm-setting.h	(original)
+++ trunk/libnm-util/nm-setting.h	Thu Nov 20 14:47:08 2008
@@ -74,8 +74,8 @@
 GType nm_setting_get_type (void);
 
 GHashTable *nm_setting_to_hash       (NMSetting *setting);
-NMSetting  *nm_setting_from_hash     (GType setting_type,
-							   GHashTable *hash);
+NMSetting  *nm_setting_new_from_hash (GType setting_type,
+                                      GHashTable *hash);
 
 NMSetting *nm_setting_duplicate      (NMSetting *setting);
 

Modified: trunk/src/nm-activation-request.c
==============================================================================
--- trunk/src/nm-activation-request.c	(original)
+++ trunk/src/nm-activation-request.c	Thu Nov 20 14:47:08 2008
@@ -418,7 +418,7 @@
 	if (type == 0)
 		return;
 
-	setting = nm_setting_from_hash (type, setting_hash);
+	setting = nm_setting_new_from_hash (type, setting_hash);
 	if (setting) {
 		NMSetting *s_8021x = NULL;
 		GSList *all_settings = NULL;