diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kio/kpasswdserver | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kio/kpasswdserver')
| -rw-r--r-- | kio/kpasswdserver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kio/kpasswdserver/Makefile.am | 4 | ||||
| -rw-r--r-- | kio/kpasswdserver/kpasswdserver.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kio/kpasswdserver/CMakeLists.txt b/kio/kpasswdserver/CMakeLists.txt index a02d3b50a..5209e53c9 100644 --- a/kio/kpasswdserver/CMakeLists.txt +++ b/kio/kpasswdserver/CMakeLists.txt @@ -18,7 +18,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kwallet/client + ${CMAKE_SOURCE_DIR}/tdewallet/client ${CMAKE_SOURCE_DIR}/kio ) diff --git a/kio/kpasswdserver/Makefile.am b/kio/kpasswdserver/Makefile.am index 694718de4..9ba393ef3 100644 --- a/kio/kpasswdserver/Makefile.am +++ b/kio/kpasswdserver/Makefile.am @@ -1,7 +1,7 @@ # $Id$ # Makefile.am of tdebase/kioslave/http -INCLUDES= -I$(top_srcdir)/kwallet/client $(all_includes) +INCLUDES= -I$(top_srcdir)/tdewallet/client $(all_includes) ####### Files @@ -10,6 +10,6 @@ kde_module_LTLIBRARIES = kded_kpasswdserver.la kded_kpasswdserver_la_SOURCES = kpasswdserver.cpp kpasswdserver.skel kded_kpasswdserver_la_METASOURCES = AUTO kded_kpasswdserver_la_LDFLAGS = $(all_libraries) -module -avoid-version -kded_kpasswdserver_la_LIBADD = $(top_builddir)/kwallet/client/libkwalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) +kded_kpasswdserver_la_LIBADD = $(top_builddir)/tdewallet/client/libtdewalletclient.la $(LIB_KIO) $(LIB_KDED) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11) include $(top_srcdir)/admin/Doxyfile.am diff --git a/kio/kpasswdserver/kpasswdserver.cpp b/kio/kpasswdserver/kpasswdserver.cpp index 7b140c467..b6a9aa696 100644 --- a/kio/kpasswdserver/kpasswdserver.cpp +++ b/kio/kpasswdserver/kpasswdserver.cpp @@ -34,7 +34,7 @@ #include <kmessagebox.h> #include <kdebug.h> #include <kio/passdlg.h> -#include <kwallet.h> +#include <tdewallet.h> #include "config.h" #ifdef Q_WS_X11 @@ -361,7 +361,7 @@ KPasswdServer::processRequest() if ( ( username.isEmpty() || password.isEmpty() ) && !KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), KWallet::Wallet::PasswordFolder(), makeWalletKey( request->key, info.realmValue )) ) { - // no login+pass provided, check if kwallet has one + // no login+pass provided, check if tdewallet has one if ( openWallet( request->windowId ) ) hasWalletData = readFromWallet( m_wallet, request->key, info.realmValue, username, password, info.readOnly, knownLogins ); } |