callouts/dispatcher: rename directory callouts

Originally, the "callouts" directory contained various programs
that NetworkManager would call, for example the dhcp helper.

For a while, it only contains nm-dispatcher. Thus rename the directory
to indicate that it's for dispatcher.

.gitignore

@@ -49,11 +49,11 @@ test-*.trs
 /conftest.[ch]
 /conftest.o.*
 
-/callouts/nm-avahi-autoipd.action
-/callouts/nm-dispatcher
-/callouts/nmdbus-dispatcher.*
-/callouts/org.freedesktop.nm_dispatcher.service
-/callouts/tests/test-dispatcher-envp
+/dispatcher/nm-avahi-autoipd.action
+/dispatcher/nm-dispatcher
+/dispatcher/nmdbus-dispatcher.*
+/dispatcher/org.freedesktop.nm_dispatcher.service
+/dispatcher/tests/test-dispatcher-envp
 
 /clients/cli/nmcli
 /clients/cli/settings-docs.c
@@ -276,6 +276,11 @@ test-*.trs
 # but they were on older versions. Thus keep ignoring them
 # otherwise when switching branches these untracked files show
 # up.
+/callouts/nm-avahi-autoipd.action
+/callouts/nm-dispatcher
+/callouts/nmdbus-dispatcher.*
+/callouts/org.freedesktop.nm_dispatcher.service
+/callouts/tests/test-dispatcher-envp
 /include/
 /initscript/Slackware/rc.networkmanager
 /initscript/*/[Nn]etwork[Mm]anager

Makefile.am

@@ -7,7 +7,7 @@ SUBDIRS = \
 	libnm-core \
 	libnm \
 	src \
-	callouts \
+	dispatcher \
 	clients \
 	tools \
 	policy \

configure.ac

@@ -1184,8 +1184,8 @@ libnm-glib/libnm-glib.pc
 libnm-glib/libnm-glib-vpn.pc
 libnm-glib/Makefile
 libnm-glib/tests/Makefile
-callouts/Makefile
-callouts/tests/Makefile
+dispatcher/Makefile
+dispatcher/tests/Makefile
 tools/Makefile
 clients/Makefile
 clients/cli/Makefile

dispatcher/tests/Makefile.am

@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/shared \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
-	-I$(top_srcdir)/callouts \
-	-I$(top_builddir)/callouts \
+	-I$(top_srcdir)/dispatcher \
+	-I$(top_builddir)/dispatcher \
 	-DNETWORKMANAGER_COMPILATION \
 	-DSRCDIR=\"$(abs_srcdir)\" \
 	$(GLIB_CFLAGS)
@@ -21,7 +21,7 @@ test_dispatcher_envp_SOURCES = \
 
 test_dispatcher_envp_LDADD = \
 	$(top_builddir)/libnm/libnm.la \
-	$(top_builddir)/callouts/libnm-dispatcher-core.la \
+	$(top_builddir)/dispatcher/libnm-dispatcher-core.la \
 	$(GLIB_LIBS)
 
 ###############################################################################

dispatcher/tests/dispatcher-connectivity-full

@@ -17,7 +17,7 @@ PATH=
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-connectivity-full
+CONNECTION_FILENAME=/dispatcher/tests/dispatcher-connectivity-full
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0
 CONNECTIVITY_STATE=FULL

dispatcher/tests/dispatcher-connectivity-unknown

@@ -17,6 +17,6 @@ PATH=
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-connectivity-unknown
+CONNECTION_FILENAME=/dispatcher/tests/dispatcher-connectivity-unknown
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0

dispatcher/tests/dispatcher-down

@@ -16,7 +16,7 @@ PATH=
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-down
+CONNECTION_FILENAME=/dispatcher/tests/dispatcher-down
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0
 

dispatcher/tests/dispatcher-external

@@ -25,7 +25,7 @@ gateway=0.0.0.0
 PATH=
 CONNECTION_UUID=92bbc2fb-7304-46be-8ebb-6093dbe19a6a
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
-CONNECTION_FILENAME=/callouts/tests/dispatcher-external
+CONNECTION_FILENAME=/dispatcher/tests/dispatcher-external
 CONNECTION_ID=virbr0
 CONNECTION_EXTERNAL=1
 DEVICE_IFACE=virbr0

dispatcher/tests/dispatcher-up

@@ -39,7 +39,7 @@ PATH=
 CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-up
+CONNECTION_FILENAME=/dispatcher/tests/dispatcher-up
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=wlan0
 PROXY_PAC_URL=http://networkmanager.com/proxy.pac

dispatcher/tests/dispatcher-vpn-down

@@ -39,7 +39,7 @@ PATH=
 CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-down
+CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-down
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=tun0
 PROXY_PAC_URL=http://networkmanager.com/proxy.pac

dispatcher/tests/dispatcher-vpn-up

@@ -39,7 +39,7 @@ PATH=
 CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
 CONNECTION_ID=Random Connection
-CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-up
+CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-up
 DEVICE_IFACE=wlan0
 DEVICE_IP_IFACE=tun0
 PROXY_PAC_URL=http://networkmanager.com/proxy.pac

dispatcher/tests/test-dispatcher-envp.c

@@ -87,7 +87,7 @@ parse_main (GKeyFile *kf,
 	                       g_variant_new_object_path ("/org/freedesktop/NetworkManager/Connections/5"));
 
 	/* Strip out the non-fixed portion of the filename */
-	filename = strstr (filename, "/callouts");
+	filename = strstr (filename, "/dispatcher");
 	g_variant_builder_add (&props, "{sv}",
 	                       "filename",
 	                       g_variant_new_string (filename));