[network-manager-libreswan/th/vpn-editor-split: 16/18] properties: rename file "nm-libreswan.c" to "nm-libreswan-editor.c"
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-libreswan/th/vpn-editor-split: 16/18] properties: rename file "nm-libreswan.c" to "nm-libreswan-editor.c"
- Date: Wed, 18 May 2016 15:53:36 +0000 (UTC)
commit 66e4870eac684c682b817dbcb9c6ff4eedd55b8b
Author: Thomas Haller <thaller redhat com>
Date: Tue May 10 15:47:26 2016 +0200
properties: rename file "nm-libreswan.c" to "nm-libreswan-editor.c"
Originally, "nm-libreswan.c" contained both the NMVpnEditorPlugin
and NMVpnEditor implementation. The former now moved to
"nm-libreswan-editor-plugin.c", so rename the file to reflect that this
is the NMVpnEditor.
po/POTFILES.in | 2 +-
properties/Makefile.am | 4 ++--
properties/nm-libreswan-editor-plugin.c | 4 +---
properties/nm-libreswan-editor-plugin.h | 2 --
.../{nm-libreswan.c => nm-libreswan-editor.c} | 2 +-
.../{nm-libreswan.h => nm-libreswan-editor.h} | 6 +++---
6 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index caf44ab..c98b70f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
appdata/network-manager-libreswan.metainfo.xml.in
auth-dialog/main.c
properties/nm-libreswan-editor-plugin.c
-properties/nm-libreswan.c
+properties/nm-libreswan-editor.c
src/nm-libreswan-service.c
shared/nm-utils/nm-shared-utils.c
shared/nm-vpn/nm-vpn-plugin-utils.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 8dc075c..f1030e2 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -9,8 +9,8 @@ plugin_sources = \
nm-libreswan-editor-plugin.h
editor_sources = \
- nm-libreswan.c \
- nm-libreswan.h
+ nm-libreswan-editor.c \
+ nm-libreswan-editor.h
uidir = $(datadir)/gnome-vpn-properties/libreswan
ui_DATA = nm-libreswan-dialog.ui
diff --git a/properties/nm-libreswan-editor-plugin.c b/properties/nm-libreswan-editor-plugin.c
index aba85b1..44b0f5b 100644
--- a/properties/nm-libreswan-editor-plugin.c
+++ b/properties/nm-libreswan-editor-plugin.c
@@ -1,7 +1,5 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/***************************************************************************
- * nm-libreswan.c : GNOME UI dialogs for configuring libreswan VPN connections
- *
* Copyright (C) 2005 David Zeuthen, <davidz redhat com>
* Copyright (C) 2005 - 2008 Dan Williams, <dcbw redhat com>
* Copyright (C) 2010 Avesh Agarwal <avagarwa redhat com>
@@ -36,7 +34,7 @@
#include "utils.h"
-#include "nm-libreswan.h"
+#include "nm-libreswan-editor.h"
#define LIBRESWAN_PLUGIN_NAME _("IPsec based VPN")
#define LIBRESWAN_PLUGIN_DESC _("IPsec based VPN using IKEv1")
diff --git a/properties/nm-libreswan-editor-plugin.h b/properties/nm-libreswan-editor-plugin.h
index 1c5e49a..9780ffe 100644
--- a/properties/nm-libreswan-editor-plugin.h
+++ b/properties/nm-libreswan-editor-plugin.h
@@ -1,7 +1,5 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/***************************************************************************
- * nm-libreswan.h : GNOME UI dialogs for configuring libreswan VPN connections
- *
* Copyright (C) 2008 Dan Williams, <dcbw redhat com>
* Copyright (C) 2010 Avesh Agarwal, <avagarwa redhat com>
*
diff --git a/properties/nm-libreswan.c b/properties/nm-libreswan-editor.c
similarity index 99%
rename from properties/nm-libreswan.c
rename to properties/nm-libreswan-editor.c
index 4cc2fe8..09518be 100644
--- a/properties/nm-libreswan.c
+++ b/properties/nm-libreswan-editor.c
@@ -22,7 +22,7 @@
#include "nm-default.h"
-#include "nm-libreswan.h"
+#include "nm-libreswan-editor.h"
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/properties/nm-libreswan.h b/properties/nm-libreswan-editor.h
similarity index 95%
rename from properties/nm-libreswan.h
rename to properties/nm-libreswan-editor.h
index 6b990ff..679715f 100644
--- a/properties/nm-libreswan.h
+++ b/properties/nm-libreswan-editor.h
@@ -19,8 +19,8 @@
*
**************************************************************************/
-#ifndef _NM_LIBRESWAN_H_
-#define _NM_LIBRESWAN_H_
+#ifndef __NM_LIBRESWAN_EDITOR_H__
+#define __NM_LIBRESWAN_EDITOR_H__
#define LIBRESWAN_TYPE_EDITOR (libreswan_editor_get_type ())
#define LIBRESWAN_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LIBRESWAN_TYPE_EDITOR,
LibreswanEditor))
@@ -44,5 +44,5 @@ GType libreswan_editor_get_type (void);
NMVpnEditor *nm_vpn_editor_new (NMConnection *connection, GError **error);
-#endif /* _NM_LIBRESWAN_H_ */
+#endif /* __NM_LIBRESWAN_EDITOR_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]