-rw-r--r-- | kabc/plugins/ldap/ldapE.pro | 2 | ||||
-rw-r--r-- | kabc/plugins/ldap/resourceldap.cpp | 7 | ||||
-rw-r--r-- | kabc/plugins/ldap/resourceldap.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/kabc/plugins/ldap/ldapE.pro b/kabc/plugins/ldap/ldapE.pro index f6ca586..2e79fc0 100644 --- a/kabc/plugins/ldap/ldapE.pro +++ b/kabc/plugins/ldap/ldapE.pro | |||
@@ -1,18 +1,18 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt warn_on release | 2 | CONFIG += qt warn_on release |
3 | #release debug | 3 | #release debug |
4 | 4 | ||
5 | TARGET = microkabc_ldap | 5 | TARGET = microkabc_ldap |
6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include | 6 | INCLUDEPATH += ../.. ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kresources ../../../qtcompat $(QPEDIR)/include |
7 | OBJECTS_DIR = obj/$(PLATFORM) | 7 | OBJECTS_DIR = obj/$(PLATFORM) |
8 | MOC_DIR = moc/$(PLATFORM) | 8 | MOC_DIR = moc/$(PLATFORM) |
9 | DESTDIR = $(QPEDIR)/lib | 9 | DESTDIR = $(QPEDIR)/lib |
10 | LIBS += -lmicrokde -lmicrokabc | 10 | LIBS += -lmicrokde -lmicrokabc |
11 | LIBS += -L$(QPEDIR)/lib | 11 | LIBS += -L$(QPEDIR)/lib |
12 | 12 | ||
13 | INTERFACES = \ | 13 | INTERFACES = \ |
14 | 14 | ||
15 | HEADERS = \ | 15 | HEADERS = \ |
16 | resourceldap.h \ | 16 | resourceldap.h \ |
17 | resourceldapconfig.h | 17 | resourceldapconfig.h |
18 | 18 | ||
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp index 55c43af..4b9dede 100644 --- a/kabc/plugins/ldap/resourceldap.cpp +++ b/kabc/plugins/ldap/resourceldap.cpp | |||
@@ -27,41 +27,42 @@ $Id$ | |||
27 | 27 | ||
28 | #include <kdebug.h> | 28 | #include <kdebug.h> |
29 | #include <kglobal.h> | 29 | #include <kglobal.h> |
30 | #include <klineedit.h> | 30 | #include <klineedit.h> |
31 | #include <klocale.h> | 31 | #include <klocale.h> |
32 | #include <kconfig.h> | 32 | #include <kconfig.h> |
33 | #include <kstringhandler.h> | 33 | #include <kstringhandler.h> |
34 | 34 | ||
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | 36 | ||
37 | #include "resourceldap.h" | 37 | #include "resourceldap.h" |
38 | #include "resourceldapconfig.h" | 38 | #include "resourceldapconfig.h" |
39 | #include "syncwidget.h" | ||
39 | 40 | ||
40 | using namespace KABC; | 41 | using namespace KABC; |
41 | 42 | ||
42 | extern "C" | 43 | extern "C" |
43 | { | 44 | { |
44 | //US void *init_kabc_ldap() | 45 | //US void *init_kabc_ldap() |
45 | void *init_microkabc_ldap() | 46 | void *init_microkabc_ldap() |
46 | { | 47 | { |
47 | return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig>(); | 48 | return new KRES::PluginFactory<ResourceLDAP,ResourceLDAPConfig, KRES::SyncWidget>(); |
48 | } | 49 | } |
49 | } | 50 | } |
50 | 51 | ||
51 | void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value ); | 52 | void addModOp( LDAPMod ***pmods, const QString &attr, const QString &value ); |
52 | 53 | ||
53 | 54 | ||
54 | ResourceLDAP::ResourceLDAP( const KConfig *config ) | 55 | ResourceLDAP::ResourceLDAP( const KConfig *config, bool syncable ) |
55 | : Resource( config ), mPort( 389 ), mLdap( 0 ) | 56 | : Resource( config, syncable ), mPort( 389 ), mLdap( 0 ) |
56 | { | 57 | { |
57 | KConfig *cfg = (KConfig *)config; | 58 | KConfig *cfg = (KConfig *)config; |
58 | if ( cfg ) { | 59 | if ( cfg ) { |
59 | mUser = cfg->readEntry( "LdapUser" ); | 60 | mUser = cfg->readEntry( "LdapUser" ); |
60 | mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) ); | 61 | mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) ); |
61 | mDn = cfg->readEntry( "LdapDn" ); | 62 | mDn = cfg->readEntry( "LdapDn" ); |
62 | mHost = cfg->readEntry( "LdapHost" ); | 63 | mHost = cfg->readEntry( "LdapHost" ); |
63 | mPort = cfg->readNumEntry( "LdapPort", 389 ); | 64 | mPort = cfg->readNumEntry( "LdapPort", 389 ); |
64 | mFilter = cfg->readEntry( "LdapFilter" ); | 65 | mFilter = cfg->readEntry( "LdapFilter" ); |
65 | mAnonymous = cfg->readBoolEntry( "LdapAnonymous" ); | 66 | mAnonymous = cfg->readBoolEntry( "LdapAnonymous" ); |
66 | 67 | ||
67 | QStringList attributes = cfg->readListEntry( "LdapAttributes" ); | 68 | QStringList attributes = cfg->readListEntry( "LdapAttributes" ); |
diff --git a/kabc/plugins/ldap/resourceldap.h b/kabc/plugins/ldap/resourceldap.h index 0625f30..0aad3c1 100644 --- a/kabc/plugins/ldap/resourceldap.h +++ b/kabc/plugins/ldap/resourceldap.h | |||
@@ -34,25 +34,25 @@ $Id$ | |||
34 | 34 | ||
35 | #include "addressbook.h" | 35 | #include "addressbook.h" |
36 | #include "resource.h" | 36 | #include "resource.h" |
37 | 37 | ||
38 | class KConfig; | 38 | class KConfig; |
39 | 39 | ||
40 | namespace KABC { | 40 | namespace KABC { |
41 | 41 | ||
42 | class ResourceLDAP : public Resource | 42 | class ResourceLDAP : public Resource |
43 | { | 43 | { |
44 | public: | 44 | public: |
45 | 45 | ||
46 | ResourceLDAP( const KConfig* ); | 46 | ResourceLDAP( const KConfig*, bool syncable ); |
47 | 47 | ||
48 | virtual void writeConfig( KConfig* ); | 48 | virtual void writeConfig( KConfig* ); |
49 | 49 | ||
50 | virtual bool doOpen(); | 50 | virtual bool doOpen(); |
51 | virtual void doClose(); | 51 | virtual void doClose(); |
52 | 52 | ||
53 | virtual Ticket *requestSaveTicket(); | 53 | virtual Ticket *requestSaveTicket(); |
54 | 54 | ||
55 | virtual bool load(); | 55 | virtual bool load(); |
56 | virtual bool save( Ticket * ); | 56 | virtual bool save( Ticket * ); |
57 | 57 | ||
58 | virtual void removeAddressee( const Addressee& addr ); | 58 | virtual void removeAddressee( const Addressee& addr ); |