core: rename "nm-activation-request.[hc]" for NMActRequest

"nm-activation-request.[hc]" contains NMActRequest. It should
thus be called "nm-act-request.[hc]".

src/Makefile.am

@@ -421,8 +421,8 @@ libNetworkManager_la_SOURCES = \
 	vpn-manager/nm-vpn-manager.c \
 	vpn-manager/nm-vpn-manager.h \
 	\
-	nm-activation-request.c \
-	nm-activation-request.h \
+	nm-act-request.c \
+	nm-act-request.h \
 	nm-active-connection.c \
 	nm-active-connection.h \
 	nm-audit-manager.c \

src/devices/nm-device-ethernet.c

@@ -32,7 +32,7 @@
 #include <gudev/gudev.h>
 
 #include "nm-device-private.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "NetworkManagerUtils.h"
 #include "nm-supplicant-manager.h"
 #include "nm-supplicant-interface.h"

src/devices/nm-device-infiniband.c

@@ -26,7 +26,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-enum-types.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"

src/devices/nm-device-ip-tunnel.c

@@ -34,7 +34,7 @@
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 #include "nm-settings.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-ip4-config.h"
 
 #include "nmdbus-device-ip-tunnel.h"

src/devices/nm-device-macvlan.c

@@ -26,7 +26,7 @@
 
 #include "nm-device-private.h"
 #include "nm-settings.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-manager.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"

src/devices/nm-device-tun.c

@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-device-tun.h"
 #include "nm-device-private.h"
 #include "nm-ip4-config.h"

src/devices/nm-device-vlan.c

@@ -30,7 +30,7 @@
 #include "nm-device-private.h"
 #include "nm-enum-types.h"
 #include "nm-settings.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"

src/devices/nm-device-vxlan.c

@@ -32,7 +32,7 @@
 #include "nm-setting-vxlan.h"
 #include "nm-setting-wired.h"
 #include "nm-settings.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-ip4-config.h"
 
 #include "nmdbus-device-vxlan.h"

src/devices/nm-device.c

@@ -44,7 +44,7 @@
 #include "nm-rdisc.h"
 #include "nm-lndp-rdisc.h"
 #include "nm-dhcp-manager.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-dnsmasq-manager.h"

src/devices/wifi/nm-device-olpc-mesh.c

@@ -41,7 +41,7 @@
 #include "nm-device-private.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-manager.h"

src/devices/wifi/nm-device-wifi.c

@@ -33,7 +33,7 @@
 #include "nm-device-private.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-supplicant-manager.h"
 #include "nm-supplicant-interface.h"
 #include "nm-supplicant-config.h"

src/nm-act-request.c

@@ -21,7 +21,7 @@
 
 #include "nm-default.h"
 
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 
 #include <string.h>
 #include <stdlib.h>

src/nm-act-request.h

@@ -18,8 +18,8 @@
  * (C) Copyright 2005 - 2012 Red Hat, Inc.
  */
 
-#ifndef __NETWORKMANAGER_ACTIVATION_REQUEST_H__
-#define __NETWORKMANAGER_ACTIVATION_REQUEST_H__
+#ifndef __NM_ACT_REQUEST_H__
+#define __NM_ACT_REQUEST_H__
 
 #include "nm-connection.h"
 #include "nm-active-connection.h"
@@ -72,5 +72,5 @@ NMActRequestGetSecretsCallId nm_act_request_get_secrets (NMActRequest *req,
 void nm_act_request_cancel_secrets (NMActRequest *req, NMActRequestGetSecretsCallId call_id);
 void nm_act_request_clear_secrets (NMActRequest *self);
 
-#endif /* __NETWORKMANAGER_ACTIVATION_REQUEST_H__ */
+#endif /* __NM_ACT_REQUEST_H__ */
 

src/nm-default-route-manager.c

@@ -30,7 +30,7 @@
 #include "nm-manager.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 
 typedef struct {
 	GPtrArray *entries_ip4;

src/nm-manager.c

@@ -48,7 +48,7 @@
 #include "nm-connectivity.h"
 #include "nm-policy.h"
 #include "nm-session-monitor.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-core-internal.h"
 #include "nm-config.h"
 #include "nm-audit-manager.h"

src/nm-policy.c

@@ -28,7 +28,7 @@
 
 #include "nm-policy.h"
 #include "NetworkManagerUtils.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-device.h"
 #include "nm-default-route-manager.h"
 #include "nm-setting-ip4-config.h"

src/ppp-manager/nm-ppp-manager.h

@@ -25,7 +25,7 @@
 
 #include "nm-exported-object.h"
 #include "nm-ppp-status.h"
-#include "nm-activation-request.h"
+#include "nm-act-request.h"
 #include "nm-connection.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"