[network-manager-applet/lr/compat-drop: 3/5] shared: drop nm-compat
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/compat-drop: 3/5] shared: drop nm-compat
- Date: Fri, 29 Nov 2019 08:24:43 +0000 (UTC)
commit c52d73caa53f3fbeb3754d868e18e920e7116df0
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Fri Nov 29 08:55:21 2019 +0100
shared: drop nm-compat
This provides compatibility for a old NM version. It's essentially
noise at this point.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/350
Makefile.am | 3 --
shared/meson.build | 8 +---
shared/nm-utils/nm-compat.c | 94 ---------------------------------------------
shared/nm-utils/nm-compat.h | 52 -------------------------
src/applet-vpn-request.c | 1 -
5 files changed, 1 insertion(+), 157 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8da267b7..54601ff7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -471,7 +471,6 @@ nm_applet_c_gen = \
src/applet-resources.c
nm_applet_hc_real = \
- shared/nm-utils/nm-compat.c \
src/main.c \
src/applet.c \
src/applet.h \
@@ -561,8 +560,6 @@ EXTRA_DIST += \
EXTRA_DIST += \
shared/nm-utils/gsystem-local-alloc.h \
- shared/nm-utils/nm-compat.c \
- shared/nm-utils/nm-compat.h \
shared/nm-utils/nm-glib.h \
shared/nm-utils/nm-macros-internal.h \
shared/nm-utils/nm-shared-utils.c \
diff --git a/shared/meson.build b/shared/meson.build
index 11f731dc..072bea5b 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -1,11 +1,5 @@
shared_inc = include_directories('.')
-shared_base_sources = files(
+shared_sources = files(
'nm-utils/nm-shared-utils.c',
)
-
-shared_sources = shared_base_sources + files(
- 'nm-utils/nm-compat.c',
-)
-
-shared_legacy_sources = shared_base_sources
diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
index 07a71fce..459845bb 100644
--- a/src/applet-vpn-request.c
+++ b/src/applet-vpn-request.c
@@ -20,7 +20,6 @@
#include <errno.h>
#include "nma-vpn-password-dialog.h"
-#include "nm-utils/nm-compat.h"
#include "nm-utils/nm-shared-utils.h"
/*****************************************************************************/
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]