← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdepim/vivid

« back to all changes in this revision

Viewing changes to mailimporter/filter_thunderbird.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Jonathan Riddell, Rohan Garg, Scott Kitterman
  • Date: 2012-11-21 13:12:36 UTC
  • mfrom: (0.2.33)
  • Revision ID: package-import@ubuntu.com-20121121131236-32ijw9a2txrar80k
Tags: 4:4.9.80-0ubuntu1
[ Jonathan Riddell ]
* New upstream beta release

[ Rohan Garg ]
* Add nepomuk-core-dev to build-deps

[ Scott Kitterman ]
* Add new package, libpimcommon4
  - Add libpimcommon4.install
  - Add to debian/control, including kdepim-dbg and kdepim-dev depends
  - Add to kdepim-dev.install
* Remove usr/bin/backupmail and related files from kmail.install as they are
  not provided by upstream anymore
* Add usr/bin/pimsettingexporter and related files to kmail.install
* Add libnepomukwidgets-dev to build-depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
mailimporter/filter_thunderbird.cpp
45
45
}
46
46
 
47
47
 
48
 
QString FilterThunderbird::defaultPath()
 
48
QString FilterThunderbird::defaultSettingsPath()
49
49
{
50
50
  return QDir::homePath() + QLatin1String( "/.thunderbird/" );
51
51
}
71
71
 
72
72
QMap<QString,QString> FilterThunderbird::listProfile(QString&currentProfile)
73
73
{
74
 
  const QString thunderbirdPath = defaultPath() + QLatin1String( "/profiles.ini" );
 
74
  const QString thunderbirdPath = defaultSettingsPath() + QLatin1String( "/profiles.ini" );
75
75
  QMap<QString,QString> lstProfile;
76
76
  QFile profiles( thunderbirdPath );
77
77
  if ( profiles.exists() ) {
111
111
   * We ask the user to choose Thunderbird's root directory.
112
112
   * This should be usually ~/.thunderbird/xxxx.default/Mail/Local Folders/
113
113
   */
114
 
  QString thunderDir = defaultPath();
 
114
  QString thunderDir = defaultSettingsPath();
115
115
  QDir d( thunderDir );
116
116
  if ( !d.exists() ) {
117
117
    thunderDir = QDir::homePath();