[network-manager-openvpn/th/vpn-editor-split-bgo765732: 12/15] properties: rename file "nm-openvpn.h" to "nm-openvpn-editor.h"

[Thomas Haller <thaller src gnome org>]

commit f47ed6128a194e2915d5aef9dda98db6fa9de98a
Author: Thomas Haller <thaller redhat com>
Date:   Thu Apr 28 20:57:18 2016 +0200

    properties: rename file "nm-openvpn.h" to "nm-openvpn-editor.h"
    
    There are two distinct interfaces NMVpnEditorPlugin and NMVpnEditor,
    with their respective implementations. Rename the files accordingly,
    to have "nm-openvpn-editor-plugin.h" and "nm-openvpn-editor.h".

 po/POTFILES.in                                   |    2 +-
 properties/Makefile.am                           |    4 ++--
 properties/auth-helpers.c                        |    2 +-
 properties/nm-openvpn-editor-plugin.c            |    2 +-
 properties/{nm-openvpn.c => nm-openvpn-editor.c} |    2 +-
 properties/{nm-openvpn.h => nm-openvpn-editor.h} |    8 ++++----
 properties/tests/test-import-export.c            |    2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 738950f..5dc1db0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,7 @@ auth-dialog/main.c
 properties/auth-helpers.c
 properties/import-export.c
 properties/nm-openvpn-editor-plugin.c
-properties/nm-openvpn.c
+properties/nm-openvpn-editor.c
 shared/nm-shared-utils.c
 src/nm-openvpn-service.c
 src/nm-openvpn-service-openvpn-helper.c
diff --git a/properties/Makefile.am b/properties/Makefile.am
index 3a8292c..2270024 100644
--- a/properties/Makefile.am
+++ b/properties/Makefile.am
@@ -9,8 +9,8 @@ endif
 plugin_sources = \
         nm-openvpn-editor-plugin.c \
         nm-openvpn-editor-plugin.h \
-        nm-openvpn.c \
-        nm-openvpn.h \
+        nm-openvpn-editor.c \
+        nm-openvpn-editor.h \
         auth-helpers.c \
         auth-helpers.h \
         import-export.c \
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 9a85aa4..c56fc0d 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -33,7 +33,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "nm-openvpn.h"
+#include "nm-openvpn-editor.h"
 #include "utils.h"
 
 #define BLOCK_HANDLER_ID "block-handler-id"
diff --git a/properties/nm-openvpn-editor-plugin.c b/properties/nm-openvpn-editor-plugin.c
index c4fbfab..50c7fb2 100644
--- a/properties/nm-openvpn-editor-plugin.c
+++ b/properties/nm-openvpn-editor-plugin.c
@@ -34,7 +34,7 @@
 #include <string.h>
 
 #include "auth-helpers.h"
-#include "nm-openvpn.h"
+#include "nm-openvpn-editor.h"
 #include "import-export.h"
 
 #define OPENVPN_PLUGIN_NAME    _("OpenVPN")
diff --git a/properties/nm-openvpn.c b/properties/nm-openvpn-editor.c
similarity index 99%
rename from properties/nm-openvpn.c
rename to properties/nm-openvpn-editor.c
index 06a595d..e904d4c 100644
--- a/properties/nm-openvpn.c
+++ b/properties/nm-openvpn-editor.c
@@ -27,7 +27,7 @@
 
 #include "nm-default.h"
 
-#include "nm-openvpn.h"
+#include "nm-openvpn-editor.h"
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/properties/nm-openvpn.h b/properties/nm-openvpn-editor.h
similarity index 91%
rename from properties/nm-openvpn.h
rename to properties/nm-openvpn-editor.h
index cc973ed..6940068 100644
--- a/properties/nm-openvpn.h
+++ b/properties/nm-openvpn-editor.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 /***************************************************************************
- * nm-openvpn.h : GNOME UI dialogs for configuring openvpn VPN connections
+ * nm-openvpn-editor.h : GNOME UI dialogs for configuring openvpn VPN connections
  *
  * Copyright (C) 2008 Dan Williams, <dcbw redhat com>
  *
@@ -20,8 +20,8 @@
  *
  **************************************************************************/
 
-#ifndef _NM_OPENVPN_H_
-#define _NM_OPENVPN_H_
+#ifndef __NM_OPENVPN_EDITOR_H__
+#define __NM_OPENVPN_EDITOR_H__
 
 #define OPENVPN_TYPE_EDITOR            (openvpn_editor_plugin_widget_get_type ())
 #define OPENVPN_EDITOR(obj)                      (G_TYPE_CHECK_INSTANCE_CAST ((obj), OPENVPN_TYPE_EDITOR, 
OpenvpnEditor))
@@ -45,5 +45,5 @@ GType openvpn_editor_plugin_widget_get_type (void);
 
 NMVpnEditor *openvpn_editor_new (NMConnection *connection, GError **error);
 
-#endif /* _NM_OPENVPN_H_ */
+#endif /* __NM_OPENVPN_EDITOR_H__ */
 
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index e520d4f..cca4525 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 
 #include "nm-openvpn-editor-plugin.h"
-#include "nm-openvpn.h"
+#include "nm-openvpn-editor.h"
 #include "import-export.h"
 #include "utils.h"