From 4cc13befd3cc242c5065ce6ea91e335b705b2f36 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 14 May 2014 14:51:43 -0500
Subject: [PATCH] dispatcher: rename executable to 'nm-dispatcher'

---
 callouts/Makefile.am                                   | 10 +++++-----
 .../{nm-dispatcher-action.h => nm-dispatcher-api.h}    |  0
 callouts/nm-dispatcher-utils.c                         |  2 +-
 callouts/{nm-dispatcher-action.c => nm-dispatcher.c}   |  2 +-
 callouts/org.freedesktop.nm_dispatcher.service.in      |  2 +-
 callouts/tests/test-dispatcher-envp.c                  |  2 +-
 contrib/fedora/rpm/NetworkManager.spec                 |  2 +-
 data/NetworkManager-dispatcher.service.in              |  2 +-
 src/nm-dispatcher.c                                    |  2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename callouts/{nm-dispatcher-action.h => nm-dispatcher-api.h} (100%)
 rename callouts/{nm-dispatcher-action.c => nm-dispatcher.c} (99%)

diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index 8b018be703..a7ef429849 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -26,7 +26,7 @@ dbusservice_DATA = \
 	nm-avahi-autoipd.conf
 
 libexec_PROGRAMS = \
-	nm-dispatcher.action \
+	nm-dispatcher \
 	nm-avahi-autoipd.action
 
 
@@ -38,13 +38,13 @@ nm_avahi_autoipd_action_LDADD = \
 	$(GLIB_LIBS)
 
 
-nm_dispatcher_action_SOURCES = \
-	nm-dispatcher-action.c \
-	nm-dispatcher-action.h \
+nm_dispatcher_SOURCES = \
+	nm-dispatcher.c \
+	nm-dispatcher-api.h \
 	nm-dispatcher-utils.c \
 	nm-dispatcher-utils.h
 
-nm_dispatcher_action_LDADD = \
+nm_dispatcher_LDADD = \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS)
diff --git a/callouts/nm-dispatcher-action.h b/callouts/nm-dispatcher-api.h
similarity index 100%
rename from callouts/nm-dispatcher-action.h
rename to callouts/nm-dispatcher-api.h
diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index 1f99a0b6c1..b1d11daf3d 100644
--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
@@ -30,7 +30,7 @@
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-connection.h>
 
-#include "nm-dispatcher-action.h"
+#include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 
 #include "nm-dispatcher-utils.h"
diff --git a/callouts/nm-dispatcher-action.c b/callouts/nm-dispatcher.c
similarity index 99%
rename from callouts/nm-dispatcher-action.c
rename to callouts/nm-dispatcher.c
index 337a5c616c..e9cd2e74e2 100644
--- a/callouts/nm-dispatcher-action.c
+++ b/callouts/nm-dispatcher.c
@@ -37,7 +37,7 @@
 #include <dbus/dbus-glib.h>
 
 
-#include "nm-dispatcher-action.h"
+#include "nm-dispatcher-api.h"
 #include "nm-dispatcher-utils.h"
 #include "nm-glib-compat.h"
 
diff --git a/callouts/org.freedesktop.nm_dispatcher.service.in b/callouts/org.freedesktop.nm_dispatcher.service.in
index 9feb3b468b..ff037cca9f 100644
--- a/callouts/org.freedesktop.nm_dispatcher.service.in
+++ b/callouts/org.freedesktop.nm_dispatcher.service.in
@@ -1,6 +1,6 @@
 [D-BUS Service]
 Name=org.freedesktop.nm_dispatcher
-Exec=@libexecdir@/nm-dispatcher.action
+Exec=@libexecdir@/nm-dispatcher
 User=root
 SystemdService=dbus-org.freedesktop.nm-dispatcher.service
 
diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index 8dd18430ed..a91ae2b27a 100644
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/callouts/tests/test-dispatcher-envp.c
@@ -29,7 +29,7 @@
 #include "nm-setting-connection.h"
 #include "nm-dispatcher-utils.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-dispatcher-action.h"
+#include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 
 /*******************************************/
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 616f219b32..3a2f29b2b4 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -441,7 +441,7 @@ fi
 %{_bindir}/nm-online
 %{_libexecdir}/nm-dhcp-helper
 %{_libexecdir}/nm-avahi-autoipd.action
-%{_libexecdir}/nm-dispatcher.action
+%{_libexecdir}/nm-dispatcher
 %dir %{_libdir}/NetworkManager
 %{_libdir}/NetworkManager/libnm-settings-plugin*.so
 %{_mandir}/man1/*
diff --git a/data/NetworkManager-dispatcher.service.in b/data/NetworkManager-dispatcher.service.in
index e1b90036f3..c450478bac 100644
--- a/data/NetworkManager-dispatcher.service.in
+++ b/data/NetworkManager-dispatcher.service.in
@@ -4,7 +4,7 @@ Description=Network Manager Script Dispatcher Service
 [Service]
 Type=dbus
 BusName=org.freedesktop.nm_dispatcher
-ExecStart=@libexecdir@/nm-dispatcher.action
+ExecStart=@libexecdir@/nm-dispatcher
 
 # We want to allow scripts to spawn long-running daemons, so tell
 # systemd to not clean up when nm-dispatcher exits
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index 63773862c6..bc10e920ce 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "nm-dispatcher.h"
-#include "nm-dispatcher-action.h"
+#include "nm-dispatcher-api.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-logging.h"