← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kipi-plugins/quantal

« back to all changes in this revision

Viewing changes to debian/patches/sendimages-icedove.diff

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer, Alessandro Ghersi, Felix Geyer
  • Date: 2010-08-26 19:33:41 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100826193341-oyh7rh1eamgk521i
Tags: 1.4.0-0ubuntu1
[ Alessandro Ghersi ]
* kipi-plugins-common replaces/conflicts kipi-plugins << 1.3.0

[ Felix Geyer ]
* New upstream bugfix release.
* Drop fix-ftbfs-glib-2.25.diff, applied upstream.
* Refresh sendimages-icedove.diff.
* Switch to source format 3.0 (quilt) so we can use bz2 upstream tarballs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sendimages-icedove.diff
1
 
diff -rux debian kipi-plugins-0.9.0.orig/sendimages/emailpage.cpp kipi-plugins-0.9.0/sendimages/emailpage.cpp
2
 
--- kipi-plugins-0.9.0.orig/sendimages/emailpage.cpp    2009-12-01 16:35:33.000000000 +0100
3
 
+++ kipi-plugins-0.9.0/sendimages/emailpage.cpp 2009-12-20 22:21:12.000000000 +0100
4
 
@@ -92,6 +92,7 @@
5
 
     d->mailAgentName->insertItem(EmailSettingsContainer::CLAWSMAIL,     "Claws Mail");
6
 
     d->mailAgentName->insertItem(EmailSettingsContainer::EVOLUTION,     "Evolution");
7
 
     d->mailAgentName->insertItem(EmailSettingsContainer::GMAILAGENT,    "Gmail-Agent");
8
 
+    d->mailAgentName->insertItem(EmailSettingsContainer::ICEDOVE,       "Icedove");
9
 
     d->mailAgentName->insertItem(EmailSettingsContainer::KMAIL,         "KMail");
10
 
     d->mailAgentName->insertItem(EmailSettingsContainer::MOZILLA,       "Mozilla");
11
 
     d->mailAgentName->insertItem(EmailSettingsContainer::NETSCAPE,      "Netscape");
12
 
diff -rux debian kipi-plugins-0.9.0.orig/sendimages/emailsettingscontainer.h kipi-plugins-0.9.0/sendimages/emailsettingscontainer.h
13
 
--- kipi-plugins-0.9.0.orig/sendimages/emailsettingscontainer.h 2009-12-01 16:35:33.000000000 +0100
14
 
+++ kipi-plugins-0.9.0/sendimages/emailsettingscontainer.h      2009-12-20 17:36:40.000000000 +0100
15
 
@@ -68,7 +68,8 @@
 
1
--- kipi-plugins-1.4.0.orig/sendimages/emailsettingscontainer.h
 
2
+++ kipi-plugins-1.4.0/sendimages/emailsettingscontainer.h
 
3
@@ -68,7 +68,8 @@ public:
16
4
         NETSCAPE,
17
5
         SYLPHEED,
18
6
         SYLPHEEDCLAWS,
21
9
+        ICEDOVE
22
10
     };
23
11
 
24
 
     enum ImageSize 
25
 
diff -rux debian kipi-plugins-0.9.0.orig/sendimages/sendimages.cpp kipi-plugins-0.9.0/sendimages/sendimages.cpp
26
 
--- kipi-plugins-0.9.0.orig/sendimages/sendimages.cpp   2009-12-01 16:35:33.000000000 +0100
27
 
+++ kipi-plugins-0.9.0/sendimages/sendimages.cpp        2009-12-20 17:36:19.000000000 +0100
28
 
@@ -490,6 +490,7 @@
29
 
                 case EmailSettingsContainer::MOZILLA:
 
12
     enum ImageSize
 
13
--- kipi-plugins-1.4.0.orig/sendimages/emailpage.cpp
 
14
+++ kipi-plugins-1.4.0/sendimages/emailpage.cpp
 
15
@@ -96,6 +96,7 @@ EmailPage::EmailPage(QWidget* parent)
 
16
     d->mailAgentName->insertItem(EmailSettingsContainer::SYLPHEED,      "Sylpheed");
 
17
     d->mailAgentName->insertItem(EmailSettingsContainer::SYLPHEEDCLAWS, "Sylpheed-Claws");
 
18
     d->mailAgentName->insertItem(EmailSettingsContainer::THUNDERBIRD,   "Thunderbird");
 
19
+    d->mailAgentName->insertItem(EmailSettingsContainer::ICEDOVE,       "Icedove");
 
20
     d->mailAgentName->setCurrentIndex(EmailSettingsContainer::DEFAULT);
 
21
     d->mailAgentName->setWhatsThis(i18n("Select your preferred external email program here. "
 
22
                                         "<b>Default</b> is the current email program set in KDE "
 
23
--- kipi-plugins-1.4.0.orig/sendimages/sendimages.cpp
 
24
+++ kipi-plugins-1.4.0/sendimages/sendimages.cpp
 
25
@@ -497,6 +497,7 @@ bool SendImages::invokeMailAgent()
 
26
 
30
27
                 case EmailSettingsContainer::NETSCAPE:
31
28
                 case EmailSettingsContainer::THUNDERBIRD:
32
29
+                case EmailSettingsContainer::ICEDOVE:
33
30
                 case EmailSettingsContainer::GMAILAGENT:
34
31
                 {
35
32
                     QString prog;
36
 
@@ -499,6 +500,8 @@
 
33
@@ -504,6 +505,8 @@ bool SendImages::invokeMailAgent()
37
34
                         prog = QString("netscape");
38
35
                     else if (d->settings.emailProgram == EmailSettingsContainer::THUNDERBIRD)
39
36
                         prog = QString("thunderbird");