fix

author: zautrix <zautrix> 2005-08-19 13:29:20 (UTC)
committer: zautrix <zautrix> 2005-08-19 13:29:20 (UTC)
commit: 14cc7e0e2440d19cee538b10ba158f4b8c362e4e (patch) (unidiff)
tree: 57a79bf5a7d50ea9ea332f6634da243199b074e9 /kabc
parent: 9014049779be6cfec02d73e19596439f0f4f9bed (diff)
download: kdepimpi-14cc7e0e2440d19cee538b10ba158f4b8c362e4e.zip
kdepimpi-14cc7e0e2440d19cee538b10ba158f4b8c362e4e.tar.gz
kdepimpi-14cc7e0e2440d19cee538b10ba158f4b8c362e4e.tar.bz2
3 files changed, 21 insertions, 0 deletions
diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp
index e2b7b08..c61664b 100644
--- a/kabc/plugins/dir/resourcedir.cpp
+++ b/kabc/plugins/dir/resourcedir.cpp
@@ -87,4 +87,11 @@ ResourceDir::ResourceDir( const KConfig *config  )
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
+#ifdef _WIN32_
+      // we use plugins on win32. the group is stored in a static variable
+      // such that group info not available on win32 plugins
+      // to fix that, it would be a looooot of work
+      if ( !cfg->tempGroup().isEmpty() )
+          cfg->setGroup( cfg->tempGroup() );
+#endif
 //US     path = config->readEntry( "FilePath" );
     path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );
diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp
index c89939d..dad4571 100644
--- a/kabc/plugins/file/resourcefile.cpp
+++ b/kabc/plugins/file/resourcefile.cpp
@@ -84,4 +84,11 @@ ResourceFile::ResourceFile( const KConfig *config )
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
+#ifdef _WIN32_
+      // we use plugins on win32. the group is stored in a static variable
+      // such that group info not available on win32 plugins
+      // to fix that, it would be a looooot of work
+      if ( !cfg->tempGroup().isEmpty() )
+          cfg->setGroup( cfg->tempGroup() );
+#endif
    fileName = cfg->readEntry( "FileName", default_fileName );
    formatName = cfg->readEntry( "FileFormat", "vcard" );
diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp
index 55c43af..c3097de 100644
--- a/kabc/plugins/ldap/resourceldap.cpp
+++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -57,4 +57,11 @@ ResourceLDAP::ResourceLDAP( const KConfig *config )
  KConfig *cfg = (KConfig *)config;
  if ( cfg ) {
+#ifdef _WIN32_
+      // we use plugins on win32. the group is stored in a static variable
+      // such that group info not available on win32 plugins
+      // to fix that, it would be a looooot of work
+      if ( !cfg->tempGroup().isEmpty() )
+          cfg->setGroup( cfg->tempGroup() );
+#endif
    mUser = cfg->readEntry( "LdapUser" );
    mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) );
author	zautrix <zautrix>	2005-08-19 13:29:20 (UTC)
committer	zautrix <zautrix>	2005-08-19 13:29:20 (UTC)
commit	14cc7e0e2440d19cee538b10ba158f4b8c362e4e (patch) (unidiff)
tree	57a79bf5a7d50ea9ea332f6634da243199b074e9 /kabc
parent	9014049779be6cfec02d73e19596439f0f4f9bed (diff)
download	kdepimpi-14cc7e0e2440d19cee538b10ba158f4b8c362e4e.zip kdepimpi-14cc7e0e2440d19cee538b10ba158f4b8c362e4e.tar.gz kdepimpi-14cc7e0e2440d19cee538b10ba158f4b8c362e4e.tar.bz2

diff --git a/kabc/plugins/dir/resourcedir.cpp b/kabc/plugins/dir/resourcedir.cpp index e2b7b08..c61664b 100644 --- a/kabc/plugins/dir/resourcedir.cpp +++ b/kabc/plugins/dir/resourcedir.cpp
@@ -87,4 +87,11 @@ ResourceDir::ResourceDir( const KConfig *config )
87	KConfig cfg = (KConfig )config;	87	KConfig cfg = (KConfig )config;
88	if ( cfg ) {	88	if ( cfg ) {
		89	#ifdef _WIN32_
		90	// we use plugins on win32. the group is stored in a static variable
		91	// such that group info not available on win32 plugins
		92	// to fix that, it would be a looooot of work
		93	if ( !cfg->tempGroup().isEmpty() )
		94	cfg->setGroup( cfg->tempGroup() );
		95	#endif
89	//US path = config->readEntry( "FilePath" );	96	//US path = config->readEntry( "FilePath" );
90	path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );	97	path = cfg->readEntry( "FilePath", StdAddressBook::directoryName() );


diff --git a/kabc/plugins/file/resourcefile.cpp b/kabc/plugins/file/resourcefile.cpp index c89939d..dad4571 100644 --- a/kabc/plugins/file/resourcefile.cpp +++ b/kabc/plugins/file/resourcefile.cpp
@@ -84,4 +84,11 @@ ResourceFile::ResourceFile( const KConfig *config )
84	KConfig cfg = (KConfig )config;	84	KConfig cfg = (KConfig )config;
85	if ( cfg ) {	85	if ( cfg ) {
		86	#ifdef _WIN32_
		87	// we use plugins on win32. the group is stored in a static variable
		88	// such that group info not available on win32 plugins
		89	// to fix that, it would be a looooot of work
		90	if ( !cfg->tempGroup().isEmpty() )
		91	cfg->setGroup( cfg->tempGroup() );
		92	#endif
86	fileName = cfg->readEntry( "FileName", default_fileName );	93	fileName = cfg->readEntry( "FileName", default_fileName );
87	formatName = cfg->readEntry( "FileFormat", "vcard" );	94	formatName = cfg->readEntry( "FileFormat", "vcard" );


diff --git a/kabc/plugins/ldap/resourceldap.cpp b/kabc/plugins/ldap/resourceldap.cpp index 55c43af..c3097de 100644 --- a/kabc/plugins/ldap/resourceldap.cpp +++ b/kabc/plugins/ldap/resourceldap.cpp
@@ -57,4 +57,11 @@ ResourceLDAP::ResourceLDAP( const KConfig *config )
57	KConfig cfg = (KConfig )config;	57	KConfig cfg = (KConfig )config;
58	if ( cfg ) {	58	if ( cfg ) {
		59	#ifdef _WIN32_
		60	// we use plugins on win32. the group is stored in a static variable
		61	// such that group info not available on win32 plugins
		62	// to fix that, it would be a looooot of work
		63	if ( !cfg->tempGroup().isEmpty() )
		64	cfg->setGroup( cfg->tempGroup() );
		65	#endif
59	mUser = cfg->readEntry( "LdapUser" );	66	mUser = cfg->readEntry( "LdapUser" );
60	mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) );	67	mPassword = KStringHandler::obscure( cfg->readEntry( "LdapPassword" ) );