summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:13:00 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-26 13:13:00 -0600
commit7e24943f4a543a233b57047b8f502f0a70ec1771 (patch)
treeef3c58511dc9e1b2259bc970579dc527c298a720
parent39772365e40d22473389f8d24cce8910f088b656 (diff)
downloadkvpnc-7e24943f4a543a233b57047b8f502f0a70ec1771.tar.gz
kvpnc-7e24943f4a543a233b57047b8f502f0a70ec1771.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
-rw-r--r--ChangeLog10
-rw-r--r--TODO2
-rw-r--r--acinclude.m426
-rw-r--r--src/Makefile.am2
-rw-r--r--src/kvpnc.cpp6
-rw-r--r--src/kvpncconfig.cpp8
-rw-r--r--src/kvpncconfig.h4
7 files changed, 29 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index dec595a..5d7a820 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -573,7 +573,7 @@
local identifier can now be set on raccon
remote identifier can now be set on raccon
diffie hellman group fixed on racoon
- if kwallet will be deactivated the user now will asked if really wanted
+ if tdewallet will be deactivated the user now will asked if really wanted
2008-05-24 Christoph Thielecke <crissi99@gmx.de>
freeze if vpnc run directory not exists fixed
@@ -1154,7 +1154,7 @@
2006-03-25 Christoph Thielecke <u15119@hs-harz.de>
agressive mode for freeswan/openswan added
- disabling kwallet fixed
+ disabling tdewallet fixed
additional network routes fixed
2006-03-25 Christoph Thielecke <u15119@hs-harz.de>
@@ -1287,7 +1287,7 @@
chap-secrets will no longer overwritten
2005-12-09 Christoph Thielecke <u15119@hs-harz.de>
- option for disabling the use of kwallet added
+ option for disabling the use of tdewallet added
require mmpe and disable 40-bit now set as default
2005-11-11 Christoph Thielecke <u15119@hs-harz.de>
@@ -1432,12 +1432,12 @@
2005-07-27 Christoph Thielecke <u15119@hs-harz.de>
save & load of config moved to global config
- detection for first time use of kwallet added, now reading from config file in this case
+ detection for first time use of tdewallet added, now reading from config file in this case
2005-07-25 Christoph Thielecke <u15119@hs-harz.de>
tun/tap selection for openvpn added
- password storing by use of kwallet added
+ password storing by use of tdewallet added
setting hostname as gateway fixed
handbook script updated
handbook updated
diff --git a/TODO b/TODO
index 90e37c4..b22b507 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@ legend:
*************************************
* encrypted password storing
- * saving passwords with kwallet?
+ * saving passwords with tdewallet?
* ipsec vpn
* freeswan (kernel 2.4)
* x509
diff --git a/acinclude.m4 b/acinclude.m4
index 15a6629..9bf2deb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
- AC_SUBST(LIB_KUTILS, "-lkutils")
+ AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim")
- AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
+ AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
- AC_SUBST(LIB_KDNSSD, "-lkdnssd")
- AC_SUBST(LIB_KUNITTEST, "-lkunittest")
+ AC_SUBST(LIB_KDNSSD, "-ltdednssd")
+ AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui")
AC_SUBST(LIB_KIO, "-lkio")
- AC_SUBST(LIB_KSYCOCA, "-lksycoca")
+ AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile")
AC_SUBST(LIB_KAB, "-lkab")
- AC_SUBST(LIB_KHTML, "-lkhtml")
- AC_SUBST(LIB_KSPELL, "-lkspell")
- AC_SUBST(LIB_KPARTS, "-lkparts")
+ AC_SUBST(LIB_KHTML, "-ltdehtml")
+ AC_SUBST(LIB_KSPELL, "-ltdespell")
+ AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we
-dnl continue with a warning (the user will get no jpeg support in khtml)
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still
dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN)
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN)
diff --git a/src/Makefile.am b/src/Makefile.am
index 9101baa..230a086 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,7 +49,7 @@ kvpnc_METASOURCES = AUTO
#CXXFLAGS = $(libgcrypt-config --libs --cflags)
-kvpnc_LDADD = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lgcrypt -lkwalletclient -lDCOP
+kvpnc_LDADD = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) -lgcrypt -ltdewalletclient -lDCOP
diff --git a/src/kvpnc.cpp b/src/kvpnc.cpp
index d00f945..4524d26 100644
--- a/src/kvpnc.cpp
+++ b/src/kvpnc.cpp
@@ -81,7 +81,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <knuminput.h>
-#include <kwallet.h>
+#include <tdewallet.h>
#include <kinputdialog.h>
#include <kactioncollection.h>
#include <kfiledialog.h>
@@ -838,7 +838,7 @@ void KVpnc::closeEvent ( TQCloseEvent *e )
if ( GlobalConfig->status == GlobalConfig->connected )
{
int res;
- if ( kapp->sessionSaving() ) //KDE is going down, skip kwallet, disconnect and quit
+ if ( kapp->sessionSaving() ) //KDE is going down, skip tdewallet, disconnect and quit
{
if ( GlobalConfig->KvpncDebugLevel > 0 )
GlobalConfig->appendLogEntry ( i18n ( "Shutdown was called...exiting.\n" ), GlobalConfig->debug );
@@ -11224,7 +11224,7 @@ void KVpnc::helpClicked()
//
// KMessageBox::information(0,extip,"ext ip" );
- // /* passwords with kwallet */
+ // /* passwords with tdewallet */
// if (GlobalConfig->useKwallet && KWallet::Wallet::isEnabled())
// {
// // Open local wallet
diff --git a/src/kvpncconfig.cpp b/src/kvpncconfig.cpp
index 523aae7..12b2b09 100644
--- a/src/kvpncconfig.cpp
+++ b/src/kvpncconfig.cpp
@@ -432,7 +432,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
VpnAccountData *it;
if ( !AccountList->isEmpty() )
{
- /* passwords with kwallet */
+ /* passwords with tdewallet */
if ( useKwallet && KWallet::Wallet::isEnabled())
{
if (!skipKwalletStoring )
@@ -487,7 +487,7 @@ void KVpncConfig::saveOptions(bool saveOneProfile, TQString Profile)
config->writeEntry("Description",it->getDescription());
- /* passwords with kwallet */
+ /* passwords with tdewallet */
if ( useKwallet && KWallet::Wallet::isEnabled())
{
if (!skipKwalletStoring )
@@ -1095,7 +1095,7 @@ void KVpncConfig::loadOptions()
TQString PrivateKeyPass="";
TQString PreSharedKey ="";
- /* passwords with kwallet */
+ /* passwords with tdewallet */
if (useKwallet && KWallet::Wallet::isEnabled())
{
if (KvpncDebugLevel > 2)
@@ -4362,7 +4362,7 @@ void KVpncConfig::removeEntry(TQString Name)
ProfileName += name;
config->setGroup( ProfileName );
- /* passwords with kwallet */
+ /* passwords with tdewallet */
if ( useKwallet && KWallet::Wallet::isEnabled())
{
// if (KvpncDebugLevel > 0)
diff --git a/src/kvpncconfig.h b/src/kvpncconfig.h
index ad83b8b..3d52d9d 100644
--- a/src/kvpncconfig.h
+++ b/src/kvpncconfig.h
@@ -34,7 +34,7 @@
#include <tqcolor.h>
#include <tqstringlist.h>
#include <kconfig.h>
-#include <kwallet.h>
+#include <tdewallet.h>
#include <kstatusbar.h>
#include "toolinfo.h"
@@ -146,7 +146,7 @@ public:
bool firstUseOfKwallet; //< for importing passwords if there are stored before
bool shutdownIsCalled;
bool haveUserData; //< flag if user data already collected, set after data is entered and unset if authretry
- bool skipKwalletStoring; //< true if save should skip saving into kwallet
+ bool skipKwalletStoring; //< true if save should skip saving into tdewallet
bool hideOnCloseInfo;
bool feedbackMailSent;
bool doKillL2tpdIfStillRunning; //< kill l2tpd if its still running and not started from kvpnc