libre.patch 2.8 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
  2. index 0f58cc4..b497299 100644
  3. --- a/extra/kipi-plugins/sendimages/emailsettings.h
  4. +++ b/extra/kipi-plugins/sendimages/emailsettings.h
  5. @@ -64,10 +64,9 @@ public:
  6. CLAWSMAIL,
  7. EVOLUTION,
  8. KMAIL,
  9. - NETSCAPE,
  10. SYLPHEED,
  11. SYLPHEEDCLAWS,
  12. - THUNDERBIRD
  13. + ICEDOVE
  14. };
  15. enum ImageSize
  16. diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
  17. index 1be65d6..68094de 100644
  18. --- a/extra/kipi-plugins/sendimages/sendimages.cpp
  19. +++ b/extra/kipi-plugins/sendimages/sendimages.cpp
  20. @@ -589,18 +589,13 @@ bool SendImages::invokeMailAgent()
  21. // More info about command lines options with Mozilla & co:
  22. // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules
  23. - case EmailSettings::NETSCAPE:
  24. - case EmailSettings::THUNDERBIRD:
  25. + case EmailSettings::ICEDOVE:
  26. {
  27. QString prog;
  28. - if (d->settings.emailProgram == EmailSettings::NETSCAPE)
  29. + if (d->settings.emailProgram == EmailSettings::ICEDOVE)
  30. {
  31. - prog = QLatin1String("netscape");
  32. - }
  33. - else
  34. - {
  35. - prog = QLatin1String("thunderbird");
  36. + prog = QLatin1String("icedove");
  37. }
  38. QStringList args;
  39. diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
  40. index b8416a4..f160310 100644
  41. --- a/extra/kipi-plugins/sendimages/settingswidget.cpp
  42. +++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
  43. @@ -97,10 +97,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
  44. d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL, QLatin1String("Claws Mail"));
  45. d->mailAgentName->insertItem(EmailSettings::EVOLUTION, QLatin1String("Evolution"));
  46. d->mailAgentName->insertItem(EmailSettings::KMAIL, QLatin1String("KMail"));
  47. - d->mailAgentName->insertItem(EmailSettings::NETSCAPE, QLatin1String("Netscape"));
  48. d->mailAgentName->insertItem(EmailSettings::SYLPHEED, QLatin1String("Sylpheed"));
  49. d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));
  50. - d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD, QLatin1String("Thunderbird"));
  51. + d->mailAgentName->insertItem(EmailSettings::ICEDOVE, QLatin1String("Icedove"));
  52. #endif
  53. d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
  54. d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "