diff options
| author | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
|---|---|---|
| committer | albator <[email protected]> | 2011-10-21 20:16:07 +0200 |
| commit | 7a0adf35896618a7570e425941fc1b74c54def47 (patch) | |
| tree | 16dab9d8bfbd93575440f357c70907cbb5480980 /mandriva/2010.2/kdepim/kdepim-3.4.0-use-point-kmail.patch | |
| parent | cd71be65dc30c8007ec54becdf6c50260ed8e908 (diff) | |
| parent | a8707e2a9f22d082cecb8ea6079175076f983c55 (diff) | |
| download | tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.tar.gz tde-packaging-7a0adf35896618a7570e425941fc1b74c54def47.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'mandriva/2010.2/kdepim/kdepim-3.4.0-use-point-kmail.patch')
| -rw-r--r-- | mandriva/2010.2/kdepim/kdepim-3.4.0-use-point-kmail.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdepim/kdepim-3.4.0-use-point-kmail.patch b/mandriva/2010.2/kdepim/kdepim-3.4.0-use-point-kmail.patch new file mode 100644 index 000000000..4503f4a3f --- /dev/null +++ b/mandriva/2010.2/kdepim/kdepim-3.4.0-use-point-kmail.patch @@ -0,0 +1,31 @@ +--- kdepim-3.4.0/kmail/kmkernel.cpp-- 2005-04-07 10:46:16.522963291 -0400 ++++ kdepim-3.4.0/kmail/kmkernel.cpp 2005-04-07 10:58:04.836316900 -0400 +@@ -1069,6 +1069,7 @@ void KMKernel::init() + cfg->writeEntry("previous-version", KMAIL_VERSION); + TQString foldersPath = cfg->readPathEntry( "folders" ); + kdDebug(5006) << k_funcinfo << "foldersPath (from config): '" << foldersPath << "'" << endl; ++ bool migrateMail = true; + + if ( foldersPath.isEmpty() ) { + foldersPath = localDataPath() + "mail"; +@@ -1369,6 +1370,20 @@ bool KMKernel::transferMail( QString & d + } + + if ( dir.isEmpty() ) { ++ // check whether the user has a ~/.Mail folder ++ fi.setFile( TQDir::home(), ".Mail" ); ++ if ( fi.exists() && fi.isDir() && ++ TQFile::exists( TQDir::homeDirPath() + "/.Mail/.inbox.index" ) ) { ++ // there's a ~/Mail folder which seems to be used by KMail (because of the ++ // index file) ++ dir = TQDir::homeDirPath() + "/.Mail"; ++ // the following two lines can be removed once moving mail is reactivated ++ destinationDir = dir; ++ return true; ++ } ++ } ++ ++ if ( dir.isEmpty() ) { + return true; // there's no old mail folder + } + |