[SCM] rekonq packaging branch, master, updated. 4de9106d3e408feb9b6f6a58b9078f3d249d7dbb

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit d7d051354de407f54c9042b6a9d6165b4eaf852a
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Mon Apr 25 23:02:49 2011 +0200

    Add dont_set_app_as_parent.diff; fixes a crash on exit.
---
 debian/changelog                           |    1 +
 debian/patches/dont_set_app_as_parent.diff |   97 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 99 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e84e93..2aa3796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ rekonq (0.7.0-0r1) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Add libqtwebkit4-dbg to Recommends.
+  * Add dont_set_app_as_parent.diff; fixes a crash on exit.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sat, 26 Mar 2011 18:28:18 +0100
 
diff --git a/debian/patches/dont_set_app_as_parent.diff b/debian/patches/dont_set_app_as_parent.diff
new file mode 100644
index 0000000..0e799e8
--- /dev/null
+++ b/debian/patches/dont_set_app_as_parent.diff
@@ -0,0 +1,97 @@
+Origin: https://git.reviewboard.kde.org/r/101027/
+Description: Avoid a crash on exit.
+index 7fcbfe8..a1f239a 100644
+--- a/src/application.cpp
++++ b/src/application.cpp
+@@ -93,6 +93,37 @@ Application::~Application()
+         delete window.data();
+         window.clear();
+     }
++
++    if (!m_historyManager.isNull()) {
++        delete m_historyManager.data();
++        m_historyManager.clear();
++    }
++
++    if (!m_bookmarkProvider.isNull()) {
++        delete m_bookmarkProvider.data();
++        m_bookmarkProvider.clear();
++    }
++
++    if (!m_sessionManager.isNull()) {
++        delete m_sessionManager.data();
++        m_sessionManager.clear();
++    }
++
++    if (!m_opensearchManager.isNull()) {
++        delete m_opensearchManager.data();
++        m_opensearchManager.clear();
++    }
++
++    if (!m_iconManager.isNull()) {
++        delete m_iconManager.data();
++        m_iconManager.clear();
++    }
++
++    if (!m_adblockManager.isNull()) {
++        delete m_adblockManager.data();
++        m_adblockManager.clear();
++    }
++
+ }
+ 
+ 
+@@ -272,7 +303,7 @@ HistoryManager *Application::historyManager()
+ {
+     if (m_historyManager.isNull())
+     {
+-        m_historyManager = new HistoryManager(instance());
++        m_historyManager = new HistoryManager;
+     }
+     return m_historyManager.data();
+ }
+@@ -282,7 +313,7 @@ BookmarkProvider *Application::bookmarkProvider()
+ {
+     if (m_bookmarkProvider.isNull())
+     {
+-        m_bookmarkProvider = new BookmarkProvider(instance());
++        m_bookmarkProvider = new BookmarkProvider;
+     }
+     return m_bookmarkProvider.data();
+ }
+@@ -292,7 +323,7 @@ SessionManager *Application::sessionManager()
+ {
+     if (m_sessionManager.isNull())
+     {
+-        m_sessionManager = new SessionManager(instance());
++        m_sessionManager = new SessionManager;
+     }
+     return m_sessionManager.data();
+ }
+@@ -302,7 +333,7 @@ OpenSearchManager *Application::opensearchManager()
+ {
+     if (m_opensearchManager.isNull())
+     {
+-        m_opensearchManager = new OpenSearchManager(instance());
++        m_opensearchManager = new OpenSearchManager;
+     }
+     return m_opensearchManager.data();
+ }
+@@ -312,7 +343,7 @@ IconManager *Application::iconManager()
+ {
+     if (m_iconManager.isNull())
+     {
+-        m_iconManager = new IconManager(instance());
++        m_iconManager = new IconManager;
+     }
+     return m_iconManager.data();
+ }
+@@ -407,7 +438,7 @@ AdBlockManager *Application::adblockManager()
+ {
+     if (m_adblockManager.isNull())
+     {
+-        m_adblockManager = new AdBlockManager(instance());
++        m_adblockManager = new AdBlockManager;
+     }
+     return m_adblockManager.data();
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..65ca936
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+dont_set_app_as_parent.diff

-- 
rekonq packaging