diff -Nru evolution-2.24.2/debian/changelog evolution-2.24.2/debian/changelog --- evolution-2.24.2/debian/changelog 2008-12-10 21:48:31.000000000 +0000 +++ evolution-2.24.2/debian/changelog 2008-12-10 21:48:34.000000000 +0000 @@ -1,3 +1,10 @@ +evolution (2.24.2-0ubuntu1.1) intrepid-proposed; urgency=low + + * debian/patches/80_fix_local_folder.patch: + - fix local accounts (lp: #302637) + + -- Bruce Cowan Wed, 10 Dec 2008 21:43:33 +0000 + evolution (2.24.2-0ubuntu1) intrepid-proposed; urgency=low * New upstream version: diff -Nru evolution-2.24.2/debian/patches/80_fix_local_folder.patch evolution-2.24.2/debian/patches/80_fix_local_folder.patch --- evolution-2.24.2/debian/patches/80_fix_local_folder.patch 1970-01-01 01:00:00.000000000 +0100 +++ evolution-2.24.2/debian/patches/80_fix_local_folder.patch 2008-12-10 21:48:34.000000000 +0000 @@ -0,0 +1,55 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.24.2/mail/mail-config.c evolution-2.24.2.new/mail/mail-config.c +--- evolution-2.24.2/mail/mail-config.c 2008-11-20 04:07:24.000000000 +0000 ++++ evolution-2.24.2.new/mail/mail-config.c 2008-12-10 21:41:51.000000000 +0000 +@@ -795,18 +795,17 @@ + + e_iterator_next (iter); + +- if (account->source == NULL) +- continue; +- +- else if (account->source->url == NULL) +- continue; +- +- else if (*account->source->url == '\0') ++ if ( !account || (account->source == NULL) || ++ (account->source->url == NULL) || (*account->source->url == '\0')) { ++ account = NULL; + continue; ++ } + + url = camel_url_new (account->source->url, NULL); +- if (url == NULL) ++ if (url == NULL) { ++ account = NULL; + continue; ++ } + + /* Simplify the account URL for comparison. */ + string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); +@@ -844,18 +843,17 @@ + + e_iterator_next (iter); + +- if (account->transport == NULL) +- continue; +- +- else if (account->transport->url == NULL) +- continue; +- +- else if (*account->transport->url == '\0') ++ if ( !account || (account->transport == NULL) || ++ (account->transport->url == NULL) || (*account->transport->url == '\0')) { ++ account = NULL; + continue; ++ } + + url = camel_url_new (account->transport->url, NULL); +- if (url == NULL) ++ if (url == NULL) { ++ account = NULL; + continue; ++ } + + /* Simplify the account URL for comparison. */ + string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);