From 400cceb393c02ab7b0be04f0f91e85e399a2c9aa Mon Sep 17 00:00:00 2001 From: Alexander Sack Date: Mon, 6 Oct 2008 18:05:05 +0000 Subject: [PATCH] 2008-10-03 Alexander Sack * system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h system-settings/plugins/ifcfg-fedora/Makefile.am system-settings/src/nm-inotify-helper.c system-settings/src/nm-inotify-helper.h src/Makefile.am - Move ifcfg-fedora inotify helpers to the system settings service so they are available to all plugins git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4150 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 11 +++++++++++ system-settings/plugins/ifcfg-fedora/Makefile.am | 4 +--- system-settings/src/Makefile.am | 2 ++ .../{plugins/ifcfg-fedora => src}/nm-inotify-helper.c | 0 .../{plugins/ifcfg-fedora => src}/nm-inotify-helper.h | 0 5 files changed, 14 insertions(+), 3 deletions(-) rename system-settings/{plugins/ifcfg-fedora => src}/nm-inotify-helper.c (100%) rename system-settings/{plugins/ifcfg-fedora => src}/nm-inotify-helper.h (100%) diff --git a/ChangeLog b/ChangeLog index a9ceb5479e..d9748392f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-10-03 Alexander Sack + + * system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c + system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h + system-settings/plugins/ifcfg-fedora/Makefile.am + system-settings/src/nm-inotify-helper.c + system-settings/src/nm-inotify-helper.h + src/Makefile.am + - Move ifcfg-fedora inotify helpers to the system settings service so + they are available to all plugins + 2008-10-03 Alexander Sack Implement support for wep-tx-keyidx in ifupdown system diff --git a/system-settings/plugins/ifcfg-fedora/Makefile.am b/system-settings/plugins/ifcfg-fedora/Makefile.am index ba94cbf860..09aeaa72d1 100644 --- a/system-settings/plugins/ifcfg-fedora/Makefile.am +++ b/system-settings/plugins/ifcfg-fedora/Makefile.am @@ -10,9 +10,7 @@ libnm_settings_plugin_ifcfg_fedora_la_SOURCES = \ nm-ifcfg-connection.h \ reader.c \ reader.h \ - common.h \ - nm-inotify-helper.c \ - nm-inotify-helper.h + common.h libnm_settings_plugin_ifcfg_fedora_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ diff --git a/system-settings/src/Makefile.am b/system-settings/src/Makefile.am index 48a8a19d91..43a4b46e9e 100644 --- a/system-settings/src/Makefile.am +++ b/system-settings/src/Makefile.am @@ -13,6 +13,8 @@ nm_system_settings_SOURCES = \ dbus-settings.c \ dbus-settings.h \ main.c \ + nm-inotify-helper.c \ + nm-inotify-helper.h \ nm-polkit-helpers.c \ nm-polkit-helpers.h \ nm-system-config-error.c \ diff --git a/system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c b/system-settings/src/nm-inotify-helper.c similarity index 100% rename from system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c rename to system-settings/src/nm-inotify-helper.c diff --git a/system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h b/system-settings/src/nm-inotify-helper.h similarity index 100% rename from system-settings/plugins/ifcfg-fedora/nm-inotify-helper.h rename to system-settings/src/nm-inotify-helper.h