From d7940bcb9b9cf5516b406c4d154eaae01dbc4069 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Aug 2008 09:34:31 +0000 Subject: Rename private nm_* functions to _nm_* git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4012 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- libnm-util/crypto.c | 2 +- libnm-util/crypto.h | 4 ++-- libnm-util/nm-param-spec-specialized.c | 4 ++-- libnm-util/nm-param-spec-specialized.h | 6 +++--- libnm-util/nm-setting-8021x.c | 14 +++++++------- libnm-util/nm-setting-ip4-config.c | 8 ++++---- libnm-util/nm-setting-ip6-config.c | 8 ++++---- libnm-util/nm-setting-vpn.c | 2 +- libnm-util/nm-setting-wired.c | 2 +- libnm-util/nm-setting-wireless-security.c | 6 +++--- libnm-util/nm-setting-wireless.c | 8 ++++---- 11 files changed, 32 insertions(+), 32 deletions(-) (limited to 'libnm-util') diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 9bd593f48c..2443693261 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -30,7 +30,7 @@ #include "crypto.h" GQuark -nm_crypto_error_quark (void) +_nm_crypto_error_quark (void) { static GQuark quark; diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h index 236a414309..0481efa4b1 100644 --- a/libnm-util/crypto.h +++ b/libnm-util/crypto.h @@ -51,8 +51,8 @@ enum { }; -#define NM_CRYPTO_ERROR nm_crypto_error_quark () -GQuark nm_crypto_error_quark (void); +#define NM_CRYPTO_ERROR _nm_crypto_error_quark () +GQuark _nm_crypto_error_quark (void); gboolean crypto_init (GError **error); diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c index a1d6bfeb9d..d8f218dc79 100644 --- a/libnm-util/nm-param-spec-specialized.c +++ b/libnm-util/nm-param-spec-specialized.c @@ -446,7 +446,7 @@ param_specialized_values_cmp (GParamSpec *pspec, } GType -nm_param_spec_specialized_get_type (void) +_nm_param_spec_specialized_get_type (void) { static GType type; @@ -468,7 +468,7 @@ nm_param_spec_specialized_get_type (void) } GParamSpec * -nm_param_spec_specialized (const char *name, +_nm_param_spec_specialized (const char *name, const char *nick, const char *blurb, GType specialized_type, diff --git a/libnm-util/nm-param-spec-specialized.h b/libnm-util/nm-param-spec-specialized.h index 3b4109119f..a6173674da 100644 --- a/libnm-util/nm-param-spec-specialized.h +++ b/libnm-util/nm-param-spec-specialized.h @@ -30,14 +30,14 @@ typedef struct _NMParamSpecSpecialized NMParamSpecSpecialized; -#define NM_TYPE_PARAM_SPEC_SPECIALIZED (nm_param_spec_specialized_get_type ()) +#define NM_TYPE_PARAM_SPEC_SPECIALIZED (_nm_param_spec_specialized_get_type ()) #define NM_IS_PARAM_SPEC_SPECIALIZED(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), NM_TYPE_PARAM_SPEC_SPECIALIZED)) #define NM_PARAM_SPEC_SPECIALIZED(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), NM_TYPE_PARAM_SPEC_SPECIALIZED, NMParamSpecSpecialized)) -GType nm_param_spec_specialized_get_type (void); +GType _nm_param_spec_specialized_get_type (void); -GParamSpec *nm_param_spec_specialized (const char *name, +GParamSpec *_nm_param_spec_specialized (const char *name, const char *nick, const char *blurb, GType specialized_type, diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 1e537a942e..fd12f7820e 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -767,7 +767,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) /* Properties */ g_object_class_install_property (object_class, PROP_EAP, - nm_param_spec_specialized (NM_SETTING_802_1X_EAP, + _nm_param_spec_specialized (NM_SETTING_802_1X_EAP, "EAP", "EAP", DBUS_TYPE_G_LIST_OF_STRING, @@ -791,7 +791,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) g_object_class_install_property (object_class, PROP_CA_CERT, - nm_param_spec_specialized (NM_SETTING_802_1X_CA_CERT, + _nm_param_spec_specialized (NM_SETTING_802_1X_CA_CERT, "CA certificate", "CA certificate", DBUS_TYPE_G_UCHAR_ARRAY, @@ -807,7 +807,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) g_object_class_install_property (object_class, PROP_CLIENT_CERT, - nm_param_spec_specialized (NM_SETTING_802_1X_CLIENT_CERT, + _nm_param_spec_specialized (NM_SETTING_802_1X_CLIENT_CERT, "Client certificate", "Client certificate", DBUS_TYPE_G_UCHAR_ARRAY, @@ -855,7 +855,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) g_object_class_install_property (object_class, PROP_PHASE2_CA_CERT, - nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CA_CERT, + _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CA_CERT, "Phase2 CA certificate", "Phase2 CA certificate", DBUS_TYPE_G_UCHAR_ARRAY, @@ -871,7 +871,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) g_object_class_install_property (object_class, PROP_PHASE2_CLIENT_CERT, - nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, + _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, "Phase2 client certificate", "Phase2 client certificate", DBUS_TYPE_G_UCHAR_ARRAY, @@ -887,7 +887,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) g_object_class_install_property (object_class, PROP_PRIVATE_KEY, - nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY, + _nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY, "Private key", "Private key", DBUS_TYPE_G_UCHAR_ARRAY, @@ -895,7 +895,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY, - nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, + _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, "Phase2 private key", "Phase2 private key", DBUS_TYPE_G_UCHAR_ARRAY, diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index 2e3873d509..7e8966850f 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -344,7 +344,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_DNS, - nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS, + _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS, "DNS", "List of DNS servers", DBUS_TYPE_G_UINT_ARRAY, @@ -352,7 +352,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_DNS_SEARCH, - nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH, + _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH, "DNS search", "List of DNS search domains", DBUS_TYPE_G_LIST_OF_STRING, @@ -360,7 +360,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_ADDRESSES, - nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES, + _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES, "Addresses", "List of NMSettingIP4Addresses", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, @@ -368,7 +368,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_ROUTES, - nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES, + _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES, "Routes", "List of NMSettingIP4Routes", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT, diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 0488815171..fc6c5c7ac2 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -285,7 +285,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_DNS, - nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS, + _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS, "DNS", "List of DNS servers", DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR, @@ -293,7 +293,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_DNS_SEARCH, - nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS_SEARCH, + _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS_SEARCH, "DNS search", "List of DNS search domains", DBUS_TYPE_G_LIST_OF_STRING, @@ -301,7 +301,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_ADDRESSES, - nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES, + _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES, "Addresses", "List of NMSettingIP6Addresses", DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, @@ -309,7 +309,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) g_object_class_install_property (object_class, PROP_ROUTES, - nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES, + _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES, "Routes", "List of NMSettingIP6Addresses", DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS, diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index aa2fcfd6d2..ef9ebe15f3 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -233,7 +233,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) g_object_class_install_property (object_class, PROP_DATA, - nm_param_spec_specialized (NM_SETTING_VPN_DATA, + _nm_param_spec_specialized (NM_SETTING_VPN_DATA, "Data", "VPN Service specific data", DBUS_TYPE_G_MAP_OF_STRING, diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index f016ce77f8..0555d1264d 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -250,7 +250,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) g_object_class_install_property (object_class, PROP_MAC_ADDRESS, - nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS, + _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS, "MAC Address", "Harware address", DBUS_TYPE_G_UCHAR_ARRAY, diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 83aeb25997..a2bc65a38c 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -556,7 +556,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting g_object_class_install_property (object_class, PROP_PROTO, - nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PROTO, + _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PROTO, "Proto", "Proto", DBUS_TYPE_G_LIST_OF_STRING, @@ -564,7 +564,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting g_object_class_install_property (object_class, PROP_PAIRWISE, - nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, + _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "Pairwise", "Pairwise", DBUS_TYPE_G_LIST_OF_STRING, @@ -572,7 +572,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting g_object_class_install_property (object_class, PROP_GROUP, - nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP, + _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP, "Group", "Group", DBUS_TYPE_G_LIST_OF_STRING, diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index a356bc48f5..6d06a0ee30 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -530,7 +530,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) /* Properties */ g_object_class_install_property (object_class, PROP_SSID, - nm_param_spec_specialized (NM_SETTING_WIRELESS_SSID, + _nm_param_spec_specialized (NM_SETTING_WIRELESS_SSID, "SSID", "SSID", DBUS_TYPE_G_UCHAR_ARRAY, @@ -562,7 +562,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) g_object_class_install_property (object_class, PROP_BSSID, - nm_param_spec_specialized (NM_SETTING_WIRELESS_BSSID, + _nm_param_spec_specialized (NM_SETTING_WIRELESS_BSSID, "BSSID", "BSSID", DBUS_TYPE_G_UCHAR_ARRAY, @@ -586,7 +586,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) g_object_class_install_property (object_class, PROP_MAC_ADDRESS, - nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS, + _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS, "MAC Address", "Harware address", DBUS_TYPE_G_UCHAR_ARRAY, @@ -594,7 +594,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) g_object_class_install_property (object_class, PROP_SEEN_BSSIDS, - nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS, + _nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS, "Seen BSSIDS", "Seen BSSIDs", DBUS_TYPE_G_LIST_OF_STRING, -- cgit v1.2.1