settings: move system-settings/plugins => src/settings/plugins

diff --git a/.gitignore b/.gitignore
index cd8aa6a..4fc64f4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -86,8 +86,7 @@ libnm-glib/libnm-glib-test
 src/NetworkManager
 src/nm-crash-logger
 src/supplicant-manager/tests/test-supplicant-config
-system-settings/src/nm-system-settings
-system-settings/src/org.freedesktop.NetworkManagerSystemSettings.service
+system-settings/src
 test/libnm-glib-test
 test/libnm_glib_test
 test/nm-online
@@ -105,13 +104,13 @@ src/tests/test-policy-hosts
 src/tests/test-wifi-ap-utils
 src/dhcp-manager/tests/test-dhcp-dhclient
 
-system-settings/plugins/keyfile/tests/test-keyfile
-system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
-system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
-system-settings/plugins/ifcfg-rh/tests/network-scripts/Test_Write_*
-system-settings/plugins/ifcfg-rh/tests/network-scripts/*-Test_Write_*
-system-settings/plugins/ifupdown/tests/test-ifupdown
-system-settings/plugins/ifnet/tests/check_ifnet
+src/settings/plugins/keyfile/tests/test-keyfile
+src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
+src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils
+src/settings/plugins/ifcfg-rh/tests/network-scripts/Test_Write_*
+src/settings/plugins/ifcfg-rh/tests/network-scripts/*-Test_Write_*
+src/settings/plugins/ifupdown/tests/test-ifupdown
+src/settings/plugins/ifnet/tests/check_ifnet
 
 m4/gtk-doc.m4
 m4/intltool.m4

diff --git a/Makefile.am b/Makefile.am
index 78924ab..07a8606 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = \
        libnm-util \
        libnm-glib \
        introspection \
-       system-settings \
        src \
        callouts \
        cli \

diff --git a/configure.ac b/configure.ac
index 6b6ef1f..6cb9414 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -553,6 +553,18 @@ src/dnsmasq-manager/Makefile
 src/modem-manager/Makefile
 src/bluez-manager/Makefile
 src/settings/Makefile
+src/settings/plugins/Makefile
+src/settings/plugins/ifupdown/Makefile
+src/settings/plugins/ifupdown/tests/Makefile
+src/settings/plugins/ifnet/Makefile
+src/settings/plugins/ifnet/tests/Makefile
+src/settings/plugins/ifcfg-rh/Makefile
+src/settings/plugins/ifcfg-rh/tests/Makefile
+src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
+src/settings/plugins/ifcfg-suse/Makefile
+src/settings/plugins/keyfile/Makefile
+src/settings/plugins/keyfile/tests/Makefile
+src/settings/plugins/keyfile/tests/keyfiles/Makefile
 src/wimax/Makefile
 src/backends/Makefile
 libnm-util/libnm-util.pc
@@ -565,19 +577,6 @@ libnm-glib/Makefile
 libnm-glib/tests/Makefile
 callouts/Makefile
 tools/Makefile
-system-settings/Makefile
-system-settings/plugins/Makefile
-system-settings/plugins/ifupdown/Makefile
-system-settings/plugins/ifupdown/tests/Makefile
-system-settings/plugins/ifnet/Makefile
-system-settings/plugins/ifnet/tests/Makefile
-system-settings/plugins/ifcfg-rh/Makefile
-system-settings/plugins/ifcfg-rh/tests/Makefile
-system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
-system-settings/plugins/ifcfg-suse/Makefile
-system-settings/plugins/keyfile/Makefile
-system-settings/plugins/keyfile/tests/Makefile
-system-settings/plugins/keyfile/tests/keyfiles/Makefile
 cli/Makefile
 cli/src/Makefile
 test/Makefile

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 65008b2..1fecabf 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -25,7 +25,7 @@ src/nm-device-ethernet.c
 src/nm-device-olpc-mesh.c
 src/nm-manager.c
 src/nm-netlink-monitor.c
+src/settings/plugins/ifcfg-rh/reader.c
+src/settings/plugins/ifnet/connection_parser.c
 src/settings/nm-default-wired-connection.c
-system-settings/plugins/ifcfg-rh/reader.c
-system-settings/plugins/ifnet/connection_parser.c
 

diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am
index b6a2413..a44680f 100644 (file)
--- a/src/settings/Makefile.am
+++ b/src/settings/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS=plugins
+
 INCLUDES = -I${top_srcdir} \
            -I${top_srcdir}/include \
            -I${top_srcdir}/libnm-util \
@@ -50,7 +52,7 @@ libsettings_la_LIBADD = \
        $(top_builddir)/libnm-util/libnm-util.la \
        $(top_builddir)/marshallers/libmarshallers.la \
        $(top_builddir)/src/logging/libnm-logging.la \
-       $(top_builddir)/system-settings/plugins/keyfile/libnm-settings-plugin-keyfile.la \
+       $(builddir)/plugins/keyfile/libnm-settings-plugin-keyfile.la \
        $(DBUS_LIBS) \
        $(GLIB_LIBS) \
        $(GMODULE_LIBS) \

diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 169936c..91d35f8 100644 (file)
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -62,7 +62,7 @@
 #include "nm-dbus-manager.h"
 #include "nm-manager-auth.h"
 #include "nm-session-monitor.h"
-#include "system-settings/plugins/keyfile/plugin.h"
+#include "plugins/keyfile/plugin.h"
 #include "nm-agent-manager.h"
 
 #define CONFIG_KEY_NO_AUTO_DEFAULT "no-auto-default"

diff --git a/system-settings/plugins/Makefile.am b/src/settings/plugins/Makefile.am
similarity index 100%
rename from system-settings/plugins/Makefile.am
rename to src/settings/plugins/Makefile.am

diff --git a/system-settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/Makefile.am
rename to src/settings/plugins/ifcfg-rh/Makefile.am

diff --git a/system-settings/plugins/ifcfg-rh/common.h b/src/settings/plugins/ifcfg-rh/common.h
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/common.h
rename to src/settings/plugins/ifcfg-rh/common.h

diff --git a/system-settings/plugins/ifcfg-rh/errors.c b/src/settings/plugins/ifcfg-rh/errors.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/errors.c
rename to src/settings/plugins/ifcfg-rh/errors.c

diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
rename to src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c

diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h
rename to src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.h

diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf
rename to src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf

diff --git a/system-settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml b/src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml
rename to src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml

diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/plugin.c
rename to src/settings/plugins/ifcfg-rh/plugin.c

diff --git a/system-settings/plugins/ifcfg-rh/plugin.h b/src/settings/plugins/ifcfg-rh/plugin.h
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/plugin.h
rename to src/settings/plugins/ifcfg-rh/plugin.h

diff --git a/system-settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/reader.c
rename to src/settings/plugins/ifcfg-rh/reader.c

diff --git a/system-settings/plugins/ifcfg-rh/reader.h b/src/settings/plugins/ifcfg-rh/reader.h
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/reader.h
rename to src/settings/plugins/ifcfg-rh/reader.h

diff --git a/system-settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/shvar.c
rename to src/settings/plugins/ifcfg-rh/shvar.c

diff --git a/system-settings/plugins/ifcfg-rh/shvar.h b/src/settings/plugins/ifcfg-rh/shvar.h
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/shvar.h
rename to src/settings/plugins/ifcfg-rh/shvar.h

diff --git a/system-settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
similarity index 82%
rename from system-settings/plugins/ifcfg-rh/tests/Makefile.am
rename to src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 8933bb2..5ee9c4e 100644 (file)
--- a/system-settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
-       -I$(top_srcdir)/system-settings/plugins/ifcfg-rh
+       -I$(srcdir)/../
 
 noinst_PROGRAMS = test-ifcfg-rh test-ifcfg-rh-utils
 
@@ -20,7 +20,7 @@ test_ifcfg_rh_CPPFLAGS = \
 test_ifcfg_rh_LDADD = \
        $(top_builddir)/libnm-glib/libnm-glib.la \
        $(top_builddir)/libnm-util/libnm-util.la \
-       $(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la \
+       $(builddir)/../libifcfg-rh-io.la \
        $(DBUS_LIBS)
 
 test_ifcfg_rh_utils_SOURCES = \
@@ -30,7 +30,7 @@ test_ifcfg_rh_utils_CPPFLAGS = \
        $(GLIB_CFLAGS)
 
 test_ifcfg_rh_utils_LDADD = \
-       $(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la
+       $(builddir)/../libifcfg-rh-io.la
 
 if WITH_TESTS
 

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns1 b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns1
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns1
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns1

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns2 b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns2
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns2
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-dns2

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-entry b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-entry
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-entry
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-entry

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-gateway b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-gateway
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-gateway
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-gateway

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-ipaddr b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-ipaddr
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-ipaddr
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-ipaddr

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-record b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-record
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-record
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-bad-record

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-dhcp b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-dhcp
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-dhcp
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-dhcp

diff --git a/system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-static b/src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-static
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/iscsiadm-test-static
rename to src/settings/plugins/ifcfg-rh/tests/iscsiadm-test-static

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-component

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-bridge-main

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-dhcp

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ibft-static

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-minimal

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-nm-controlled

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-permissions

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-leap

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-auto

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-bad-hex

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-hex

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-hex

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-long-quoted

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-104-ascii

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-40-ascii

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-adhoc

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-no-keys

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-passphrase

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-tls

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-eap-ttls-tls

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-hex

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-unquoted2

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-8021x-peap-mschapv2

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-defroute-no-gatewaydev-yes

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp6-only

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-manual

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-ipv6-only

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-never-default

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-qeth-static

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-bootproto

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-16

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-24

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-no-prefix-8

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static-routes-legacy

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-leap

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-104-ascii

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-40-ascii

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-adhoc

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-eap-ttls-chap

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wep-passphrase

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-tls

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-eap-ttls-tls

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-hex

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-unquoted2

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wired-8021x-peap-mschapv2

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes b/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-defroute-no-gatewaydev-yes

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway b/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-global-gateway

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default b/src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/network-test-wired-never-default

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy b/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-static-routes-legacy

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes b/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy b/src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/route-test-wired-static-routes-legacy

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual b/src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/route6-test-wired-ipv6-manual

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem b/src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/test1_key_and_cert.pem

diff --git a/system-settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem b/src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem
rename to src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem

diff --git a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c
rename to src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c

diff --git a/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
rename to src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c

diff --git a/system-settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/utils.c
rename to src/settings/plugins/ifcfg-rh/utils.c

diff --git a/system-settings/plugins/ifcfg-rh/utils.h b/src/settings/plugins/ifcfg-rh/utils.h
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/utils.h
rename to src/settings/plugins/ifcfg-rh/utils.h

diff --git a/system-settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/writer.c
rename to src/settings/plugins/ifcfg-rh/writer.c

diff --git a/system-settings/plugins/ifcfg-rh/writer.h b/src/settings/plugins/ifcfg-rh/writer.h
similarity index 100%
rename from system-settings/plugins/ifcfg-rh/writer.h
rename to src/settings/plugins/ifcfg-rh/writer.h

diff --git a/system-settings/plugins/ifcfg-suse/Makefile.am b/src/settings/plugins/ifcfg-suse/Makefile.am
similarity index 100%
rename from system-settings/plugins/ifcfg-suse/Makefile.am
rename to src/settings/plugins/ifcfg-suse/Makefile.am

diff --git a/system-settings/plugins/ifcfg-suse/plugin.c b/src/settings/plugins/ifcfg-suse/plugin.c
similarity index 100%
rename from system-settings/plugins/ifcfg-suse/plugin.c
rename to src/settings/plugins/ifcfg-suse/plugin.c

diff --git a/system-settings/plugins/ifcfg-suse/plugin.h b/src/settings/plugins/ifcfg-suse/plugin.h
similarity index 100%
rename from system-settings/plugins/ifcfg-suse/plugin.h
rename to src/settings/plugins/ifcfg-suse/plugin.h

diff --git a/system-settings/plugins/ifnet/Makefile.am b/src/settings/plugins/ifnet/Makefile.am
similarity index 100%
rename from system-settings/plugins/ifnet/Makefile.am
rename to src/settings/plugins/ifnet/Makefile.am

diff --git a/system-settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
similarity index 100%
rename from system-settings/plugins/ifnet/connection_parser.c
rename to src/settings/plugins/ifnet/connection_parser.c

diff --git a/system-settings/plugins/ifnet/connection_parser.h b/src/settings/plugins/ifnet/connection_parser.h
similarity index 100%
rename from system-settings/plugins/ifnet/connection_parser.h
rename to src/settings/plugins/ifnet/connection_parser.h

diff --git a/system-settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c
similarity index 100%
rename from system-settings/plugins/ifnet/net_parser.c
rename to src/settings/plugins/ifnet/net_parser.c

diff --git a/system-settings/plugins/ifnet/net_parser.h b/src/settings/plugins/ifnet/net_parser.h
similarity index 100%
rename from system-settings/plugins/ifnet/net_parser.h
rename to src/settings/plugins/ifnet/net_parser.h

diff --git a/system-settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c
similarity index 100%
rename from system-settings/plugins/ifnet/net_utils.c
rename to src/settings/plugins/ifnet/net_utils.c

diff --git a/system-settings/plugins/ifnet/net_utils.h b/src/settings/plugins/ifnet/net_utils.h
similarity index 100%
rename from system-settings/plugins/ifnet/net_utils.h
rename to src/settings/plugins/ifnet/net_utils.h

diff --git a/system-settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c
similarity index 100%
rename from system-settings/plugins/ifnet/nm-ifnet-connection.c
rename to src/settings/plugins/ifnet/nm-ifnet-connection.c

diff --git a/system-settings/plugins/ifnet/nm-ifnet-connection.h b/src/settings/plugins/ifnet/nm-ifnet-connection.h
similarity index 100%
rename from system-settings/plugins/ifnet/nm-ifnet-connection.h
rename to src/settings/plugins/ifnet/nm-ifnet-connection.h

diff --git a/system-settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c
similarity index 100%
rename from system-settings/plugins/ifnet/plugin.c
rename to src/settings/plugins/ifnet/plugin.c

diff --git a/system-settings/plugins/ifnet/plugin.h b/src/settings/plugins/ifnet/plugin.h
similarity index 100%
rename from system-settings/plugins/ifnet/plugin.h
rename to src/settings/plugins/ifnet/plugin.h

diff --git a/system-settings/plugins/ifnet/tests/Makefile.am b/src/settings/plugins/ifnet/tests/Makefile.am
similarity index 57%
rename from system-settings/plugins/ifnet/tests/Makefile.am
rename to src/settings/plugins/ifnet/tests/Makefile.am
index a351f31..c830fe0 100644 (file)
--- a/system-settings/plugins/ifnet/tests/Makefile.am
+++ b/src/settings/plugins/ifnet/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES=-I$(top_srcdir)/system-settings/plugins/ifnet\
+INCLUDES=-I$(srcdir)/../ \
         -I$(top_srcdir)/libnm-glib \
         -I$(top_srcdir)/libnm-util \
         -I$(top_srcdir)/include \
@@ -7,7 +7,7 @@ TESTS = check_ifnet
 check_PROGRAMS = check_ifnet
 check_ifnet_SOURCES = test_all.c 
 check_ifnet_CPPFLAGS = $(CHECK_CFLAGS) $(GLIB_CFLAGS)
-check_ifnet_LDADD = $(top_srcdir)/libnm-util/libnm-util.la\
-                   $(top_srcdir)/system-settings/plugins/ifnet/lib-ifnet-io.la\
-                   $(CHECK_LIBS)\
+check_ifnet_LDADD = $(top_builddir)/libnm-util/libnm-util.la \
+                   $(builddir)/../lib-ifnet-io.la \
+                   $(CHECK_LIBS) \
                    $(GLIB_LIBS)

diff --git a/system-settings/plugins/ifnet/tests/hostname b/src/settings/plugins/ifnet/tests/hostname
similarity index 100%
rename from system-settings/plugins/ifnet/tests/hostname
rename to src/settings/plugins/ifnet/tests/hostname

diff --git a/system-settings/plugins/ifnet/tests/net b/src/settings/plugins/ifnet/tests/net
similarity index 100%
rename from system-settings/plugins/ifnet/tests/net
rename to src/settings/plugins/ifnet/tests/net

diff --git a/system-settings/plugins/ifnet/tests/net.all b/src/settings/plugins/ifnet/tests/net.all
similarity index 100%
rename from system-settings/plugins/ifnet/tests/net.all
rename to src/settings/plugins/ifnet/tests/net.all

diff --git a/system-settings/plugins/ifnet/tests/nm-system-settings.conf b/src/settings/plugins/ifnet/tests/nm-system-settings.conf
similarity index 100%
rename from system-settings/plugins/ifnet/tests/nm-system-settings.conf
rename to src/settings/plugins/ifnet/tests/nm-system-settings.conf

diff --git a/system-settings/plugins/ifnet/tests/test_all.c b/src/settings/plugins/ifnet/tests/test_all.c
similarity index 100%
rename from system-settings/plugins/ifnet/tests/test_all.c
rename to src/settings/plugins/ifnet/tests/test_all.c

diff --git a/system-settings/plugins/ifnet/tests/wpa_supplicant.conf b/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
similarity index 100%
rename from system-settings/plugins/ifnet/tests/wpa_supplicant.conf
rename to src/settings/plugins/ifnet/tests/wpa_supplicant.conf

diff --git a/system-settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c
similarity index 100%
rename from system-settings/plugins/ifnet/wpa_parser.c
rename to src/settings/plugins/ifnet/wpa_parser.c

diff --git a/system-settings/plugins/ifnet/wpa_parser.h b/src/settings/plugins/ifnet/wpa_parser.h
similarity index 100%
rename from system-settings/plugins/ifnet/wpa_parser.h
rename to src/settings/plugins/ifnet/wpa_parser.h

diff --git a/system-settings/plugins/ifupdown/Makefile.am b/src/settings/plugins/ifupdown/Makefile.am
similarity index 100%
rename from system-settings/plugins/ifupdown/Makefile.am
rename to src/settings/plugins/ifupdown/Makefile.am

diff --git a/system-settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c
similarity index 100%
rename from system-settings/plugins/ifupdown/interface_parser.c
rename to src/settings/plugins/ifupdown/interface_parser.c

diff --git a/system-settings/plugins/ifupdown/interface_parser.h b/src/settings/plugins/ifupdown/interface_parser.h
similarity index 100%
rename from system-settings/plugins/ifupdown/interface_parser.h
rename to src/settings/plugins/ifupdown/interface_parser.h

diff --git a/system-settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
similarity index 100%
rename from system-settings/plugins/ifupdown/nm-ifupdown-connection.c
rename to src/settings/plugins/ifupdown/nm-ifupdown-connection.c

diff --git a/system-settings/plugins/ifupdown/nm-ifupdown-connection.h b/src/settings/plugins/ifupdown/nm-ifupdown-connection.h
similarity index 100%
rename from system-settings/plugins/ifupdown/nm-ifupdown-connection.h
rename to src/settings/plugins/ifupdown/nm-ifupdown-connection.h

diff --git a/system-settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c
similarity index 100%
rename from system-settings/plugins/ifupdown/parser.c
rename to src/settings/plugins/ifupdown/parser.c

diff --git a/system-settings/plugins/ifupdown/parser.h b/src/settings/plugins/ifupdown/parser.h
similarity index 100%
rename from system-settings/plugins/ifupdown/parser.h
rename to src/settings/plugins/ifupdown/parser.h

diff --git a/system-settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
similarity index 100%
rename from system-settings/plugins/ifupdown/plugin.c
rename to src/settings/plugins/ifupdown/plugin.c

diff --git a/system-settings/plugins/ifupdown/plugin.h b/src/settings/plugins/ifupdown/plugin.h
similarity index 100%
rename from system-settings/plugins/ifupdown/plugin.h
rename to src/settings/plugins/ifupdown/plugin.h

diff --git a/system-settings/plugins/ifupdown/tests/Makefile.am b/src/settings/plugins/ifupdown/tests/Makefile.am
similarity index 83%
rename from system-settings/plugins/ifupdown/tests/Makefile.am
rename to src/settings/plugins/ifupdown/tests/Makefile.am
index b5dbd13..aed8619 100644 (file)
--- a/system-settings/plugins/ifupdown/tests/Makefile.am
+++ b/src/settings/plugins/ifupdown/tests/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
-       -I$(top_srcdir)/system-settings/plugins/ifupdown
+       -I$(srcdir)/../
 
 noinst_PROGRAMS = test-ifupdown
 
@@ -17,7 +17,7 @@ test_ifupdown_CPPFLAGS = \
 test_ifupdown_LDADD = \
        $(top_builddir)/libnm-glib/libnm-glib.la \
        $(top_builddir)/libnm-util/libnm-util.la \
-       $(top_builddir)/system-settings/plugins/ifupdown/libifupdown-io.la \
+       $(builddir)/../libifupdown-io.la \
        $(DBUS_LIBS)
 
 if WITH_TESTS

diff --git a/system-settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test-ifupdown.c
rename to src/settings/plugins/ifupdown/tests/test-ifupdown.c

diff --git a/system-settings/plugins/ifupdown/tests/test1 b/src/settings/plugins/ifupdown/tests/test1
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test1
rename to src/settings/plugins/ifupdown/tests/test1

diff --git a/system-settings/plugins/ifupdown/tests/test11 b/src/settings/plugins/ifupdown/tests/test11
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test11
rename to src/settings/plugins/ifupdown/tests/test11

diff --git a/system-settings/plugins/ifupdown/tests/test12 b/src/settings/plugins/ifupdown/tests/test12
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test12
rename to src/settings/plugins/ifupdown/tests/test12

diff --git a/system-settings/plugins/ifupdown/tests/test13 b/src/settings/plugins/ifupdown/tests/test13
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test13
rename to src/settings/plugins/ifupdown/tests/test13

diff --git a/system-settings/plugins/ifupdown/tests/test14 b/src/settings/plugins/ifupdown/tests/test14
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test14
rename to src/settings/plugins/ifupdown/tests/test14

diff --git a/system-settings/plugins/ifupdown/tests/test15 b/src/settings/plugins/ifupdown/tests/test15
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test15
rename to src/settings/plugins/ifupdown/tests/test15

diff --git a/system-settings/plugins/ifupdown/tests/test16 b/src/settings/plugins/ifupdown/tests/test16
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test16
rename to src/settings/plugins/ifupdown/tests/test16

diff --git a/system-settings/plugins/ifupdown/tests/test2 b/src/settings/plugins/ifupdown/tests/test2
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test2
rename to src/settings/plugins/ifupdown/tests/test2

diff --git a/system-settings/plugins/ifupdown/tests/test3 b/src/settings/plugins/ifupdown/tests/test3
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test3
rename to src/settings/plugins/ifupdown/tests/test3

diff --git a/system-settings/plugins/ifupdown/tests/test4 b/src/settings/plugins/ifupdown/tests/test4
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test4
rename to src/settings/plugins/ifupdown/tests/test4

diff --git a/system-settings/plugins/ifupdown/tests/test5 b/src/settings/plugins/ifupdown/tests/test5
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test5
rename to src/settings/plugins/ifupdown/tests/test5

diff --git a/system-settings/plugins/ifupdown/tests/test6 b/src/settings/plugins/ifupdown/tests/test6
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test6
rename to src/settings/plugins/ifupdown/tests/test6

diff --git a/system-settings/plugins/ifupdown/tests/test7 b/src/settings/plugins/ifupdown/tests/test7
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test7
rename to src/settings/plugins/ifupdown/tests/test7

diff --git a/system-settings/plugins/ifupdown/tests/test8 b/src/settings/plugins/ifupdown/tests/test8
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test8
rename to src/settings/plugins/ifupdown/tests/test8

diff --git a/system-settings/plugins/ifupdown/tests/test9 b/src/settings/plugins/ifupdown/tests/test9
similarity index 100%
rename from system-settings/plugins/ifupdown/tests/test9
rename to src/settings/plugins/ifupdown/tests/test9

diff --git a/system-settings/plugins/keyfile/Makefile.am b/src/settings/plugins/keyfile/Makefile.am
similarity index 100%
rename from system-settings/plugins/keyfile/Makefile.am
rename to src/settings/plugins/keyfile/Makefile.am

diff --git a/system-settings/plugins/keyfile/common.h b/src/settings/plugins/keyfile/common.h
similarity index 100%
rename from system-settings/plugins/keyfile/common.h
rename to src/settings/plugins/keyfile/common.h

diff --git a/system-settings/plugins/keyfile/errors.c b/src/settings/plugins/keyfile/errors.c
similarity index 100%
rename from system-settings/plugins/keyfile/errors.c
rename to src/settings/plugins/keyfile/errors.c

diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c
similarity index 100%
rename from system-settings/plugins/keyfile/nm-keyfile-connection.c
rename to src/settings/plugins/keyfile/nm-keyfile-connection.c

diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.h b/src/settings/plugins/keyfile/nm-keyfile-connection.h
similarity index 100%
rename from system-settings/plugins/keyfile/nm-keyfile-connection.h
rename to src/settings/plugins/keyfile/nm-keyfile-connection.h

diff --git a/system-settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
similarity index 100%
rename from system-settings/plugins/keyfile/plugin.c
rename to src/settings/plugins/keyfile/plugin.c

diff --git a/system-settings/plugins/keyfile/plugin.h b/src/settings/plugins/keyfile/plugin.h
similarity index 100%
rename from system-settings/plugins/keyfile/plugin.h
rename to src/settings/plugins/keyfile/plugin.h

diff --git a/system-settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
similarity index 100%
rename from system-settings/plugins/keyfile/reader.c
rename to src/settings/plugins/keyfile/reader.c

diff --git a/system-settings/plugins/keyfile/reader.h b/src/settings/plugins/keyfile/reader.h
similarity index 100%
rename from system-settings/plugins/keyfile/reader.h
rename to src/settings/plugins/keyfile/reader.h

diff --git a/system-settings/plugins/keyfile/tests/Makefile.am b/src/settings/plugins/keyfile/tests/Makefile.am
similarity index 82%
rename from system-settings/plugins/keyfile/tests/Makefile.am
rename to src/settings/plugins/keyfile/tests/Makefile.am
index af76667..affe8dc 100644 (file)
--- a/system-settings/plugins/keyfile/tests/Makefile.am
+++ b/src/settings/plugins/keyfile/tests/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
-       -I$(top_srcdir)/system-settings/plugins/keyfile
+       -I$(srcdir)/../
 
 noinst_PROGRAMS = test-keyfile
 
@@ -18,7 +18,7 @@ test_keyfile_CPPFLAGS = \
        -DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
 
 test_keyfile_LDADD = \
-       $(top_builddir)/system-settings/plugins/keyfile/libkeyfile-io.la \
+       $(builddir)/../libkeyfile-io.la \
        $(top_builddir)/libnm-glib/libnm-glib.la \
        $(top_builddir)/libnm-util/libnm-util.la \
        $(DBUS_LIBS)

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT b/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT
rename to src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_BT

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain b/src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain
rename to src/settings/plugins/keyfile/tests/keyfiles/ATT_Data_Connect_Plain

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am b/src/settings/plugins/keyfile/tests/keyfiles/Makefile.am
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/Makefile.am
rename to src/settings/plugins/keyfile/tests/keyfiles/Makefile.am

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection b/src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection
rename to src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_String_SSID b/src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/Test_String_SSID
rename to src/settings/plugins/keyfile/tests/keyfiles/Test_String_SSID

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection b/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection
rename to src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6 b/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6
rename to src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_IP6

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case b/src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case
rename to src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection_MAC_Case

diff --git a/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection b/src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
similarity index 100%
rename from system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection
rename to src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection

diff --git a/system-settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
similarity index 100%
rename from system-settings/plugins/keyfile/tests/test-keyfile.c
rename to src/settings/plugins/keyfile/tests/test-keyfile.c

diff --git a/system-settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c
similarity index 100%
rename from system-settings/plugins/keyfile/utils.c
rename to src/settings/plugins/keyfile/utils.c

diff --git a/system-settings/plugins/keyfile/utils.h b/src/settings/plugins/keyfile/utils.h
similarity index 100%
rename from system-settings/plugins/keyfile/utils.h
rename to src/settings/plugins/keyfile/utils.h

diff --git a/system-settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
similarity index 100%
rename from system-settings/plugins/keyfile/writer.c
rename to src/settings/plugins/keyfile/writer.c

diff --git a/system-settings/plugins/keyfile/writer.h b/src/settings/plugins/keyfile/writer.h
similarity index 100%
rename from system-settings/plugins/keyfile/writer.h
rename to src/settings/plugins/keyfile/writer.h

diff --git a/system-settings/Makefile.am b/system-settings/Makefile.am
deleted file mode 100644 (file)
index 67cf870..0000000
--- a/system-settings/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS=plugins
-