trivial: rename some CamelCase source files to not-camel-case

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

src/Makefile.am

@@ -98,8 +98,8 @@ NetworkManager_SOURCES = \
 		nm-device-cdma.h \
 		nm-device-gsm.c \
 		nm-device-gsm.h \
-		NetworkManagerAP.c \
+		nm-wifi-ap.c \
-		NetworkManagerAP.h \
+		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 \
+		main.c \
-		NetworkManagerPolicy.c \
+		nm-policy.c \
-		NetworkManagerPolicy.h \
+		nm-policy.h \
 		nm-policy-hosts.c \
 		nm-policy-hosts.h \
 		NetworkManagerUtils.c \
 		NetworkManagerUtils.h \
-		NetworkManagerSystem.c \
+		nm-system.c \
-		NetworkManagerSystem.h \
+		nm-system.h \
 		nm-logging.c \
 		nm-logging.h \
 		nm-manager.c \

src/backends/NetworkManagerArch.c

@@ -40,7 +40,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 
 /*

src/backends/NetworkManagerDebian.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 

src/backends/NetworkManagerFrugalware.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 
 /* Provided by the frugalwareutils package on Frugalware */
 #include <libfwnetconfig.h> 

src/backends/NetworkManagerGeneric.c

@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 #include "nm-netlink.h"
 #include "nm-utils.h"

src/backends/NetworkManagerGentoo.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 

src/backends/NetworkManagerMandriva.c

@@ -30,7 +30,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 
 /*

src/backends/NetworkManagerPaldo.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 

src/backends/NetworkManagerPardus.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 
 /*
  * nm_system_enable_loopback

src/backends/NetworkManagerRedHat.c

@@ -28,7 +28,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 
 /*

src/backends/NetworkManagerSlackware.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 
 /*
  * nm_system_enable_loopback

src/backends/NetworkManagerSuSE.c

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 
 #include "NetworkManagerGeneric.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 

src/ip6-manager/nm-netlink-listener.c

@@ -43,7 +43,7 @@
 #include <glib/gi18n.h>
 
 #include "NetworkManager.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "nm-netlink-listener.h"
 #include "nm-utils.h"
 #include "nm-marshal.h"

src/main.c

@@ -43,8 +43,8 @@
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
-#include "NetworkManagerPolicy.h"
+#include "nm-policy.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "nm-named-manager.h"
 #include "nm-dbus-manager.h"
 #include "nm-supplicant-manager.h"

src/modem-manager/nm-modem.c

@@ -21,7 +21,7 @@
 
 #include <string.h>
 #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"

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

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"

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);

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,

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;
 

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"

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"

src/nm-netlink-monitor.c

@@ -41,7 +41,7 @@
 #include <glib/gi18n.h>
 
 #include "NetworkManager.h"
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "nm-netlink-monitor.h"
 #include "nm-utils.h"
 #include "nm-marshal.h"

src/nm-policy.c

@@ -25,9 +25,9 @@
 #include <netdb.h>
 #include <ctype.h>
 
-#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"

src/nm-system.c

@@ -42,7 +42,7 @@
 #include <ctype.h>
 #include <net/if.h>
 
-#include "NetworkManagerSystem.h"
+#include "nm-system.h"
 #include "nm-device.h"
 #include "nm-named-manager.h"
 #include "NetworkManagerUtils.h"

src/nm-wifi-ap.c

@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include "NetworkManagerAP.h"
+#include "nm-wifi-ap.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-dbus-manager.h"

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"