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

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

17 files changed, 20 insertions, 20 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f08acecc0d..8c87c6a4ee 100644
--- a/src/Makefile.am
+++ b/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 \
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index f421bc67c3..43d029e55a 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/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"
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index 97940df752..f34af24acd 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/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"
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c
index 7ee46afb8f..6103438244 100644
--- a/src/devices/nm-device-ip-tunnel.c
+++ b/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"
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index e28d441bfb..c6956abd5e 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/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"
diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c
index 5b905244d1..3bc5f2f95e 100644
--- a/src/devices/nm-device-tun.c
+++ b/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"
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index deed16b674..5ceedba2fa 100644
--- a/src/devices/nm-device-vlan.c
+++ b/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"
diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c
index 05df4d9993..aa7fc98b32 100644
--- a/src/devices/nm-device-vxlan.c
+++ b/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"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index d681f9d46d..8786f3a31f 100644
--- a/src/devices/nm-device.c
+++ b/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"
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 3bbe60884f..cfac85881a 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/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"
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index a3c4e6c39c..d0fd6f69da 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/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"
diff --git a/src/nm-activation-request.c b/src/nm-act-request.c
index 8e91f30a91..40c1efa2e6 100644
--- a/src/nm-activation-request.c
+++ b/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>
diff --git a/src/nm-activation-request.h b/src/nm-act-request.h
index 0f62cfded3..2443633f00 100644
--- a/src/nm-activation-request.h
+++ b/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__ */
 
diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c
index 36c7135aec..2db305c984 100644
--- a/src/nm-default-route-manager.c
+++ b/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;
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 5a20a8be79..ef2b3a3abc 100644
--- a/src/nm-manager.c
+++ b/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"
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 8c3db0d202..5df3a8865d 100644
--- a/src/nm-policy.c
+++ b/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"
diff --git a/src/ppp-manager/nm-ppp-manager.h b/src/ppp-manager/nm-ppp-manager.h
index 188be84e4c..796620754d 100644
--- a/src/ppp-manager/nm-ppp-manager.h
+++ b/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"