diff options
Diffstat (limited to 'certmanager')
| -rw-r--r-- | certmanager/Makefile.am | 2 | ||||
| -rw-r--r-- | certmanager/certificatewizardimpl.cpp | 6 | ||||
| -rw-r--r-- | certmanager/kwatchgnupg/Makefile.am | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am index 0c37f3fae..68ab9ae05 100644 --- a/certmanager/Makefile.am +++ b/certmanager/Makefile.am @@ -18,7 +18,7 @@ kleopatra_SOURCES = \ METASOURCES = AUTO kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC) +kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kleopatra rc_DATA = kleopatraui.rc diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index d220a10af..b0cff6a32 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -295,10 +295,10 @@ void CertificateWizardImpl::slotHelpClicked() void CertificateWizardImpl::slotSetValuesFromWhoAmI() { - const KABC::Addressee a = KABC::StdAddressBook::self( true )->whoAmI(); + const TDEABC::Addressee a = TDEABC::StdAddressBook::self( true )->whoAmI(); if ( a.isEmpty() ) return; - const KABC::Address adr = a.address(KABC::Address::Work); + const TDEABC::Address adr = a.address(TDEABC::Address::Work); for ( AttrPairList::const_iterator it = _attrPairList.begin() ; it != _attrPairList.end() ; ++it ) { @@ -369,7 +369,7 @@ void CertificateWizardImpl::createPersonalDataPage() } // enable button only if administrator wants to allow it - if (KABC::StdAddressBook::self( true )->whoAmI().isEmpty() || + if (TDEABC::StdAddressBook::self( true )->whoAmI().isEmpty() || !config.readBoolEntry("ShowSetWhoAmI", true)) insertAddressButton->setEnabled( false ); diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am index f5b28ba41..990ce7d38 100644 --- a/certmanager/kwatchgnupg/Makefile.am +++ b/certmanager/kwatchgnupg/Makefile.am @@ -14,7 +14,7 @@ kwatchgnupg_SOURCES = \ METASOURCES = AUTO kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC) +kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kwatchgnupg rc_DATA = kwatchgnupgui.rc |