diff options
| author | Dan Williams <dcbw@redhat.com> | 2012-05-17 13:21:47 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-05-17 13:21:47 -0500 |
| commit | 75257f5d7ee46daba71b7ad0eff2eabd5f6934b9 (patch) | |
| tree | 68cc293af244cf36679e9bb20cb67c5f9329f04d /src | |
| parent | 0f9cc88a4c237143279e8fcfc80fc12e36d712c2 (diff) | |
| download | NetworkManager-75257f5d7ee46daba71b7ad0eff2eabd5f6934b9.tar.gz | |
core: move connection provider interface to src/
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/nm-connection-provider.c (renamed from src/settings/nm-connection-provider.c) | 0 | ||||
| -rw-r--r-- | src/nm-connection-provider.h (renamed from src/settings/nm-connection-provider.h) | 0 | ||||
| -rw-r--r-- | src/nm-device.h | 2 | ||||
| -rw-r--r-- | src/settings/Makefile.am | 4 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index f46fbab34e..81a8a66a55 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -187,7 +187,9 @@ NetworkManager_SOURCES = \ nm-rfkill.h \ nm-session-monitor.h \ nm-session-utils.c \ - nm-session-utils.h + nm-session-utils.h \ + nm-connection-provider.h \ + nm-connection-provider.c if WITH_CONCHECK NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h diff --git a/src/settings/nm-connection-provider.c b/src/nm-connection-provider.c index 401f8dabb7..401f8dabb7 100644 --- a/src/settings/nm-connection-provider.c +++ b/src/nm-connection-provider.c diff --git a/src/settings/nm-connection-provider.h b/src/nm-connection-provider.h index 942651f76b..942651f76b 100644 --- a/src/settings/nm-connection-provider.h +++ b/src/nm-connection-provider.h diff --git a/src/nm-device.h b/src/nm-device.h index f4495b9784..ec4282d0e8 100644 --- a/src/nm-device.h +++ b/src/nm-device.h @@ -34,7 +34,7 @@ #include "nm-dhcp6-config.h" #include "nm-connection.h" #include "nm-rfkill.h" -#include "settings/nm-connection-provider.h" +#include "nm-connection-provider.h" /* Properties */ #define NM_DEVICE_UDI "udi" diff --git a/src/settings/Makefile.am b/src/settings/Makefile.am index e6d66db5c0..8024d54142 100644 --- a/src/settings/Makefile.am +++ b/src/settings/Makefile.am @@ -48,9 +48,7 @@ libsettings_la_SOURCES = \ nm-secret-agent.c \ nm-secret-agent.h \ nm-settings-utils.h \ - nm-settings-utils.c \ - nm-connection-provider.h \ - nm-connection-provider.c + nm-settings-utils.c libsettings_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ |