NetworkManager r4320 - in trunk: . libnm-util

[dcbw svn gnome org]

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

Log:
2008-11-20  Dan Williams  <dcbw redhat com>

	* libnm-util/libnm-util.ver
	  libnm-util/nm-utils.c
	  libnm-util/nm-utils.h
	  libnm-util/nm-utils-private.h
	  libnm-util/nm-connection.c
		- (nm_utils_register_value_transformations): make private, called
			from NMConnection registration anyway



Modified:
   trunk/ChangeLog
   trunk/libnm-util/libnm-util.ver
   trunk/libnm-util/nm-connection.c
   trunk/libnm-util/nm-utils-private.h
   trunk/libnm-util/nm-utils.c

Modified: trunk/libnm-util/libnm-util.ver
==============================================================================
--- trunk/libnm-util/libnm-util.ver	(original)
+++ trunk/libnm-util/libnm-util.ver	Thu Nov 20 20:22:14 2008
@@ -254,7 +254,6 @@
 	nm_utils_ip4_routes_from_gvalue;
 	nm_utils_ip4_routes_to_gvalue;
 	nm_utils_is_empty_ssid;
-	nm_utils_register_value_transformations;
 	nm_utils_same_ssid;
 	nm_utils_security_valid;
 	nm_utils_slist_free;

Modified: trunk/libnm-util/nm-connection.c
==============================================================================
--- trunk/libnm-util/nm-connection.c	(original)
+++ trunk/libnm-util/nm-connection.c	Thu Nov 20 20:22:14 2008
@@ -28,6 +28,7 @@
 #include <string.h>
 #include "nm-connection.h"
 #include "nm-utils.h"
+#include "nm-utils-private.h"
 
 #include "nm-setting-8021x.h"
 #include "nm-setting-connection.h"
@@ -170,7 +171,7 @@
 static void
 register_default_settings (void)
 {
-	nm_utils_register_value_transformations ();
+	_nm_utils_register_value_transformations ();
 
 	if (G_LIKELY (default_map[0].name))
 		return;

Modified: trunk/libnm-util/nm-utils-private.h
==============================================================================
--- trunk/libnm-util/nm-utils-private.h	(original)
+++ trunk/libnm-util/nm-utils-private.h	Thu Nov 20 20:22:14 2008
@@ -32,4 +32,6 @@
 gboolean    _nm_utils_string_slist_validate (GSList *list,
                                              const char **valid_values);
 
+void        _nm_utils_register_value_transformations (void);
+
 #endif

Modified: trunk/libnm-util/nm-utils.c
==============================================================================
--- trunk/libnm-util/nm-utils.c	(original)
+++ trunk/libnm-util/nm-utils.c	Thu Nov 20 20:22:14 2008
@@ -738,7 +738,7 @@
 }
 
 void
-nm_utils_register_value_transformations (void)
+_nm_utils_register_value_transformations (void)
 {
 	static gboolean registered = FALSE;