Merge lp:~charno/ubuntu/quantal/kdepim/fix-for-1075130 into lp:ubuntu/quantal/kdepim

[Christof Arnosti]

- Fix for 1075130 (Upstream bug - patch also sent to kdepim upstream developers)

[Sebastien Bacher (seb128)]

Thank you for your work, do you have a reference to the upstream bug (or how did you send it to the developers)?

[Christof Arnosti (charno)]

Hi,

I sent the patch via mailing list, therfore there isn't a kde bug.

In the meantime, Laurent Montel (from kde-pim mailing list) decided to forward-port the feature from kdemail1 to kdemail2, so it's implemented differently in the actual upstream. You can view the change at http://quickgit.kde.org/index.php?p=kdepim.git&a=commit&h=7f70328e652140c4d77235cfc78a8ba07dfba824

Since in the meantime I use a self-compiled kdepim, the bug does not anymore apply to me. But to fix it, I think that we could use either of the fixes (mine is a bit less sophisticated, but does generally do the work), and - when using the new upstream-version - remove the patch.

Best
Christof

[Sebastien Bacher (seb128)]

Thanks, do you know what version will include the patch?

Setting to work in progress, the merge request should be updated for at least targetting raring and to use the upstream version of the fix if possible

review: Needs Fixing

Unmerged revisions

210. By Christof Arnosti <email address hidden> on 2012-11-05

debian/patches/fix_gpg_warnings_in_composer.patch: implemented warning on
unencrypted / unsigned email in kmcomposer.cpp (LP: #1075130)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-05 01:11:19 +0000
+++ debian/changelog	2012-11-05 17:16:19 +0000
@@ -1,3 +1,10 @@
+kdepim (4:4.9.2-0ubuntu4) UNRELEASED; urgency=low
+
+  * debian/patches/fix_gpg_warnings_in_composer.patch: implemented warning on
+    unencrypted / unsigned email in kmcomposer.cpp (LP: #1075130)
+
+ -- Christof Arnosti <[e-mail]>  Mon, 05 Nov 2012 18:08:29 +0100
+
 kdepim (4:4.9.2-0ubuntu2) quantal; urgency=low
 
   * Rebuild to get missing binaries that were lost due to being copied from

=== added file 'debian/patches/fix_gpg_warnings_in_composer.patch'
--- debian/patches/fix_gpg_warnings_in_composer.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_gpg_warnings_in_composer.patch	2012-11-05 17:16:19 +0000
@@ -0,0 +1,59 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+Index: kdepim.dev/kmail/kmcomposewin.cpp
+===================================================================
+--- kdepim.dev.orig/kmail/kmcomposewin.cpp	2012-11-05 14:21:19.756828000 +0100
++++ kdepim.dev/kmail/kmcomposewin.cpp	2012-11-05 14:25:32.022750153 +0100
+@@ -2780,6 +2780,42 @@
+   if ( !checkRecipientNumber() )
+     return;
+ 
++
++  if ( MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencrypted() && MessageComposer::MessageComposerSettings::self()->cryptoWarningUnsigned() && !mSignAction->isChecked() && !mEncryptAction->isChecked()) {
++    int rc = KMessageBox::warningYesNo( mMainWidget,
++                                              i18n("About to send unsigned and unencrypted email..."),
++                                              i18n("Unsigned and unencrypted email Confirmation"),
++                                              KGuiItem( i18n("&Send") ),
++                                              KGuiItem( i18n("&Cancel") ) );
++    if ( rc == KMessageBox::No ) {
++      return;
++    }
++  }
++  else {
++    
++    if ( MessageComposer::MessageComposerSettings::self()->cryptoWarningUnencrypted() && !mEncryptAction->isChecked()) {
++      int rc = KMessageBox::warningYesNo( mMainWidget,
++                                                i18n("About to send unencrypted email..."),
++                                                i18n("Unencrypted email Confirmation"),
++                                                KGuiItem( i18n("&Send") ),
++                                                KGuiItem( i18n("&Cancel") ) );
++      if ( rc == KMessageBox::No ) {
++        return;
++      }
++    }
++
++    if ( MessageComposer::MessageComposerSettings::self()->cryptoWarningUnsigned() && !mSignAction->isChecked()) {
++      int rc = KMessageBox::warningYesNo( mMainWidget,
++                                                i18n("About to send unencrypted email..."),
++                                                i18n("Unencrypted email Confirmation"),
++                                                KGuiItem( i18n("&Send") ),
++                                                KGuiItem( i18n("&Cancel") ) );
++      if ( rc == KMessageBox::No ) {
++        return;
++      }
++    }
++  }
++  
+   if ( GlobalSettings::self()->confirmBeforeSend() ) {
+     int rc = KMessageBox::warningYesNoCancel( mMainWidget,
+                                               i18n("About to send email..."),
+@@ -2795,6 +2831,8 @@
+   } else {
+     doSend( MessageSender::SendImmediate );
+   }
++
++  
+ }
+ 
+ //----------------------------------------------------------------------------

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-07-26 17:54:28 +0000
+++ debian/patches/series	2012-11-05 17:16:19 +0000
@@ -1,3 +1,4 @@
 #debianize_akregator_default.diff
 kubuntu_debianize_akregator_default.diff
 kubuntu_install_headers.diff
+fix_gpg_warnings_in_composer.patch