From 6e6c5474603ac32b2a4a017444657a4fa0460cc7 Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Mon, 25 Aug 2014 10:54:18 +0400
Subject: [PATCH] unify configuration names

---
 sources/gui/netctl-gui.1                                      | 2 +-
 sources/helper/CMakeLists.txt                                 | 2 +-
 sources/helper/{netctlgui-helper.conf => netctl-gui.conf}     | 2 +-
 sources/helper/{netctlgui-helper.conf.5 => netctl-gui.conf.5} | 4 ++--
 sources/helper/netctlgui-helper.1                             | 2 +-
 sources/helper/src/netctlhelper.cpp                           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename sources/helper/{netctlgui-helper.conf => netctl-gui.conf} (97%)
 rename sources/helper/{netctlgui-helper.conf.5 => netctl-gui.conf.5} (95%)

diff --git a/sources/gui/netctl-gui.1 b/sources/gui/netctl-gui.1
index d5b3c54..2376392 100644
--- a/sources/gui/netctl-gui.1
+++ b/sources/gui/netctl-gui.1
@@ -64,7 +64,7 @@ Configuration file
 .RE
 .SH SEE ALSO
 .BR netctlgui-helper (1)
-.BR netctlgui-helper.conf (5)
+.BR netctl-gui.conf (5)
 .SH STANDARDS
 See
 .B @CMAKE_INSTALL_PREFIX@/share/doc/netctl-gui/netctl-gui-dbus-api.html
diff --git a/sources/helper/CMakeLists.txt b/sources/helper/CMakeLists.txt
index ec45e48..af0f470 100644
--- a/sources/helper/CMakeLists.txt
+++ b/sources/helper/CMakeLists.txt
@@ -24,7 +24,7 @@ configure_file (${SUBPROJECT_MAN_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MA
 configure_file (${SUBPROJECT_MAN5_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5})
 
 install (FILES org.netctlgui.helper.conf DESTINATION ${DBUS_SYSTEMCONF_PATH})
-install (FILES netctlgui-helper.conf DESTINATION /etc)
+install (FILES netctl-gui.conf DESTINATION /etc)
 install (FILES netctlgui-helper.service DESTINATION ${SYSTEMD_SERVICE_PATH})
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN} DESTINATION share/man/man1/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5} DESTINATION share/man/man5/)
diff --git a/sources/helper/netctlgui-helper.conf b/sources/helper/netctl-gui.conf
similarity index 97%
rename from sources/helper/netctlgui-helper.conf
rename to sources/helper/netctl-gui.conf
index 6fa1d2d..53be7d1 100644
--- a/sources/helper/netctlgui-helper.conf
+++ b/sources/helper/netctl-gui.conf
@@ -1,5 +1,5 @@
 # Configuration file for Netctl GUI project
-# /etc/netctlgui-helper.conf - system-wide configuration
+# /etc/netctl-gui.conf - system-wide configuration
 # $HOME/.config/netctl-gui.conf - user configuration
 
 # close helper after GUI application quit.
diff --git a/sources/helper/netctlgui-helper.conf.5 b/sources/helper/netctl-gui.conf.5
similarity index 95%
rename from sources/helper/netctlgui-helper.conf.5
rename to sources/helper/netctl-gui.conf.5
index 27a93ae..77e2946 100644
--- a/sources/helper/netctlgui-helper.conf.5
+++ b/sources/helper/netctl-gui.conf.5
@@ -1,8 +1,8 @@
-.TH netctlgui-helper.conf 5  "@CURRENT_DATE@" "version @PROJECT_VERSION@" "File Formats Manual"
+.TH netctl-gui.conf 5  "@CURRENT_DATE@" "version @PROJECT_VERSION@" "File Formats Manual"
 .SH NAME
 netctlgui-helper.conf is a configuration file of Netctl GUI project
 .SH SYNOPSIS
-.B /etc/netctlgui-helper.conf
+.B /etc/netctl-gui.conf
 for system-wide configuration or
 .B $HOME/.config/netctl-gui.conf
 for user one
diff --git a/sources/helper/netctlgui-helper.1 b/sources/helper/netctlgui-helper.1
index 3274859..526581b 100644
--- a/sources/helper/netctlgui-helper.1
+++ b/sources/helper/netctlgui-helper.1
@@ -64,7 +64,7 @@ By the way it is highly recommended to copy source service file before to
 and edit copied file to avoid upgrade problems.
 .SH SEE ALSO
 .BR netctl-gui (1)
-.BR netctlgui-helper.conf (5)
+.BR netctl-gui.conf (5)
 .SH STANDARDS
 See
 .B @CMAKE_INSTALL_PREFIX@/share/doc/netctl-gui/netctl-gui-dbus-api.html
diff --git a/sources/helper/src/netctlhelper.cpp b/sources/helper/src/netctlhelper.cpp
index d819ea6..eecd3c6 100644
--- a/sources/helper/src/netctlhelper.cpp
+++ b/sources/helper/src/netctlhelper.cpp
@@ -173,7 +173,7 @@ void NetctlHelper::updateConfiguration()
     if (debug) qDebug() << PDEBUG;
 
     deleteInterface();
-    configuration = getSettings(QString("/etc/netctlgui-helper.conf"));
+    configuration = getSettings(QString("/etc/netctl-gui.conf"));
     if (!system)
         configuration = getSettings(configPath, configuration);
     createInterface();