[network-manager-vpnc/th/vpn-editor-split-bgo766170: 15/19] properties: rename file "nm-vpnc.c" to "nm-vpnc-editor.c"
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-vpnc/th/vpn-editor-split-bgo766170: 15/19] properties: rename file "nm-vpnc.c" to "nm-vpnc-editor.c"
- Date: Mon, 9 May 2016 12:03:45 +0000 (UTC)
commit 1dc1ea6dcd1082b07fde590d6773905991ac22c8
Author: Thomas Haller <thaller redhat com>
Date: Mon May 9 12:54:52 2016 +0200
properties: rename file "nm-vpnc.c" to "nm-vpnc-editor.c"
Origincally, "nm-vpnc.c" contained both the NMVpnEditorPlugin
and NMVpnEditor implementation. The former now moved to
"nm-vpnc-editor-plugin.c", so rename the file to reflect that this is
the NMVpnEditor.
po/POTFILES.in | 2 +-
properties/Makefile.am | 4 ++--
properties/nm-vpnc-editor-plugin.c | 2 +-
properties/{nm-vpnc.c => nm-vpnc-editor.c} | 2 +-
properties/{nm-vpnc.h => nm-vpnc-editor.h} | 8 +++-----
properties/tests/test-import-export.c | 2 +-
6 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 212fd3b..27891ca 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,7 +3,7 @@
appdata/network-manager-vpnc.metainfo.xml.in
auth-dialog/main.c
properties/nm-vpnc-editor-plugin.c
-properties/nm-vpnc.c
+properties/nm-vpnc-editor.c
src/nm-vpnc-service.c
shared/nm-shared-utils.c
shared/nm-vpn-plugin-utils.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 619646d..07e4f41 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -23,8 +23,8 @@ common_CFLAGS = \
libnm_vpn_plugin_vpnc_la_SOURCES = \
nm-vpnc-editor-plugin.c \
nm-vpnc-editor-plugin.h \
- nm-vpnc.c \
- nm-vpnc.h \
+ nm-vpnc-editor.c \
+ nm-vpnc-editor.h \
nm-vpnc-helper.c \
nm-vpnc-helper.h
diff --git a/properties/nm-vpnc-editor-plugin.c b/properties/nm-vpnc-editor-plugin.c
index 091311c..166c06c 100644
--- a/properties/nm-vpnc-editor-plugin.c
+++ b/properties/nm-vpnc-editor-plugin.c
@@ -33,7 +33,7 @@
#include <fcntl.h>
#include "nm-vpnc-helper.h"
-#include "nm-vpnc.h"
+#include "nm-vpnc-editor.h"
#define VPNC_PLUGIN_NAME _("Cisco Compatible VPN (vpnc)")
#define VPNC_PLUGIN_DESC _("Compatible with various Cisco, Juniper, Netscreen, and Sonicwall IPsec-based
VPN gateways.")
diff --git a/properties/nm-vpnc.c b/properties/nm-vpnc-editor.c
similarity index 99%
rename from properties/nm-vpnc.c
rename to properties/nm-vpnc-editor.c
index 1303425..b273a96 100644
--- a/properties/nm-vpnc.c
+++ b/properties/nm-vpnc-editor.c
@@ -26,7 +26,7 @@
#include "nm-default.h"
-#include "nm-vpnc.h"
+#include "nm-vpnc-editor.h"
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/properties/nm-vpnc.h b/properties/nm-vpnc-editor.h
similarity index 93%
rename from properties/nm-vpnc.h
rename to properties/nm-vpnc-editor.h
index 0d41cdd..e7d86cc 100644
--- a/properties/nm-vpnc.h
+++ b/properties/nm-vpnc-editor.h
@@ -1,7 +1,5 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/***************************************************************************
- * nm-vpnc.h : GNOME UI dialogs for configuring vpnc VPN connections
- *
* Copyright (C) 2008 Dan Williams, <dcbw redhat com>
*
* This program is free software; you can redistribute it and/or modify
@@ -20,8 +18,8 @@
*
**************************************************************************/
-#ifndef _NM_VPNC_H_
-#define _NM_VPNC_H_
+#ifndef __NM_VPNC_EDITOR_H__
+#define __NM_VPNC_EDITOR_H__
#define VPNC_TYPE_EDITOR (vpnc_editor_get_type ())
#define VPNC_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VPNC_TYPE_EDITOR, VpncEditor))
@@ -45,5 +43,5 @@ GType vpnc_editor_get_type (void);
NMVpnEditor *nm_vpnc_editor_new (NMConnection *connection, GError **error);
-#endif /* _NM_VPNC_H_ */
+#endif /* __NM_VPNC_EDITOR_H__ */
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 024edd5..35359ac 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -28,7 +28,7 @@
#include <locale.h>
#include "nm-vpnc-editor-plugin.h"
-#include "nm-vpnc.h"
+#include "nm-vpnc-editor.h"
#include "nm-vpnc-helper.h"
#include "nm-test-utils.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]