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

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4320 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index d795ce8..32656ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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
+
 2008-11-20  Dan Williams  <dcbw@redhat.com>
 
        * libnm-util/Makefile.am

diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver
index 00c5012..642ff02 100644 (file)
--- a/libnm-util/libnm-util.ver
+++ b/libnm-util/libnm-util.ver
@@ -254,7 +254,6 @@ global:
        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;

diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index 36c9a1a..c4dfa91 100644 (file)
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -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 @@ register_one_setting (const char *name, GType type, GQuark error_quark, guint32
 static void
 register_default_settings (void)
 {
-       nm_utils_register_value_transformations ();
+       _nm_utils_register_value_transformations ();
 
        if (G_LIKELY (default_map[0].name))
                return;

diff --git a/libnm-util/nm-utils-private.h b/libnm-util/nm-utils-private.h
index aa01d74..fa1e3a0 100644 (file)
--- a/libnm-util/nm-utils-private.h
+++ b/libnm-util/nm-utils-private.h
@@ -32,4 +32,6 @@ gboolean    _nm_utils_string_in_list   (const char *str,
 gboolean    _nm_utils_string_slist_validate (GSList *list,
                                              const char **valid_values);
 
+void        _nm_utils_register_value_transformations (void);
+
 #endif

diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 2c9f444..a8ddf04 100644 (file)
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -738,7 +738,7 @@ nm_utils_convert_string_hash_to_string (const GValue *src_value, GValue *dest_va
 }
 
 void
-nm_utils_register_value_transformations (void)
+_nm_utils_register_value_transformations (void)
 {
        static gboolean registered = FALSE;