aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--plugins/mail-to-task/mail-to-task.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 781c16cb57..e77526ac47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-22 Wang Xin <jedy.wang@sun.com>
+
+ ** Fix for bug #468804
+
+ * plugins/mail-to-task/mail-to-task.c: Handle NUll pointer.
+
2007-08-13 Srinivasa Ragavan <sragavan@novell.com>
* NEWS, configure.in: Evolution 2.11.90 release
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 0cddb62bf2..0cabb9b978 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -199,6 +199,7 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message)
int parts, i;
GSList *list = NULL;
const char *uid;
+ char *store_uri;
char *store_dir;
CamelDataWrapper *content;
@@ -211,7 +212,10 @@ set_attachments (ECal *client, ECalComponent *comp, CamelMimeMessage *message)
return;
e_cal_component_get_uid (comp, &uid);
- store_dir = g_filename_from_uri (e_cal_get_local_attachment_store (client), NULL, NULL);
+ store_uri = e_cal_get_local_attachment_store (client);
+ if (!store_uri)
+ return;
+ store_dir = g_filename_from_uri (store_uri, NULL, NULL);
for (i = 1; i < parts; i++)
{