| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
| -rw-r--r-- | kabc/plugins/dir/resourcedir.cpp | 7 | ||||
| -rw-r--r-- | kabc/plugins/file/resourcefile.cpp | 7 | ||||
| -rw-r--r-- | kabc/plugins/ldap/resourceldap.cpp | 7 | ||||
| -rwxr-xr-x | winbuildall.bat | 3 |
5 files changed, 28 insertions, 1 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 @@ -3,4 +3,9 @@ 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 @@ -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" ) ); 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 +winclean +copy xp_variables.pri variables.pri
\ No newline at end of file |