system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ifcfg-rh: move nm-inotify-helper to ifcfg-rh plugin

Browse source 
The helper is only used by ifcfg-rh. Move it to the plugin.
This commit is contained in:
Thomas Haller 2017-12-01 11:54:32 +01:00
parent 31f2a46639
commit 8e172eb984
5 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -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 \

6
src/settings/nm-settings.c
View file

@ -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)

0
src/settings/nm-inotify-helper.c → src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
View file

0
src/settings/nm-inotify-helper.h → src/settings/plugins/ifcfg-rh/nm-inotify-helper.h
View file

2
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
View file

@ -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"
/*****************************************************************************/