5 files changed, 27 insertions, 0 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index a895bb0..210b135 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -2,6 +2,11 @@ Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.2.2 ************
 
+KO/Pi:
+Fixed a problem with the sort order of last modified date in list view. 
+KA/Pi:
+Fixed a resource config read problem on windows. 
+
 
 ********** VERSION 2.2.1 ************
 
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
@@ -86,6 +86,13 @@ 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() );
 //US     mFormatName = config->readEntry( "FileFormat" );
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
@@ -83,6 +83,13 @@ ResourceFile::ResourceFile( const KConfig *config )
   mLastBackupDate = -1;
   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" );
     mFamily =  cfg->readEntry( "ResourceName", "std" );
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
@@ -56,6 +56,13 @@ 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" ) );
     mDn = cfg->readEntry( "LdapDn" );
diff --git a/winbuildall.bat b/winbuildall.bat
index 5ae23d1..901d20e 100755
--- a/winbuildall.bat
+++ b/winbuildall.bat
@@ -8,3 +8,4 @@ qmake
 nmake clean
 nmake 
 winclean
\ No newline at end of file
+copy xp_variables.pri variables.pri 
\ No newline at end of file