[SCM] KDE PIM module packaging branch, master, updated. debian/4.12.4-1-10-g048f9eb
Maximiliano Curia
maxy at moszumanska.debian.org
Tue May 27 12:42:32 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=cf31679
The following commit has been merged in the master branch:
commit cf3167973bc653a5464ee7fb7f1f3aeda9451551
Author: Maximiliano Curia <maxy at debian.org>
Date: Thu May 22 12:24:15 2014 +0200
Import upstream fixes.
---
debian/changelog | 6 ++
debian/patches/series | 3 +
...ng_text_and_pressing_enter_doesnt_replace.patch | 88 ++++++++++++++++++++++
...pstream_fix334730_kontact_crash_on_logout.patch | 22 ++++++
...x334937_kmail_crashes_when_attaching_file.patch | 22 ++++++
5 files changed, 141 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 447cfff..1821fd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,12 @@ kdepim (4:4.13.1-1~) UNRELEASED; urgency=medium
* Update install files.
* Libraries gone in 4.13.1: libgrammar4, libfolderarchive4,
libpimactivity4.
+ * New upstream patch:
+ upstream_fix334612_selecting_text_and_pressing_enter_doesnt_replace.
+ patch
+ * New upstream patch: upstream_fix334730_kontact_crash_on_logout.patch
+ * New upstream patch:
+ upstream_fix334937_kmail_crashes_when_attaching_file.patch
-- Maximiliano Curia <maxy at debian.org> Wed, 21 May 2014 14:18:05 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 8dc1656..38664d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,6 @@
debianize_akregator_default.diff
spambayes.patch
disable_test_verify
+upstream_fix334612_selecting_text_and_pressing_enter_doesnt_replace.patch
+upstream_fix334730_kontact_crash_on_logout.patch
+upstream_fix334937_kmail_crashes_when_attaching_file.patch
diff --git a/debian/patches/upstream_fix334612_selecting_text_and_pressing_enter_doesnt_replace.patch b/debian/patches/upstream_fix334612_selecting_text_and_pressing_enter_doesnt_replace.patch
new file mode 100644
index 0000000..d02a0c5
--- /dev/null
+++ b/debian/patches/upstream_fix334612_selecting_text_and_pressing_enter_doesnt_replace.patch
@@ -0,0 +1,88 @@
+commit dc110d65dcc38af6989ceb3d503271302539c937
+Author: Montel Laurent <montel at kde.org>
+Date: Mon May 12 07:46:03 2014 +0200
+
+ Fix Bug 334612 - Selecting text and pressing enter doesn't replace the text but only adds a newline
+
+ FIXED-IN: 4.13.1
+ BUG: 334612
+
+diff --git a/messagecomposer/composer/kmeditor.cpp b/messagecomposer/composer/kmeditor.cpp
+index ac38ce9..9f5ad4c 100644
+--- a/messagecomposer/composer/kmeditor.cpp
++++ b/messagecomposer/composer/kmeditor.cpp
+@@ -249,7 +249,7 @@ void KMeditor::keyPressEvent ( QKeyEvent *e )
+ emit focusUp();
+ } else {
+ if((e->key() == Qt::Key_Space) || (e->key() == Qt::Key_Enter) || (e->key() == Qt::Key_Return)) {
+- if(d->mAutoCorrection && !isLineQuoted(textCursor().block().text())) {
++ if(d->mAutoCorrection && !isLineQuoted(textCursor().block().text()) && !textCursor().hasSelection()) {
+ const QTextCharFormat initialTextFormat = textCursor().charFormat();
+ const bool richText = (textMode() == KRichTextEdit::Rich);
+ int position = textCursor().position();
+diff --git a/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp b/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp
+index 1b6f26d..f01ef9d 100644
+--- a/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp
++++ b/pimcommon/autocorrection/widgets/lineeditwithautocorrection.cpp
+@@ -56,7 +56,7 @@ void LineEditWithAutoCorrection::setAutocorrectionLanguage(const QString &langua
+ void LineEditWithAutoCorrection::keyPressEvent ( QKeyEvent *e )
+ {
+ if ((e->key() == Qt::Key_Space) || (e->key() == Qt::Key_Enter) || (e->key() == Qt::Key_Return)) {
+- if (mAutoCorrection) {
++ if (mAutoCorrection && !textCursor().hasSelection()) {
+ // no Html format in subject.
+ int position = textCursor().position();
+ mAutoCorrection->autocorrect(false, *document(), position);
+diff --git a/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp b/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp
+index a1774b4..4318ea4 100644
+--- a/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp
++++ b/pimcommon/autocorrection/widgets/richtexteditwithautocorrection.cpp
+@@ -62,26 +62,28 @@ static bool isSpecial( const QTextCharFormat &charFormat )
+ void RichTextEditWithAutoCorrection::keyPressEvent ( QKeyEvent *e )
+ {
+ if ((e->key() == Qt::Key_Space) || (e->key() == Qt::Key_Enter) || (e->key() == Qt::Key_Return)) {
+- const QTextCharFormat initialTextFormat = textCursor().charFormat();
+- const bool richText = acceptRichText();
+- int position = textCursor().position();
+- mAutoCorrection->autocorrect(richText, *document(), position);
+- QTextCursor cur = textCursor();
+- cur.setPosition(position);
+- if (e->key() == Qt::Key_Space) {
+- if (richText && !isSpecial(initialTextFormat))
+- cur.insertText(QLatin1String(" "), initialTextFormat);
+- else
+- cur.insertText(QLatin1String(" "));
+- setTextCursor(cur);
+- return;
+- } else {
+- if (richText && !isSpecial(initialTextFormat))
+- cur.insertText(QLatin1String("
"), initialTextFormat);
+- else
+- cur.insertText(QLatin1String("
"));
+- setTextCursor(cur);
+- return;
++ if (!textCursor().hasSelection()) {
++ const QTextCharFormat initialTextFormat = textCursor().charFormat();
++ const bool richText = acceptRichText();
++ int position = textCursor().position();
++ mAutoCorrection->autocorrect(richText, *document(), position);
++ QTextCursor cur = textCursor();
++ cur.setPosition(position);
++ if (e->key() == Qt::Key_Space) {
++ if (richText && !isSpecial(initialTextFormat))
++ cur.insertText(QLatin1String(" "), initialTextFormat);
++ else
++ cur.insertText(QLatin1String(" "));
++ setTextCursor(cur);
++ return;
++ } else {
++ if (richText && !isSpecial(initialTextFormat))
++ cur.insertText(QLatin1String("
"), initialTextFormat);
++ else
++ cur.insertText(QLatin1String("
"));
++ setTextCursor(cur);
++ return;
++ }
+ }
+ }
+ PimCommon::RichTextEditor::keyPressEvent( e );
diff --git a/debian/patches/upstream_fix334730_kontact_crash_on_logout.patch b/debian/patches/upstream_fix334730_kontact_crash_on_logout.patch
new file mode 100644
index 0000000..d6f259e
--- /dev/null
+++ b/debian/patches/upstream_fix334730_kontact_crash_on_logout.patch
@@ -0,0 +1,22 @@
+commit 990d6c87eb243d03f7c067d661278cf3aff22fed
+Author: Montel Laurent <montel at kde.org>
+Date: Wed May 14 21:31:10 2014 +0200
+
+ Fix Bug 334730 - Kontact crash on logout
+
+ BUG: 334730
+ FIXED-IN: 4.13.2
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 7d24201..5d3a66a 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -1157,7 +1157,7 @@ void KMMainWidget::updateMoveAction( bool hasUnreadMails, bool hasMails )
+ actionCollection()->action( QLatin1String("go_next_unread_message") )->setEnabled( enable_goto_unread );
+ actionCollection()->action( QLatin1String("go_prev_message") )->setEnabled( hasMails );
+ actionCollection()->action( QLatin1String("go_prev_unread_message") )->setEnabled( enable_goto_unread );
+- if ( mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead ) ) {
++ if ( mAkonadiStandardActionManager && mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead ) ) {
+ mAkonadiStandardActionManager->action( Akonadi::StandardMailActionManager::MarkAllMailAsRead )->setEnabled(hasUnreadMails);
+ }
+ }
diff --git a/debian/patches/upstream_fix334937_kmail_crashes_when_attaching_file.patch b/debian/patches/upstream_fix334937_kmail_crashes_when_attaching_file.patch
new file mode 100644
index 0000000..d22c815
--- /dev/null
+++ b/debian/patches/upstream_fix334937_kmail_crashes_when_attaching_file.patch
@@ -0,0 +1,22 @@
+commit e3b1eb838c4d14be616bd90c0f7f19dedce5f58f
+Author: Montel Laurent <montel at kde.org>
+Date: Sat May 17 14:22:05 2014 +0200
+
+ Fix Bug 334937 - Kmail crashes when attaching a file if "enable detection of missing attachments" is not selected
+
+ FIXED-IN: 4.13.2
+ BUG: 334937
+
+diff --git a/kmail/editor/kmcomposewin.cpp b/kmail/editor/kmcomposewin.cpp
+index 93084e8..58501aa 100644
+--- a/kmail/editor/kmcomposewin.cpp
++++ b/kmail/editor/kmcomposewin.cpp
+@@ -221,7 +221,7 @@ KMComposeWin::KMComposeWin( const KMime::Message::Ptr &aMsg, bool lastSignState,
+ mWasModified( false ),
+ mNumProgressUploadFile(0)
+ {
+-
++ m_verifyMissingAttachment = 0;
+ mComposerBase = new MessageComposer::ComposerViewBase( this, this );
+ mComposerBase->setIdentityManager( kmkernel->identityManager() );
+
--
KDE PIM module packaging
More information about the pkg-kde-commits
mailing list