From 8e172eb984a532e28c10c3d9f453396249c92d3b Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 1 Dec 2017 11:54:32 +0100
Subject: [PATCH] ifcfg-rh: move nm-inotify-helper to ifcfg-rh plugin

The helper is only used by ifcfg-rh. Move it to the plugin.
---
 Makefile.am                                             | 4 ++--
 src/settings/nm-settings.c                              | 6 ------
 src/settings/{ => plugins/ifcfg-rh}/nm-inotify-helper.c | 0
 src/settings/{ => plugins/ifcfg-rh}/nm-inotify-helper.h | 0
 src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c | 2 +-
 5 files changed, 3 insertions(+), 9 deletions(-)
 rename src/settings/{ => plugins/ifcfg-rh}/nm-inotify-helper.c (100%)
 rename src/settings/{ => plugins/ifcfg-rh}/nm-inotify-helper.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 3f60ea5b3f..1a3d8b134b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1503,8 +1503,6 @@ src_libNetworkManager_la_SOURCES = \
 	\
 	src/settings/nm-agent-manager.c \
 	src/settings/nm-agent-manager.h \
-	src/settings/nm-inotify-helper.c \
-	src/settings/nm-inotify-helper.h \
 	src/settings/nm-secret-agent.c \
 	src/settings/nm-secret-agent.h \
 	src/settings/nm-settings-connection.c \
@@ -2021,6 +2019,8 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h \
 	src/settings/plugins/ifcfg-rh/shvar.c \
 	src/settings/plugins/ifcfg-rh/shvar.h \
+	src/settings/plugins/ifcfg-rh/nm-inotify-helper.c \
+	src/plugins/ifcfg-rh/settings/nm-inotify-helper.h \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h \
 	src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c \
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 0cfe8abcef..d151665828 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -75,7 +75,6 @@
 #include "nm-audit-manager.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dispatcher.h"
-#include "nm-inotify-helper.h"
 #include "nm-hostname-manager.h"
 
 #include "introspection/org.freedesktop.NetworkManager.Settings.h"
@@ -84,11 +83,6 @@
 
 #define EXPORT(sym) void * __export_##sym = &sym;
 
-EXPORT(nm_inotify_helper_get_type)
-EXPORT(nm_inotify_helper_get)
-EXPORT(nm_inotify_helper_add_watch)
-EXPORT(nm_inotify_helper_remove_watch)
-
 EXPORT(nm_settings_connection_get_type)
 EXPORT(nm_settings_connection_update)
 
diff --git a/src/settings/nm-inotify-helper.c b/src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
similarity index 100%
rename from src/settings/nm-inotify-helper.c
rename to src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
diff --git a/src/settings/nm-inotify-helper.h b/src/settings/plugins/ifcfg-rh/nm-inotify-helper.h
similarity index 100%
rename from src/settings/nm-inotify-helper.h
rename to src/settings/plugins/ifcfg-rh/nm-inotify-helper.h
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
index 889465f70c..c8712f1833 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
@@ -36,13 +36,13 @@
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
 #include "platform/nm-platform.h"
-#include "settings/nm-inotify-helper.h"
 #include "nm-config.h"
 
 #include "nms-ifcfg-rh-common.h"
 #include "nms-ifcfg-rh-reader.h"
 #include "nms-ifcfg-rh-writer.h"
 #include "nms-ifcfg-rh-utils.h"
+#include "nm-inotify-helper.h"
 
 /*****************************************************************************/