diff options
author | Dan Winship <danw@gnome.org> | 2014-06-26 13:44:36 -0400 |
---|---|---|
committer | Dan Winship <danw@gnome.org> | 2014-08-01 14:34:06 -0400 |
commit | 3ac0f528780895c474a437bd75ab7e4baeaa83aa (patch) | |
tree | 29593182408053cc42b9f76f0245ff8a1b46634d /src/nm-dhcp6-config.c | |
parent | b4ae6eaec9cec10d68bdcce7151b07451e4de6a3 (diff) | |
download | NetworkManager-3ac0f528780895c474a437bd75ab7e4baeaa83aa.tar.gz |
libnm, core, cli, tui: fix the capitalization of various types
GLib/Gtk have mostly settled on the convention that two-letter
acronyms in type names remain all-caps (eg, "IO"), but longer acronyms
become initial-caps-only (eg, "Tcp").
NM was inconsistent, with most long acronyms using initial caps only
(Adsl, Cdma, Dcb, Gsm, Olpc, Vlan), but others using all caps (DHCP,
PPP, PPPOE, VPN). Fix libnm and src/ to use initial-caps only for all
three-or-more-letter-long acronyms (and update nmcli and nmtui for the
libnm changes).
Diffstat (limited to 'src/nm-dhcp6-config.c')
-rw-r--r-- | src/nm-dhcp6-config.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c index 2eb4ab1930..55dac5da84 100644 --- a/src/nm-dhcp6-config.c +++ b/src/nm-dhcp6-config.c @@ -29,14 +29,14 @@ #include "nm-utils.h" -G_DEFINE_TYPE (NMDHCP6Config, nm_dhcp6_config, G_TYPE_OBJECT) +G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, G_TYPE_OBJECT) -#define NM_DHCP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP6_CONFIG, NMDHCP6ConfigPrivate)) +#define NM_DHCP6_CONFIG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DHCP6_CONFIG, NMDhcp6ConfigPrivate)) typedef struct { char *dbus_path; GHashTable *options; -} NMDHCP6ConfigPrivate; +} NMDhcp6ConfigPrivate; enum { @@ -47,14 +47,14 @@ enum { }; -NMDHCP6Config * +NMDhcp6Config * nm_dhcp6_config_new (void) { return NM_DHCP6_CONFIG (g_object_new (NM_TYPE_DHCP6_CONFIG, NULL)); } void -nm_dhcp6_config_add_option (NMDHCP6Config *self, +nm_dhcp6_config_add_option (NMDhcp6Config *self, const char *key, const char *option) { @@ -72,7 +72,7 @@ nm_dhcp6_config_add_option (NMDHCP6Config *self, } void -nm_dhcp6_config_reset (NMDHCP6Config *self) +nm_dhcp6_config_reset (NMDhcp6Config *self) { g_return_if_fail (NM_IS_DHCP6_CONFIG (self)); @@ -81,7 +81,7 @@ nm_dhcp6_config_reset (NMDHCP6Config *self) } const char * -nm_dhcp6_config_get_option (NMDHCP6Config *self, const char *key) +nm_dhcp6_config_get_option (NMDhcp6Config *self, const char *key) { GValue *value; @@ -94,7 +94,7 @@ nm_dhcp6_config_get_option (NMDHCP6Config *self, const char *key) /* Caller owns the list, but not the values in the list */ GSList * -nm_dhcp6_config_list_options (NMDHCP6Config *self) +nm_dhcp6_config_list_options (NMDhcp6Config *self) { GHashTableIter iter; const char *option = NULL; @@ -110,7 +110,7 @@ nm_dhcp6_config_list_options (NMDHCP6Config *self) } const char * -nm_dhcp6_config_get_dbus_path (NMDHCP6Config *self) +nm_dhcp6_config_get_dbus_path (NMDhcp6Config *self) { g_return_val_if_fail (NM_IS_DHCP6_CONFIG (self), NULL); @@ -127,9 +127,9 @@ nm_gvalue_destroy (gpointer data) } static void -nm_dhcp6_config_init (NMDHCP6Config *self) +nm_dhcp6_config_init (NMDhcp6Config *self) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (self); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (self); static guint32 counter = 0; priv->dbus_path = g_strdup_printf (NM_DBUS_PATH "/DHCP6Config/%d", counter++); @@ -141,7 +141,7 @@ nm_dhcp6_config_init (NMDHCP6Config *self) static void finalize (GObject *object) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); g_free (priv->dbus_path); g_hash_table_destroy (priv->options); @@ -153,7 +153,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMDHCP6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); + NMDhcp6ConfigPrivate *priv = NM_DHCP6_CONFIG_GET_PRIVATE (object); switch (prop_id) { case PROP_OPTIONS: @@ -166,11 +166,11 @@ get_property (GObject *object, guint prop_id, } static void -nm_dhcp6_config_class_init (NMDHCP6ConfigClass *config_class) +nm_dhcp6_config_class_init (NMDhcp6ConfigClass *config_class) { GObjectClass *object_class = G_OBJECT_CLASS (config_class); - g_type_class_add_private (config_class, sizeof (NMDHCP6ConfigPrivate)); + g_type_class_add_private (config_class, sizeof (NMDhcp6ConfigPrivate)); /* virtual methods */ object_class->get_property = get_property; |