From f99dc6b936eeb352c0a79a3d7208753eba8e7695 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 13 Apr 2018 22:32:59 +0200 Subject: [PATCH] libnm/keyfile: merge keyfile sources (pt1, rename nm-keyfile-reader.c) I am going to merge the files for keyfile handling in libnm-core. There is a reason for that, I'll tell you next. --- Makefile.am | 2 +- libnm-core/meson.build | 2 +- libnm-core/{nm-keyfile-reader.c => nm-keyfile.c} | 0 po/POTFILES.in | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename libnm-core/{nm-keyfile-reader.c => nm-keyfile.c} (100%) diff --git a/Makefile.am b/Makefile.am index b488c37e8..697fa881a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -502,7 +502,7 @@ libnm_core_lib_c_real = \ libnm-core/nm-connection.c \ libnm-core/nm-dbus-utils.c \ libnm-core/nm-errors.c \ - libnm-core/nm-keyfile-reader.c \ + libnm-core/nm-keyfile.c \ libnm-core/nm-keyfile-utils.c \ libnm-core/nm-keyfile-writer.c \ libnm-core/nm-property-compare.c \ diff --git a/libnm-core/meson.build b/libnm-core/meson.build index a011e3860..db00433cb 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -103,7 +103,7 @@ libnm_core_sources = libnm_core_settings_sources + files( 'nm-connection.c', 'nm-dbus-utils.c', 'nm-errors.c', - 'nm-keyfile-reader.c', + 'nm-keyfile.c', 'nm-keyfile-utils.c', 'nm-keyfile-writer.c', 'nm-property-compare.c', diff --git a/libnm-core/nm-keyfile-reader.c b/libnm-core/nm-keyfile.c similarity index 100% rename from libnm-core/nm-keyfile-reader.c rename to libnm-core/nm-keyfile.c diff --git a/po/POTFILES.in b/po/POTFILES.in index d41376b5c..645122819 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -55,7 +55,7 @@ libnm-core/crypto_gnutls.c libnm-core/crypto_nss.c libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c -libnm-core/nm-keyfile-reader.c +libnm-core/nm-keyfile.c libnm-core/nm-keyfile-writer.c libnm-core/nm-setting-8021x.c libnm-core/nm-setting-adsl.c