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/main.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/main.c')
-rw-r--r-- | src/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c index 6886586940..f883689568 100644 --- a/src/main.c +++ b/src/main.c @@ -344,11 +344,11 @@ main (int argc, char *argv[]) gboolean success, show_version = FALSE; int i; NMManager *manager = NULL; - gs_unref_object NMVPNManager *vpn_manager = NULL; + gs_unref_object NMVpnManager *vpn_manager = NULL; gs_unref_object NMDnsManager *dns_mgr = NULL; gs_unref_object NMDBusManager *dbus_mgr = NULL; gs_unref_object NMSupplicantManager *sup_mgr = NULL; - gs_unref_object NMDHCPManager *dhcp_mgr = NULL; + gs_unref_object NMDhcpManager *dhcp_mgr = NULL; gs_unref_object NMFirewallManager *fw_mgr = NULL; gs_unref_object NMSettings *settings = NULL; gs_unref_object NMConfig *config = NULL; |