From 9e627d1bced16929f3f969d5202f331ea7405f5c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 2 Mar 2010 15:06:14 -0800 Subject: [PATCH] trivial: rename some CamelCase source files to not-camel-case --- po/POTFILES.in | 2 +- src/Makefile.am | 14 +++++++------- src/backends/NetworkManagerArch.c | 2 +- src/backends/NetworkManagerDebian.c | 2 +- src/backends/NetworkManagerFrugalware.c | 2 +- src/backends/NetworkManagerGeneric.c | 2 +- src/backends/NetworkManagerGentoo.c | 2 +- src/backends/NetworkManagerMandriva.c | 2 +- src/backends/NetworkManagerPaldo.c | 2 +- src/backends/NetworkManagerPardus.c | 2 +- src/backends/NetworkManagerRedHat.c | 2 +- src/backends/NetworkManagerSlackware.c | 2 +- src/backends/NetworkManagerSuSE.c | 2 +- src/ip6-manager/nm-netlink-listener.c | 2 +- src/{NetworkManager.c => main.c} | 4 ++-- src/modem-manager/nm-modem.c | 2 +- src/named-manager/nm-named-manager.c | 2 +- src/nm-device-ethernet.c | 2 +- src/nm-device-olpc-mesh.c | 9 +++++++-- src/nm-device-wifi.c | 3 +-- src/nm-device-wifi.h | 2 +- src/nm-device.c | 3 +-- src/nm-manager.c | 2 +- src/nm-netlink-monitor.c | 2 +- src/{NetworkManagerPolicy.c => nm-policy.c} | 6 +++--- src/{NetworkManagerPolicy.h => nm-policy.h} | 0 src/{NetworkManagerSystem.c => nm-system.c} | 2 +- src/{NetworkManagerSystem.h => nm-system.h} | 0 src/{NetworkManagerAP.c => nm-wifi-ap.c} | 2 +- src/{NetworkManagerAP.h => nm-wifi-ap.h} | 0 src/vpn-manager/nm-vpn-connection.c | 2 +- 31 files changed, 43 insertions(+), 40 deletions(-) rename src/{NetworkManager.c => main.c} (99%) rename src/{NetworkManagerPolicy.c => nm-policy.c} (99%) rename src/{NetworkManagerPolicy.h => nm-policy.h} (100%) rename src/{NetworkManagerSystem.c => nm-system.c} (99%) rename src/{NetworkManagerSystem.h => nm-system.h} (100%) rename src/{NetworkManagerAP.c => nm-wifi-ap.c} (99%) rename src/{NetworkManagerAP.h => nm-wifi-ap.h} (100%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 701dc795e1..99960438f9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -11,7 +11,7 @@ libnm-util/crypto_gnutls.c libnm-util/crypto_nss.c libnm-util/nm-utils.c src/nm-netlink-monitor.c -src/NetworkManager.c +src/main.c src/dhcp-manager/nm-dhcp-dhclient.c src/ip6-manager/nm-netlink-listener.c src/named-manager/nm-named-manager.c diff --git a/src/Makefile.am b/src/Makefile.am index f0bb60b77b..5f81e491ed 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -98,8 +98,8 @@ NetworkManager_SOURCES = \ nm-device-cdma.h \ nm-device-gsm.c \ nm-device-gsm.h \ - NetworkManagerAP.c \ - NetworkManagerAP.h \ + nm-wifi-ap.c \ + nm-wifi-ap.h \ nm-dbus-manager.h \ nm-dbus-manager.c \ nm-udev-manager.c \ @@ -114,15 +114,15 @@ NetworkManager_SOURCES = \ nm-secrets-provider-interface.h \ nm-active-connection.h \ nm-active-connection.c \ - NetworkManager.c \ - NetworkManagerPolicy.c \ - NetworkManagerPolicy.h \ + main.c \ + nm-policy.c \ + nm-policy.h \ nm-policy-hosts.c \ nm-policy-hosts.h \ NetworkManagerUtils.c \ NetworkManagerUtils.h \ - NetworkManagerSystem.c \ - NetworkManagerSystem.h \ + nm-system.c \ + nm-system.h \ nm-logging.c \ nm-logging.h \ nm-manager.c \ diff --git a/src/backends/NetworkManagerArch.c b/src/backends/NetworkManagerArch.c index 3ed5677e87..c70e24593c 100644 --- a/src/backends/NetworkManagerArch.c +++ b/src/backends/NetworkManagerArch.c @@ -40,7 +40,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" /* diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c index 2f6abd1285..cba1363f3a 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -32,7 +32,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" diff --git a/src/backends/NetworkManagerFrugalware.c b/src/backends/NetworkManagerFrugalware.c index 492bf19399..dfe62921c0 100644 --- a/src/backends/NetworkManagerFrugalware.c +++ b/src/backends/NetworkManagerFrugalware.c @@ -27,7 +27,7 @@ #include #include -#include "NetworkManagerSystem.h" +#include "nm-system.h" /* Provided by the frugalwareutils package on Frugalware */ #include diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c index 7984f2c02d..26076fa678 100644 --- a/src/backends/NetworkManagerGeneric.c +++ b/src/backends/NetworkManagerGeneric.c @@ -33,7 +33,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" #include "nm-netlink.h" #include "nm-utils.h" diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c index aa4b40c373..8616941f1a 100644 --- a/src/backends/NetworkManagerGentoo.c +++ b/src/backends/NetworkManagerGentoo.c @@ -32,7 +32,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" diff --git a/src/backends/NetworkManagerMandriva.c b/src/backends/NetworkManagerMandriva.c index 527a25d896..8209ff4fe6 100644 --- a/src/backends/NetworkManagerMandriva.c +++ b/src/backends/NetworkManagerMandriva.c @@ -30,7 +30,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" /* diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c index 0147a3b0e4..777d4e23e1 100644 --- a/src/backends/NetworkManagerPaldo.c +++ b/src/backends/NetworkManagerPaldo.c @@ -31,7 +31,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" diff --git a/src/backends/NetworkManagerPardus.c b/src/backends/NetworkManagerPardus.c index 52703e23d2..d952cf3657 100644 --- a/src/backends/NetworkManagerPardus.c +++ b/src/backends/NetworkManagerPardus.c @@ -29,7 +29,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" /* * nm_system_enable_loopback diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c index 1e3f7e9652..954e58a865 100644 --- a/src/backends/NetworkManagerRedHat.c +++ b/src/backends/NetworkManagerRedHat.c @@ -28,7 +28,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" /* diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c index 8d7c5bf294..a35e1bb628 100644 --- a/src/backends/NetworkManagerSlackware.c +++ b/src/backends/NetworkManagerSlackware.c @@ -29,7 +29,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" /* * nm_system_enable_loopback diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index a0cd1cb105..ef4ff15b37 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -32,7 +32,7 @@ #include #include "NetworkManagerGeneric.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" diff --git a/src/ip6-manager/nm-netlink-listener.c b/src/ip6-manager/nm-netlink-listener.c index bfcc22f630..ea7462c308 100644 --- a/src/ip6-manager/nm-netlink-listener.c +++ b/src/ip6-manager/nm-netlink-listener.c @@ -43,7 +43,7 @@ #include #include "NetworkManager.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-netlink-listener.h" #include "nm-utils.h" #include "nm-marshal.h" diff --git a/src/NetworkManager.c b/src/main.c similarity index 99% rename from src/NetworkManager.c rename to src/main.c index 17a96a9d16..5f500c1ac0 100644 --- a/src/NetworkManager.c +++ b/src/main.c @@ -43,8 +43,8 @@ #include "nm-utils.h" #include "NetworkManagerUtils.h" #include "nm-manager.h" -#include "NetworkManagerPolicy.h" -#include "NetworkManagerSystem.h" +#include "nm-policy.h" +#include "nm-system.h" #include "nm-named-manager.h" #include "nm-dbus-manager.h" #include "nm-supplicant-manager.h" diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 40a76b1db5..33acc0ccde 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -21,7 +21,7 @@ #include #include "nm-modem.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-dbus-manager.h" #include "nm-setting-connection.h" #include "nm-marshal.h" diff --git a/src/named-manager/nm-named-manager.c b/src/named-manager/nm-named-manager.c index c96a2e691b..2d4a132b78 100644 --- a/src/named-manager/nm-named-manager.c +++ b/src/named-manager/nm-named-manager.c @@ -39,7 +39,7 @@ #include "nm-named-manager.h" #include "nm-ip4-config.h" #include "nm-utils.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "NetworkManagerUtils.h" #ifdef HAVE_SELINUX diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index f20afcc45c..abc282c6f0 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -45,7 +45,7 @@ #include "nm-supplicant-config.h" #include "nm-netlink.h" #include "nm-netlink-monitor.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" #include "nm-setting-8021x.h" diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c index 8be4632c11..2a1a235330 100644 --- a/src/nm-device-olpc-mesh.c +++ b/src/nm-device-olpc-mesh.c @@ -43,14 +43,17 @@ #include "nm-device-private.h" #include "nm-utils.h" #include "NetworkManagerUtils.h" -#include "NetworkManagerPolicy.h" #include "nm-activation-request.h" #include "nm-properties-changed-signal.h" #include "nm-setting-connection.h" #include "nm-setting-olpc-mesh.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-manager.h" +/* This is a bug; but we can't really change API now... */ +#include "NetworkManagerVPN.h" + + #include "nm-device-olpc-mesh-glue.h" static void nm_device_olpc_mesh_set_ssid (NMDeviceOlpcMesh *self, const GByteArray * ssid); @@ -585,6 +588,7 @@ real_act_stage1_prepare (NMDevice *dev, NMDeviceStateReason *reason) /* disconnect companion device, if it is connected */ if (nm_device_get_act_request (NM_DEVICE (priv->companion))) { nm_warning ("disconnecting companion device"); + /* FIXME: VPN stuff here is a bug; but we can't really change API now... */ nm_device_state_changed (NM_DEVICE (priv->companion), NM_DEVICE_STATE_DISCONNECTED, NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED); @@ -822,6 +826,7 @@ companion_state_changed_cb (NMDeviceWifi *companion, return; nm_debug ("disconnecting mesh due to companion connectivity"); + /* FIXME: VPN stuff here is a bug; but we can't really change API now... */ nm_device_state_changed (NM_DEVICE (self), NM_DEVICE_STATE_DISCONNECTED, NM_VPN_CONNECTION_STATE_REASON_USER_DISCONNECTED); diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c index e44ac96cd6..aa03063760 100644 --- a/src/nm-device-wifi.c +++ b/src/nm-device-wifi.c @@ -39,7 +39,6 @@ #include "nm-utils.h" #include "nm-marshal.h" #include "NetworkManagerUtils.h" -#include "NetworkManagerPolicy.h" #include "nm-activation-request.h" #include "nm-supplicant-manager.h" #include "nm-supplicant-interface.h" @@ -51,7 +50,7 @@ #include "nm-setting-8021x.h" #include "nm-setting-ip4-config.h" #include "nm-setting-ip6-config.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" static gboolean impl_device_get_access_points (NMDeviceWifi *device, GPtrArray **aps, diff --git a/src/nm-device-wifi.h b/src/nm-device-wifi.h index c793844c5c..45b573a03c 100644 --- a/src/nm-device-wifi.h +++ b/src/nm-device-wifi.h @@ -28,7 +28,7 @@ #include "nm-rfkill.h" #include "nm-device.h" -#include "NetworkManagerAP.h" +#include "nm-wifi-ap.h" struct NMAccessPointList; diff --git a/src/nm-device.c b/src/nm-device.c index 7a2f83d96f..6ffa8ac63d 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -38,9 +38,8 @@ #include "nm-device-interface.h" #include "nm-device.h" #include "nm-device-private.h" -#include "NetworkManagerPolicy.h" #include "NetworkManagerUtils.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-dhcp-manager.h" #include "nm-dbus-manager.h" #include "nm-named-manager.h" diff --git a/src/nm-manager.c b/src/nm-manager.c index f49c670b2c..acf0f30ed6 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -39,7 +39,7 @@ #include "nm-device-olpc-mesh.h" #include "nm-device-cdma.h" #include "nm-device-gsm.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-properties-changed-signal.h" #include "nm-setting-bluetooth.h" #include "nm-setting-connection.h" diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c index 2c3987c3d5..04f87b4b1d 100644 --- a/src/nm-netlink-monitor.c +++ b/src/nm-netlink-monitor.c @@ -41,7 +41,7 @@ #include #include "NetworkManager.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-netlink-monitor.h" #include "nm-utils.h" #include "nm-marshal.h" diff --git a/src/NetworkManagerPolicy.c b/src/nm-policy.c similarity index 99% rename from src/NetworkManagerPolicy.c rename to src/nm-policy.c index 82cf26ce4d..702d3dc709 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/nm-policy.c @@ -25,9 +25,9 @@ #include #include -#include "NetworkManagerPolicy.h" +#include "nm-policy.h" #include "NetworkManagerUtils.h" -#include "NetworkManagerAP.h" +#include "nm-wifi-ap.h" #include "nm-activation-request.h" #include "nm-utils.h" #include "nm-device-interface.h" @@ -37,7 +37,7 @@ #include "nm-dbus-manager.h" #include "nm-setting-ip4-config.h" #include "nm-setting-connection.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-named-manager.h" #include "nm-vpn-manager.h" #include "nm-modem.h" diff --git a/src/NetworkManagerPolicy.h b/src/nm-policy.h similarity index 100% rename from src/NetworkManagerPolicy.h rename to src/nm-policy.h diff --git a/src/NetworkManagerSystem.c b/src/nm-system.c similarity index 99% rename from src/NetworkManagerSystem.c rename to src/nm-system.c index c514a221e7..78a3381eb0 100644 --- a/src/NetworkManagerSystem.c +++ b/src/nm-system.c @@ -42,7 +42,7 @@ #include #include -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-device.h" #include "nm-named-manager.h" #include "NetworkManagerUtils.h" diff --git a/src/NetworkManagerSystem.h b/src/nm-system.h similarity index 100% rename from src/NetworkManagerSystem.h rename to src/nm-system.h diff --git a/src/NetworkManagerAP.c b/src/nm-wifi-ap.c similarity index 99% rename from src/NetworkManagerAP.c rename to src/nm-wifi-ap.c index 9b95924144..f3365176ad 100644 --- a/src/NetworkManagerAP.c +++ b/src/nm-wifi-ap.c @@ -23,7 +23,7 @@ #include -#include "NetworkManagerAP.h" +#include "nm-wifi-ap.h" #include "NetworkManagerUtils.h" #include "nm-utils.h" #include "nm-dbus-manager.h" diff --git a/src/NetworkManagerAP.h b/src/nm-wifi-ap.h similarity index 100% rename from src/NetworkManagerAP.h rename to src/nm-wifi-ap.h diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c index f8360dc669..01bd23c578 100644 --- a/src/vpn-manager/nm-vpn-connection.c +++ b/src/vpn-manager/nm-vpn-connection.c @@ -35,7 +35,7 @@ #include "nm-setting-ip4-config.h" #include "nm-dbus-manager.h" #include "nm-manager.h" -#include "NetworkManagerSystem.h" +#include "nm-system.h" #include "nm-utils.h" #include "nm-vpn-plugin-bindings.h" #include "nm-marshal.h"