[SCM] KDE PIM module packaging branch, master, updated. debian/4.14.0-1-16-g38ebe35

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim.git;a=commitdiff;h=e0e5dae

The following commit has been merged in the master branch:
commit e0e5daeae3574109c22f56bbcb4f725a8a9448e6
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Oct 22 10:09:49 2014 +0200

    New upstream patch: upstream_delete_the_part_from_the_mainwindow. (Closes: #764362) Thanks to Alexandre Detiste
---
 debian/changelog                                   |  3 +-
 debian/patches/series                              |  1 +
 .../upstream_delete_the_part_from_the_mainwindow   | 62 ++++++++++++++++++++++
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8df693d..0902c3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdepim (4:4.14.2-2~) UNRELEASED; urgency=medium
 
-  * 
+  * New upstream patch: upstream_delete_the_part_from_the_mainwindow.
+    (Closes: #764362) Thanks to Alexandre Detiste
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 22 Oct 2014 10:00:23 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index aa0883f..73f3f7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ spambayes.patch
 disable_test_verify
 disable_has_focus_tests_failed_in_xvfb.patch
 upstream_fix_crash_on_logout
+upstream_delete_the_part_from_the_mainwindow
diff --git a/debian/patches/upstream_delete_the_part_from_the_mainwindow b/debian/patches/upstream_delete_the_part_from_the_mainwindow
new file mode 100644
index 0000000..558ff6f
--- /dev/null
+++ b/debian/patches/upstream_delete_the_part_from_the_mainwindow
@@ -0,0 +1,62 @@
+commit b92a3688d91d76b7c0ffcb3775b232ed96062fc9
+Author: David Faure <faure at kde.org>
+Date:   Tue Oct 21 09:22:41 2014 +0200
+
+    Delete the part from the mainwindow, not from the mainwidget.
+    
+    This is a fix for "kontact crashes on quit" introduced by c5b703e7c
+    because I confused mainwindow and mainwidget. It restores a behavior
+    closer to before 8fc0d948f6e1, where the part was deleted by the mainwindow.
+    
+    CCBUG: 336417
+
+diff --git a/akregator/src/mainwidget.cpp b/akregator/src/mainwidget.cpp
+index 14cd2a9..99a1287 100644
+--- a/akregator/src/mainwidget.cpp
++++ b/akregator/src/mainwidget.cpp
+@@ -317,8 +317,6 @@ void Akregator::MainWidget::slotOnShutdown()
+ {
+     m_shuttingDown = true;
+ 
+-    delete m_part;
+-
+     // close all pageviewers in a controlled way
+     // fixes bug 91660, at least when no part loading data
+     while ( m_tabWidget->count() > 1 ) { // remove frames until only the main frame remains
+diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
+index 03399c7..cf36b23 100644
+--- a/akregator/src/mainwindow.cpp
++++ b/akregator/src/mainwindow.cpp
+@@ -88,6 +88,8 @@ MainWindow::MainWindow( QWidget* parent, Qt::WindowFlags f )
+ 
+     connect( KPIM::BroadcastStatus::instance(), SIGNAL(statusMsg(QString)),
+              this, SLOT(slotSetStatusBarText(QString)) );
++
++    connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(slotOnShutdown()));
+ }
+ 
+ bool MainWindow::loadPart()
+@@ -186,6 +188,11 @@ void MainWindow::slotQuit()
+     kapp->quit();
+ }
+ 
++void MainWindow::slotOnShutdown()
++{
++    delete m_part;
++}
++
+ bool MainWindow::queryClose()
+ {
+     if ( kapp->sessionSaving() ) {
+diff --git a/akregator/src/mainwindow.h b/akregator/src/mainwindow.h
+index a77eaee..64ce5bc 100644
+--- a/akregator/src/mainwindow.h
++++ b/akregator/src/mainwindow.h
+@@ -115,6 +115,7 @@ private slots:
+     void optionsConfigureKeys();
+     void optionsConfigureToolbars();
+     void applyNewToolbarConfig();
++    void slotOnShutdown();
+ 
+ private:
+     BrowserInterface *m_browserIface;

-- 
KDE PIM module packaging