diff --git a/tdenetworkmanager/CMakeLists.txt b/tdenetworkmanager/CMakeLists.txt index 1938a55..af12c8d 100644 --- a/tdenetworkmanager/CMakeLists.txt +++ b/tdenetworkmanager/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory( pics ) add_subdirectory( src ) -# add_subdirectory( vpn-plugins ) +add_subdirectory( vpn-plugins ) # add_subdirectory( po ) install( FILES tdenetworkmanager.conf DESTINATION ${DBUS_SYS_DIR} ) diff --git a/tdenetworkmanager/vpn-plugins/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/CMakeLists.txt new file mode 100644 index 0000000..aa31dbf --- /dev/null +++ b/tdenetworkmanager/vpn-plugins/CMakeLists.txt @@ -0,0 +1,15 @@ +################################################# +# +# (C) 2012 Timothy Pearson +# kb9vqf (AT) pearsoncomputing.net +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +# add_subdirectory( openvpn ) +# add_subdirectory( pptp ) +# add_subdirectory( strongswan ) +add_subdirectory( vpnc ) diff --git a/tdenetworkmanager/vpn-plugins/vpnc/AUTHORS b/tdenetworkmanager/vpn-plugins/vpnc/AUTHORS index e0ecfce..676305e 100644 --- a/tdenetworkmanager/vpn-plugins/vpnc/AUTHORS +++ b/tdenetworkmanager/vpn-plugins/vpnc/AUTHORS @@ -1,2 +1,3 @@ +Timothy Pearson Helmut Schaa , Thomas Kallenberg diff --git a/tdenetworkmanager/vpn-plugins/vpnc/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/vpnc/CMakeLists.txt new file mode 100644 index 0000000..d865ba9 --- /dev/null +++ b/tdenetworkmanager/vpn-plugins/vpnc/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2012 Timothy Pearson +# kb9vqf (AT) pearsoncomputing.net +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_subdirectory( src ) + +install( FILES tdenetman_vpnc.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt b/tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt new file mode 100644 index 0000000..25bd8ea --- /dev/null +++ b/tdenetworkmanager/vpn-plugins/vpnc/src/CMakeLists.txt @@ -0,0 +1,43 @@ +################################################# +# +# (C) 2012 Timothy Pearson +# kb9vqf (AT) pearsoncomputing.net +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_definitions( -UQT_NO_ASCII_CAST ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/settings + ${CMAKE_SOURCE_DIR}/tdenetworkmanager/src/configwidgets + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${DBUS_TQT_INCLUDE_DIRS} + ${NM_UTIL_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + +##### tdenetman_vpnc (module) ################### + +set( target tdenetman_vpnc ) + +set( ${target}_SRCS + tdenetman-vpnc.cpp + vpncprop.ui + vpncauth.ui +) + +tde_add_kpart( ${target} AUTOMOC + SOURCES ${${target}_SRCS} + LINK tdeinit_kded-shared + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp similarity index 98% rename from tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp rename to tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp index 9804256..aff389b 100644 --- a/tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.cpp +++ b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp @@ -1,8 +1,9 @@ /*************************************************************************** * - * knetworkmanager-vpnc.cpp - A NetworkManager frontend for TDE + * tdenetman-vpnc.cpp - A NetworkManager frontend for TDE * * Copyright (C) 2006 Novell, Inc. + * Copyright (C) 2012 Timothy Pearson * * Author: Helmut Schaa , * Author: Timothy Pearson @@ -16,7 +17,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -39,7 +40,7 @@ #include #include -#include "knetworkmanager-vpnc.h" +#include "tdenetman-vpnc.h" using namespace std; typedef KGenericFactory VPNCPluginFactory; @@ -182,7 +183,7 @@ void VPNCConfig::pcfImport() FILE *pipe_decrypt; char decrypted_result[2048]; int i; - + decryptcommand.append(linedata); printf("Group password decrypt command: %s\n\r", decryptcommand.c_str()); if ((pipe_decrypt = popen(decryptcommand.c_str(), "r")) == NULL) @@ -288,7 +289,7 @@ TQMap VPNCConfig::getVPNProperties() if (_vpncWidget->chkUseDomain->isChecked()) strlist.insert("Domain", TQString(_vpncWidget->Domain->text())); - + if (_vpncWidget->chkUseKeepAlive->isChecked()) strlist.insert("NAT-Keepalive packet interval", TQString(_vpncWidget->nat_keep_alive_interval->text())); @@ -399,4 +400,4 @@ void VPNCAuthentication::setPasswords(TQString name, TQString value) { _vpncAuth->editGroupPassword->erase(); _vpncAuth->editGroupPassword->insert(value); } -} \ No newline at end of file +} diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.h similarity index 100% rename from tdenetworkmanager/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h rename to tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.h diff --git a/tdenetworkmanager/vpn-plugins/vpnc/knetworkmanager_vpnc.desktop b/tdenetworkmanager/vpn-plugins/vpnc/tdenetman_vpnc.desktop similarity index 73% rename from tdenetworkmanager/vpn-plugins/vpnc/knetworkmanager_vpnc.desktop rename to tdenetworkmanager/vpn-plugins/vpnc/tdenetman_vpnc.desktop index fd7d07c..64ad398 100644 --- a/tdenetworkmanager/vpn-plugins/vpnc/knetworkmanager_vpnc.desktop +++ b/tdenetworkmanager/vpn-plugins/vpnc/tdenetman_vpnc.desktop @@ -3,11 +3,11 @@ Encoding=UTF-8 Type=Service Icon= ServiceTypes=TDENetworkManager/VPNPlugin -X-TDE-Library=knetworkmanager_vpnc +X-TDE-Library=tdenetman_vpnc X-NetworkManager-Services=vpnc -X-TDE-PluginInfo-Author=Helmut Schaa -X-TDE-PluginInfo-Email=hschaa@suse.de -X-TDE-PluginInfo-Name=knetworkmanager_vpnc +X-TDE-PluginInfo-Author=Timothy Pearson +X-TDE-PluginInfo-Email=kb9vqf@pearsoncomputing.net +X-TDE-PluginInfo-Name=tdenetman_vpnc X-TDE-PluginInfo-Version=0.1 X-TDE-PluginInfo-Website= X-TDE-PluginInfo-Category=VPNService