summaryrefslogtreecommitdiff
path: root/nonprism/kipi-plugins/libre.patch
blob: 6255727bba598404796f5a7d312c740ffec11895 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
diff --git a/extra/kipi-plugins/sendimages/emailsettings.h b/extra/kipi-plugins/sendimages/emailsettings.h
index 8f98ec5..4b55443 100644
--- a/extra/kipi-plugins/sendimages/emailsettings.h
+++ b/extra/kipi-plugins/sendimages/emailsettings.h
@@ -64,10 +64,9 @@ public:
         CLAWSMAIL,
         EVOLUTION,
         KMAIL,
-        NETSCAPE,
         SYLPHEED,
         SYLPHEEDCLAWS,
-        THUNDERBIRD
+        ICEDOVE
     };
 
     enum ImageSize
diff --git a/extra/kipi-plugins/sendimages/sendimages.cpp b/extra/kipi-plugins/sendimages/sendimages.cpp
index 498cf92..67b03f9 100644
--- a/extra/kipi-plugins/sendimages/sendimages.cpp
+++ b/extra/kipi-plugins/sendimages/sendimages.cpp
@@ -593,18 +593,13 @@ bool SendImages::invokeMailAgent()
                 // More info about command lines options with Mozilla & co:
                 // http://www.mozilla.org/docs/command-line-args.html#Syntax_Rules
 
-                case EmailSettings::NETSCAPE:
-                case EmailSettings::THUNDERBIRD:
+                case EmailSettings::ICEDOVE:
                 {
                     QString prog;
 
-                    if (d->settings.emailProgram == EmailSettings::NETSCAPE)
+                    if (d->settings.emailProgram == EmailSettings::ICEDOVE)
                     {
-                        prog = QLatin1String("netscape");
-                    }
-                    else
-                    {
-                        prog = QLatin1String("thunderbird");
+                        prog = QLatin1String("icedove");
                     }
 
                     QStringList args;
diff --git a/extra/kipi-plugins/sendimages/settingswidget.cpp b/extra/kipi-plugins/sendimages/settingswidget.cpp
index 7e55726..fd8eec5 100644
--- a/extra/kipi-plugins/sendimages/settingswidget.cpp
+++ b/extra/kipi-plugins/sendimages/settingswidget.cpp
@@ -96,10 +96,9 @@ SettingsWidget::SettingsWidget(QWidget* const parent)
     d->mailAgentName->insertItem(EmailSettings::CLAWSMAIL,     QLatin1String("Claws Mail"));
     d->mailAgentName->insertItem(EmailSettings::EVOLUTION,     QLatin1String("Evolution"));
     d->mailAgentName->insertItem(EmailSettings::KMAIL,         QLatin1String("KMail"));
-    d->mailAgentName->insertItem(EmailSettings::NETSCAPE,      QLatin1String("Netscape"));
     d->mailAgentName->insertItem(EmailSettings::SYLPHEED,      QLatin1String("Sylpheed"));
     d->mailAgentName->insertItem(EmailSettings::SYLPHEEDCLAWS, QLatin1String("Sylpheed-Claws"));
-    d->mailAgentName->insertItem(EmailSettings::THUNDERBIRD,   QLatin1String("Thunderbird"));
+    d->mailAgentName->insertItem(EmailSettings::ICEDOVE,   QLatin1String("Icedove"));
     d->mailAgentName->setCurrentIndex(EmailSettings::DEFAULT);
     d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
                                         "<b>Default</b> is the current email program set in KDE "