← Back to branch summary

~ubuntu-branches/ubuntu/karmic/kdepim/karmic-backports

« back to all changes in this revision

Viewing changes to debian/patches/kubuntu-message-indicator/0004-Do-not-crash-if-called-when-acctMgr-has-not-been-ini.patch

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2009-08-26 13:46:48 UTC
  • Revision ID: james.westby@ubuntu.com-20090826134648-dm4cdlj21msi6i59
Tags: 4:4.3.0-0ubuntu2
* Add message indicator 4.3 backport patches from 
  Aurelien Gateau <aurelien.gateau@canonical.com>
  in debian/patches/kubuntu-message-indicator
* Add build-dep on libindicate-qt

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/kubuntu-message-indicator/0004-Do-not-crash-if-called-when-acctMgr-has-not-been-ini.patch
 
1
From 3378d061eb4da759af42641078cb10de9ae5b5d8 Mon Sep 17 00:00:00 2001
 
2
From: Aurelien Gateau <aurelien.gateau@canonical.com>
 
3
Date: Thu, 13 Aug 2009 16:36:31 +0200
 
4
Subject: [PATCH 4/5] Do not crash if called when acctMgr has not been initialized.
 
5
 
 
6
---
 
7
 kmail/kmkernel.cpp |    1 +
 
8
 1 files changed, 1 insertions(+), 0 deletions(-)
 
9
 
 
10
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp
 
11
index c071794..7b62ef2 100644
 
12
--- a/kmail/kmkernel.cpp
 
13
+++ b/kmail/kmkernel.cpp
 
14
@@ -2074,6 +2074,7 @@ bool KMKernel::folderIsTrash(KMFolder * folder)
 
15
 {
 
16
   assert(folder);
 
17
   if (folder == the_trashFolder) return true;
 
18
+  if (!acctMgr()) return false;
 
19
   QStringList actList = acctMgr()->getAccounts();
 
20
   QStringList::Iterator it( actList.begin() );
 
21
   for( ; it != actList.end() ; ++it ) {
 
22
-- 
 
23
1.6.3.3
 
24