[SCM] KDE PIM module packaging branch, master, updated. debian/4.4.7-2-3-g0e3896d

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 1c239d590a2284880f73af254524ec33f2847b7a
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Jan 20 00:54:51 2011 +0200

    Do not crash when the feed being added does not exist.
    
    (Closes: #605094)
---
 debian/changelog                                   |    1 +
 .../backport_dont_crash_when_adding_feed.diff      |   21 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf26a1b..74647e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 kdepim (4:4.4.7-3) UNRELEASED; urgency=low
 
+  * Do not crash when the feed being added does not exist. (Closes: #605094)
 
  -- Modestas Vainius <modax at debian.org>  Thu, 20 Jan 2011 00:53:26 +0200
 
diff --git a/debian/patches/backport_dont_crash_when_adding_feed.diff b/debian/patches/backport_dont_crash_when_adding_feed.diff
new file mode 100644
index 0000000..f58ccc6
--- /dev/null
+++ b/debian/patches/backport_dont_crash_when_adding_feed.diff
@@ -0,0 +1,21 @@
+From: Christophe Giboudeaux <cgiboudeaux at gmail.com>
+Subject: Make sure that the archive exists before calling markAsFetchNow.
+Origin: backport http://websvn.kde.org/?revision=1208110&view=revision
+Bug: https://bugs.kde.org/show_bug.cgi?id=254323
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=605094
+Forwarded: yes
+Applied-Upstream: 4.4.9
+Last-Update: 2011-01-20
+
+Patch by Guy Shapiro. Thank you.
+
+--- a/akregator/src/feed.cpp
++++ b/akregator/src/feed.cpp
+@@ -682,6 +682,7 @@ void Feed::fetchCompleted(Syndication::L
+ 
+ void Feed::markAsFetchedNow()
+ {
++    if ( d->archive )
+     d->archive->setLastFetch( QDateTime::currentDateTime().toTime_t());
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1f95bc4..d8ea8ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+backport_dont_crash_when_adding_feed.diff
 30_debianize_akregator_default.diff

-- 
KDE PIM module packaging