diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-11-20 20:22:14 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-11-20 20:22:14 +0000 |
| commit | 4d1859dc6aa69849ac36407fa12388dff4d4f873 (patch) | |
| tree | e705a0fa1d788a7cad82f19dcc8bb93b2ca5f1d9 /libnm-util | |
| parent | 3bc8b0ca576c3dfe45a853be94862b3da65a74bb (diff) | |
| download | NetworkManager-4d1859dc6aa69849ac36407fa12388dff4d4f873.tar.gz | |
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
Diffstat (limited to 'libnm-util')
| -rw-r--r-- | libnm-util/libnm-util.ver | 1 | ||||
| -rw-r--r-- | libnm-util/nm-connection.c | 3 | ||||
| -rw-r--r-- | libnm-util/nm-utils-private.h | 2 | ||||
| -rw-r--r-- | libnm-util/nm-utils.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index 00c50120d6..642ff02e2f 100644 --- 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 36c9a1ada7..c4dfa918e6 100644 --- 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 aa01d74fe3..fa1e3a016d 100644 --- 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 2c9f4446a0..a8ddf0463e 100644 --- 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; |