summaryrefslogtreecommitdiff
path: root/src/nm-dispatcher.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-06-26 13:44:36 -0400
committerDan Winship <danw@gnome.org>2014-08-01 14:34:06 -0400
commit3ac0f528780895c474a437bd75ab7e4baeaa83aa (patch)
tree29593182408053cc42b9f76f0245ff8a1b46634d /src/nm-dispatcher.c
parentb4ae6eaec9cec10d68bdcce7151b07451e4de6a3 (diff)
downloadNetworkManager-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-dispatcher.c')
-rw-r--r--src/nm-dispatcher.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index 2637cc8bcb..fddd0d5a86 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -94,7 +94,7 @@ dump_object_to_props (GObject *object, GHashTable *hash)
}
static void
-dump_dhcp4_to_props (NMDHCP4Config *config, GHashTable *hash)
+dump_dhcp4_to_props (NMDhcp4Config *config, GHashTable *hash)
{
GSList *options, *iter;
@@ -110,7 +110,7 @@ dump_dhcp4_to_props (NMDHCP4Config *config, GHashTable *hash)
}
static void
-dump_dhcp6_to_props (NMDHCP6Config *config, GHashTable *hash)
+dump_dhcp6_to_props (NMDhcp6Config *config, GHashTable *hash)
{
GSList *options, *iter;
@@ -135,8 +135,8 @@ fill_device_props (NMDevice *device,
{
NMIP4Config *ip4_config;
NMIP6Config *ip6_config;
- NMDHCP4Config *dhcp4_config;
- NMDHCP6Config *dhcp6_config;
+ NMDhcp4Config *dhcp4_config;
+ NMDhcp6Config *dhcp6_config;
/* If the action is for a VPN, send the VPN's IP interface instead of the device's */
value_hash_add_str (dev_hash, NMD_DEVICE_PROPS_IP_INTERFACE, nm_device_get_ip_iface (device));