From 68a2fc9739fd5468bb235e920fd92dcf8f893be1 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 19 Nov 2008 14:00:15 +0000 Subject: [PATCH] 2008-11-19 Dan Williams * libnm-util/libnm-util.ver libnm-util/nm-connection.c - (nm_setting_register, nm_setting_unregister): unexport; they are private and don't have a use outside libnm-util git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4297 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++ libnm-util/libnm-util.ver | 2 -- libnm-util/nm-connection.c | 54 ++++++++++++++++++++------------------ 3 files changed, 35 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdd73c360e..8f5b535b4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-19 Dan Williams + + * libnm-util/libnm-util.ver + libnm-util/nm-connection.c + - (nm_setting_register, nm_setting_unregister): unexport; they are + private and don't have a use outside libnm-util + 2008-11-17 Dan Williams * src/nm-hso-gsm-device.c diff --git a/libnm-util/libnm-util.ver b/libnm-util/libnm-util.ver index da1c0a8011..73a93b25f4 100644 --- a/libnm-util/libnm-util.ver +++ b/libnm-util/libnm-util.ver @@ -159,7 +159,6 @@ global: nm_setting_pppoe_get_service; nm_setting_pppoe_get_username; nm_setting_pppoe_get_password; - nm_setting_register; nm_setting_serial_error_get_type; nm_setting_serial_error_quark; nm_setting_serial_get_type; @@ -171,7 +170,6 @@ global: nm_setting_serial_get_send_delay; nm_setting_to_hash; nm_setting_to_string; - nm_setting_unregister; nm_setting_update_secrets; nm_setting_verify; nm_setting_vpn_error_get_type; diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c index 04590b0d7d..e44a144c6e 100644 --- a/libnm-util/nm-connection.c +++ b/libnm-util/nm-connection.c @@ -116,6 +116,33 @@ static struct SettingInfo { GQuark error_quark; } default_map[DEFAULT_MAP_SIZE] = { { NULL } }; +static void +setting_register (const char *name, GType type) +{ + g_return_if_fail (name != NULL); + g_return_if_fail (G_TYPE_IS_INSTANTIATABLE (type)); + + if (G_UNLIKELY (!registered_settings)) { + registered_settings = g_hash_table_new_full (g_str_hash, g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) g_free); + } + + if (g_hash_table_lookup (registered_settings, name)) + g_warning ("Already have a creator function for '%s', overriding", name); + + g_hash_table_insert (registered_settings, g_strdup (name), g_strdup (g_type_name (type))); +} + +#if UNUSED +static void +setting_unregister (const char *name) +{ + if (registered_settings) + g_hash_table_remove (registered_settings, name); +} +#endif + static void register_one_setting (const char *name, GType type, GQuark error_quark, guint32 priority) { @@ -130,7 +157,7 @@ register_one_setting (const char *name, GType type, GQuark error_quark, guint32 default_map[i].priority = priority; i++; - nm_setting_register (name, type); + setting_register (name, type); } static void @@ -217,31 +244,6 @@ get_priority_for_setting_type (GType type) return G_MAXUINT32; } -void -nm_setting_register (const char *name, GType type) -{ - g_return_if_fail (name != NULL); - g_return_if_fail (G_TYPE_IS_INSTANTIATABLE (type)); - - if (G_UNLIKELY (!registered_settings)) { - registered_settings = g_hash_table_new_full (g_str_hash, g_str_equal, - (GDestroyNotify) g_free, - (GDestroyNotify) g_free); - } - - if (g_hash_table_lookup (registered_settings, name)) - g_warning ("Already have a creator function for '%s', overriding", name); - - g_hash_table_insert (registered_settings, g_strdup (name), g_strdup (g_type_name (type))); -} - -void -nm_setting_unregister (const char *name) -{ - if (registered_settings) - g_hash_table_remove (registered_settings, name); -} - GType nm_connection_lookup_setting_type (const char *name) {